[Emacs-diffs] emacs/lisp epa-hook.el epa-file.el ChangeLog

[Daiki Ueno]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Daiki Ueno <ueno>       08/12/10 01:35:46

Modified files:
        lisp           : epa-hook.el epa-file.el ChangeLog 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/epa-hook.el?cvsroot=emacs&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/epa-file.el?cvsroot=emacs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.14925&r2=1.14926

Patches:
Index: epa-hook.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/epa-hook.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- epa-hook.el 8 May 2008 11:53:29 -0000       1.3
+++ epa-hook.el 10 Dec 2008 01:35:39 -0000      1.4
@@ -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.

Index: epa-file.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/epa-file.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- epa-file.el 30 Sep 2008 07:41:52 -0000      1.14
+++ epa-file.el 10 Dec 2008 01:35:39 -0000      1.15
@@ -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)))

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14925
retrieving revision 1.14926
diff -u -b -r1.14925 -r1.14926
--- ChangeLog   9 Dec 2008 23:43:03 -0000       1.14925
+++ ChangeLog   10 Dec 2008 01:35:39 -0000      1.14926
@@ -1,3 +1,11 @@
+2008-12-10  Daiki Ueno  <address@hidden>
+
+       * 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  <address@hidden>
 
        * files.el (save-some-buffers): At each map-y-or-n-p iteration,