Mercurial > emacs
changeset 100304:4dfef179eed3
* epa-hook.el (epa-file-find-file-hook): Don't mark the current
buffer unmodified. (Bug#1509)
* epa-file.el (epa-file-insert-file-contents): Set buffer's
modification time if visiting a file and the content is
successfully decrypted.
| author | Daiki Ueno <ueno@unixuser.org> |
|---|---|
| date | Wed, 10 Dec 2008 01:35:39 +0000 |
| parents | 3e044fa54e4f |
| children | 96adde1ed8f8 |
| files | lisp/ChangeLog lisp/epa-file.el lisp/epa-hook.el |
| diffstat | 3 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Dec 10 01:04:19 2008 +0000 +++ b/lisp/ChangeLog Wed Dec 10 01:35:39 2008 +0000 @@ -1,3 +1,11 @@ +2008-12-10 Daiki Ueno <ueno@unixuser.org> + + * epa-hook.el (epa-file-find-file-hook): Don't mark the current + buffer unmodified. (Bug#1509) + * epa-file.el (epa-file-insert-file-contents): Set buffer's + modification time if visiting a file and the content is + successfully decrypted. + 2008-12-09 Chong Yidong <cyd@stupidchicken.com> * files.el (save-some-buffers): At each map-y-or-n-p iteration,
--- a/lisp/epa-file.el Wed Dec 10 01:04:19 2008 +0000 +++ b/lisp/epa-file.el Wed Dec 10 01:35:39 2008 +0000 @@ -110,8 +110,6 @@ (local-file (or local-copy file)) (context (epg-make-context)) string length entry) - (if visit - (setq buffer-file-name file)) (epg-context-set-passphrase-callback context (cons #'epa-file-passphrase-callback-function @@ -140,7 +138,10 @@ (epa-file-decode-and-insert string file visit beg end replace) (setq length (- (point-max) (point-min)))) (if replace - (delete-region (point) (point-max))))) + (delete-region (point) (point-max))) + (when visit + (setq buffer-file-name file) + (set-visited-file-modtime)))) (if (and local-copy (file-exists-p local-copy)) (delete-file local-copy)))
--- a/lisp/epa-hook.el Wed Dec 10 01:04:19 2008 +0000 +++ b/lisp/epa-hook.el Wed Dec 10 01:35:39 2008 +0000 @@ -79,8 +79,7 @@ (if (and buffer-file-name (string-match epa-file-name-regexp buffer-file-name) epa-file-inhibit-auto-save) - (auto-save-mode 0)) - (set-buffer-modified-p nil)) + (auto-save-mode 0))) (define-minor-mode auto-encryption-mode "Toggle automatic file encryption and decryption.