procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
(describe-package-1): Don't query the user about final newline.
This commit is contained in:
Stefan Monnier 2013-10-29 10:48:08 -04:00
parent dee4ba5979
commit 7e3561eec6
2 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lisp/emacs-lisp/package.el
View file

@ -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)