# HG changeset patch # User Daiki Ueno # Date 1280058651 -32400 # Node ID 1eca4fd49be3da81ad858ac090386cac2dd731aa # Parent 52f61129223038a90c3cf20ce31a54f476237c4e Fix typo and comment. diff -r 52f611292230 -r 1eca4fd49be3 lisp/ChangeLog --- a/lisp/ChangeLog Sun Jul 25 20:23:43 2010 +0900 +++ b/lisp/ChangeLog Sun Jul 25 20:50:51 2010 +0900 @@ -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 -r 52f611292230 -r 1eca4fd49be3 lisp/epa-file.el --- a/lisp/epa-file.el Sun Jul 25 20:23:43 2010 +0900 +++ b/lisp/epa-file.el Sun Jul 25 20:50:51 2010 +0900 @@ -139,11 +139,11 @@ (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