Fix *.gpg file creation (bug#6723).

* epa-file.el (epa-file-insert-file-contents): Check if LOCAL-FILE
exists before passing an error to find-file-not-found-functions (bug#6723).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6922c2190e80cc2e7cecc0debc806bad47af771b..ded41069411e1bf83519e9e3fd0c7d0aaa983fb8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-25  Daiki Ueno  <ueno@unixuser.org>
+
+       * epa-file.el (epa-file-insert-file-contents): Check if LOCAL-FILE
+       exists before passing an error to find-file-not-found-functions
+       (bug#6723).
+
 2010-07-23  Lukas Huonker  <l.huonker@gmail.com>
 
        * play/tetris.el (tetris-tty-colors, tetris-x-colors, tetris-blank):

diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index 5870f23bf13a94e03495e36c694de126322734ca..53dc7ddac76325259eb33cd70305b51a8d110c1b 100644 (file)
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -139,15 +139,16 @@ way."
            (error
             (if (setq entry (assoc file epa-file-passphrase-alist))
                 (setcdr entry nil))
-            ;; Hack to prevent find-file from opening empty buffer
-            ;; when decryption failed (bug#6568).  See the place
-            ;; where `find-file-not-found-functions' are called in
-            ;; `find-file-noselect-1'.
-            (make-local-variable 'epa-file-error)
-            (setq epa-file-error error)
-            (add-hook 'find-file-not-found-functions
-                      'epa-file--find-file-not-found-function
-                      nil t)
+            (when (file-exists-p local-file)
+              ;; Hack to prevent find-file from opening empty buffer
+              ;; when decryption failed (bug#6568).  See the place
+              ;; where `find-file-not-found-functions' are called in
+              ;; `find-file-noselect-1'.
+              (make-local-variable 'epa-file-error)
+              (setq epa-file-error error)
+              (add-hook 'find-file-not-found-functions
+                        'epa-file--find-file-not-found-function
+                        nil t))
             (signal 'file-error
                     (cons "Opening input file" (cdr error)))))
          (make-local-variable 'epa-file-encrypt-to)