[Emacs-diffs] trunk r114846: * lisp/emacs-lisp/package.el (package--download-one-archive)

[Stefan Monnier]

------------------------------------------------------------
revno: 114846
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2013-10-29 10:48:08 -0400
message:
  * lisp/emacs-lisp/package.el (package--download-one-archive)
  (describe-package-1): Don't query the user about final newline.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/package.el     package.el-20100617020707-ybavz666awsxwin6-2

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-29 02:50:24 +0000
+++ b/lisp/ChangeLog    2013-10-29 14:48:08 +0000
@@ -1,3 +1,8 @@
+2013-10-29  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/package.el (package--download-one-archive)
+       (describe-package-1): Don't query the user about final newline.
+
 2013-10-29  Daniel Colascione  <address@hidden>
 
        * net/tramp.el (tramp-methods): Document new functionality.
@@ -14,8 +19,8 @@
 2013-10-28  Daiki Ueno  <address@hidden>
 
        * 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  <address@hidden>
 
@@ -25,8 +30,8 @@
 2013-10-27  Alan Mackenzie  <address@hidden>
 
        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  <address@hidden>  (tiny change)
 

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2013-10-03 07:11:27 +0000
+++ b/lisp/emacs-lisp/package.el        2013-10-29 14:48:08 +0000
@@ -1238,7 +1238,8 @@
       (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 @@
        ;; 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)