From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 29 Oct 2013 14:48:08 +0000 (-0400)
Subject: * lisp/emacs-lisp/package.el (package--download-one-archive)
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1085
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7e3561eec6fe69e5ef37dca29008ca6eaf587b23;p=emacs.git

* lisp/emacs-lisp/package.el (package--download-one-archive)
(describe-package-1): Don't query the user about final newline.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2d0d598c38..885540cdba4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/package.el (package--download-one-archive)
+	(describe-package-1): Don't query the user about final newline.
+
 2013-10-29  Daniel Colascione  <dancol@dancol.org>
 
 	* net/tramp.el (tramp-methods): Document new functionality.
@@ -14,8 +19,8 @@
 2013-10-28  Daiki Ueno  <ueno@gnu.org>
 
 	* epa-file.el
-	(epa-file-cache-passphrase-for-symmetric-encryption): Document
-	that this option has no effect with GnuPG 2.0 (bug#15552).
+	(epa-file-cache-passphrase-for-symmetric-encryption):
+	Document that this option has no effect with GnuPG 2.0 (bug#15552).
 
 2013-10-27  Xue Fuqiao  <xfq.free@gmail.com>
 
@@ -25,8 +30,8 @@
 2013-10-27  Alan Mackenzie  <acm@muc.de>
 
 	Indent statements in macros following "##" correctly.
-	* progmodes/cc-engine.el (c-crosses-statement-barrier-p): Modify
-	the "#" arm of a cond form to handle "#" and "##" operators.
+	* progmodes/cc-engine.el (c-crosses-statement-barrier-p):
+	Modify the "#" arm of a cond form to handle "#" and "##" operators.
 
 2013-10-27  Nathan Trapuzzano  <nbtrap@nbtrap.com>  (tiny change)
 
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index cdf210498ce..420980e77f6 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1238,7 +1238,8 @@ similar to an entry in `package-alist'.  Save the cached copy to
       (when (listp (read buffer))
 	(make-directory dir t)
 	(setq buffer-file-name (expand-file-name file dir))
-	(let ((version-control 'never))
+	(let ((version-control 'never)
+              (require-final-newline nil))
 	  (save-buffer))))
     (when good-signatures
       ;; Write out good signatures into archive-contents.signed file.
@@ -1472,15 +1473,17 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
 	;; For elpa packages, try downloading the commentary.  If that
 	;; fails, try an existing readme file in `package-user-dir'.
 	(cond ((condition-case nil
-		   (package--with-work-buffer
-                       (package-archive-base desc)
-                       (format "%s-readme.txt" name)
-		     (setq buffer-file-name
-			   (expand-file-name readme package-user-dir))
-		     (let ((version-control 'never))
-		       (save-buffer))
-		     (setq readme-string (buffer-string))
-		     t)
+                   (save-excursion
+                     (package--with-work-buffer
+                         (package-archive-base desc)
+                         (format "%s-readme.txt" name)
+                       (setq buffer-file-name
+                             (expand-file-name readme package-user-dir))
+                       (let ((version-control 'never)
+                             (require-final-newline t))
+                         (save-buffer))
+                       (setq readme-string (buffer-string))
+                       t))
 		 (error nil))
 	       (insert readme-string))
 	      ((file-readable-p readme)