Commit 7e3561ee authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/emacs-lisp/package.el (package--download-one-archive)

(describe-package-1): Don't query the user about final newline.
parent dee4ba59
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> 2013-10-29 Daniel Colascione <dancol@dancol.org>
* net/tramp.el (tramp-methods): Document new functionality. * net/tramp.el (tramp-methods): Document new functionality.
...@@ -14,8 +19,8 @@ ...@@ -14,8 +19,8 @@
2013-10-28 Daiki Ueno <ueno@gnu.org> 2013-10-28 Daiki Ueno <ueno@gnu.org>
* epa-file.el * epa-file.el
(epa-file-cache-passphrase-for-symmetric-encryption): Document (epa-file-cache-passphrase-for-symmetric-encryption):
that this option has no effect with GnuPG 2.0 (bug#15552). Document that this option has no effect with GnuPG 2.0 (bug#15552).
2013-10-27 Xue Fuqiao <xfq.free@gmail.com> 2013-10-27 Xue Fuqiao <xfq.free@gmail.com>
...@@ -25,8 +30,8 @@ ...@@ -25,8 +30,8 @@
2013-10-27 Alan Mackenzie <acm@muc.de> 2013-10-27 Alan Mackenzie <acm@muc.de>
Indent statements in macros following "##" correctly. Indent statements in macros following "##" correctly.
* progmodes/cc-engine.el (c-crosses-statement-barrier-p): Modify * progmodes/cc-engine.el (c-crosses-statement-barrier-p):
the "#" arm of a cond form to handle "#" and "##" operators. Modify the "#" arm of a cond form to handle "#" and "##" operators.
2013-10-27 Nathan Trapuzzano <nbtrap@nbtrap.com> (tiny change) 2013-10-27 Nathan Trapuzzano <nbtrap@nbtrap.com> (tiny change)
......
...@@ -1238,7 +1238,8 @@ similar to an entry in `package-alist'. Save the cached copy to ...@@ -1238,7 +1238,8 @@ similar to an entry in `package-alist'. Save the cached copy to
(when (listp (read buffer)) (when (listp (read buffer))
(make-directory dir t) (make-directory dir t)
(setq buffer-file-name (expand-file-name file dir)) (setq buffer-file-name (expand-file-name file dir))
(let ((version-control 'never)) (let ((version-control 'never)
(require-final-newline nil))
(save-buffer)))) (save-buffer))))
(when good-signatures (when good-signatures
;; Write out good signatures into archive-contents.signed file. ;; 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." ...@@ -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 ;; For elpa packages, try downloading the commentary. If that
;; fails, try an existing readme file in `package-user-dir'. ;; fails, try an existing readme file in `package-user-dir'.
(cond ((condition-case nil (cond ((condition-case nil
(package--with-work-buffer (save-excursion
(package-archive-base desc) (package--with-work-buffer
(format "%s-readme.txt" name) (package-archive-base desc)
(setq buffer-file-name (format "%s-readme.txt" name)
(expand-file-name readme package-user-dir)) (setq buffer-file-name
(let ((version-control 'never)) (expand-file-name readme package-user-dir))
(save-buffer)) (let ((version-control 'never)
(setq readme-string (buffer-string)) (require-final-newline t))
t) (save-buffer))
(setq readme-string (buffer-string))
t))
(error nil)) (error nil))
(insert readme-string)) (insert readme-string))
((file-readable-p readme) ((file-readable-p readme)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment