diff options
| author | Dmitry Gutov | 2014-05-21 05:14:38 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2014-05-21 05:14:38 +0300 |
| commit | b0df8b953533b67ffba27879b64faab65c7642a6 (patch) | |
| tree | 0a0f6881fba6ae31ef8e710141a2c4122529950c | |
| parent | 2614b25fd5bbbdbc1740b4b7d43dc1f010571fab (diff) | |
| download | emacs-b0df8b953533b67ffba27879b64faab65c7642a6.tar.gz emacs-b0df8b953533b67ffba27879b64faab65c7642a6.zip | |
Replace uses of `save-buffer' with `write-region'
* lisp/emacs-lisp/package.el (package--download-one-archive): Use
`write-region' instead of `save-buffer' to avoid running various
hooks.
(describe-package-1): Same. Insert newline at the end of the
buffer if appropriate.
Fixes: debbugs:17155
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 17 |
2 files changed, 16 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2c96eeadfb7..6f70c04d2ab 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2014-05-21 Dmitry Gutov <dgutov@yandex.ru> | ||
| 2 | |||
| 3 | * emacs-lisp/package.el (package--download-one-archive): Use | ||
| 4 | `write-region' instead of `save-buffer' to avoid running various | ||
| 5 | hooks. (Bug#17155) | ||
| 6 | (describe-package-1): Same. Insert newline at the end of the | ||
| 7 | buffer if appropriate. | ||
| 8 | |||
| 1 | 2014-05-20 Juri Linkov <juri@jurta.org> | 9 | 2014-05-20 Juri Linkov <juri@jurta.org> |
| 2 | 10 | ||
| 3 | * avoid.el (mouse-avoidance-set-mouse-position): Don't raise frame. | 11 | * avoid.el (mouse-avoidance-set-mouse-position): Don't raise frame. |
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index c194e1352ac..8b5c742d4cc 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el | |||
| @@ -1254,10 +1254,7 @@ similar to an entry in `package-alist'. Save the cached copy to | |||
| 1254 | ;; may fetch a URL redirect page). | 1254 | ;; may fetch a URL redirect page). |
| 1255 | (when (listp (read (current-buffer))) | 1255 | (when (listp (read (current-buffer))) |
| 1256 | (make-directory dir t) | 1256 | (make-directory dir t) |
| 1257 | (setq buffer-file-name (expand-file-name file dir)) | 1257 | (write-region nil nil (expand-file-name file dir) nil 'silent))) |
| 1258 | (let ((version-control 'never) | ||
| 1259 | (require-final-newline nil)) | ||
| 1260 | (save-buffer)))) | ||
| 1261 | (when good-signatures | 1258 | (when good-signatures |
| 1262 | ;; Write out good signatures into archive-contents.signed file. | 1259 | ;; Write out good signatures into archive-contents.signed file. |
| 1263 | (write-region (mapconcat #'epg-signature-to-string good-signatures "\n") | 1260 | (write-region (mapconcat #'epg-signature-to-string good-signatures "\n") |
| @@ -1503,11 +1500,13 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages." | |||
| 1503 | (package--with-work-buffer | 1500 | (package--with-work-buffer |
| 1504 | (package-archive-base desc) | 1501 | (package-archive-base desc) |
| 1505 | (format "%s-readme.txt" name) | 1502 | (format "%s-readme.txt" name) |
| 1506 | (setq buffer-file-name | 1503 | (save-excursion |
| 1507 | (expand-file-name readme package-user-dir)) | 1504 | (goto-char (point-max)) |
| 1508 | (let ((version-control 'never) | 1505 | (unless (bolp) |
| 1509 | (require-final-newline t)) | 1506 | (insert ?\n))) |
| 1510 | (save-buffer)) | 1507 | (write-region nil nil |
| 1508 | (expand-file-name readme package-user-dir) | ||
| 1509 | nil 'silent) | ||
| 1511 | (setq readme-string (buffer-string)) | 1510 | (setq readme-string (buffer-string)) |
| 1512 | t)) | 1511 | t)) |
| 1513 | (error nil)) | 1512 | (error nil)) |