* 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 f2d0d598c383b8e281fb49c827398c83a9219318..885540cdba4382456302cf6bccf6349780575d24 100644 (file)
--- 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 cdf210498cead6edaa68fcb3329a1071c5f7685d..420980e77f646a5379dd1d88594cb32c5215f7b1 100644 (file)
--- 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)