diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ded41069411..e5629f41588 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -353,7 +353,7 @@ * epa-file.el (epa-file-error, epa-file--find-file-not-found-function) (epa-file-insert-file-contents): Hack to prevent - find-file from opening empty buffer when decryptin failed + find-file from opening empty buffer when decryption failed (bug#6568). 2010-07-07 Agustín Martín diff --git a/lisp/epa-file.el b/lisp/epa-file.el index 53dc7ddac76..af016eb20be 100644 --- a/lisp/epa-file.el +++ b/lisp/epa-file.el @@ -139,11 +139,11 @@ 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'. (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