From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 10 Dec 2008 01:35:39 +0000 (+0000)
Subject: * epa-hook.el (epa-file-find-file-hook): Don't mark the current
X-Git-Tag: emacs-pretest-23.0.90~1198
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8e3efc87f39efa8a4bdfe6eb92190226c4302599;p=emacs.git

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

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.