mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-05-27 15:43:13 -07:00
Code Issues Projects Releases Wiki Activity

* epa-hook.el (epa-file-find-file-hook): Don't mark the current

Browse source 
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.
This commit is contained in:
Daiki Ueno 2008-12-10 01:35:39 +00:00
parent 2133e2d138
commit 8e3efc87f3
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

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

7
lisp/epa-file.el
View file

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

3
lisp/epa-hook.el
View file

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