diff options
| author | Daiki Ueno <ueno@unixuser.org> | 2008-12-10 01:35:39 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@unixuser.org> | 2008-12-10 01:35:39 +0000 |
| commit | 8e3efc87f39efa8a4bdfe6eb92190226c4302599 (patch) | |
| tree | 6bb0bb5d1530fb2d79d3b814b03dbcb46be09960 /lisp | |
| parent | 2133e2d13894855f7c44f1dd2fe1e90f49991c51 (diff) | |
| download | emacs-8e3efc87f39efa8a4bdfe6eb92190226c4302599.tar.gz | |
* 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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/epa-file.el | 7 | ||||
| -rw-r--r-- | lisp/epa-hook.el | 3 |
3 files changed, 13 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8dade0843ec..6d295bdb156 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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, diff --git a/lisp/epa-file.el b/lisp/epa-file.el index abc5bde7277..968b22cc52b 100644 --- a/lisp/epa-file.el +++ b/lisp/epa-file.el @@ -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))) diff --git a/lisp/epa-hook.el b/lisp/epa-hook.el index dc2f535f7d0..f7110cea8bd 100644 --- a/lisp/epa-hook.el +++ b/lisp/epa-hook.el @@ -79,8 +79,7 @@ May either be a string or a list of strings.") (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. |