Mercurial > emacs
comparison lisp/epa-file.el @ 109535:1eca4fd49be3
Fix typo and comment.
| author | Daiki Ueno <ueno@unixuser.org> |
|---|---|
| date | Sun, 25 Jul 2010 20:50:51 +0900 |
| parents | 52f611292230 |
| children | 280c8ae2476d |
comparison
equal
deleted
inserted
replaced
| 109534:52f611292230 | 109535:1eca4fd49be3 |
|---|---|
| 137 (condition-case error | 137 (condition-case error |
| 138 (setq string (epg-decrypt-file context local-file nil)) | 138 (setq string (epg-decrypt-file context local-file nil)) |
| 139 (error | 139 (error |
| 140 (if (setq entry (assoc file epa-file-passphrase-alist)) | 140 (if (setq entry (assoc file epa-file-passphrase-alist)) |
| 141 (setcdr entry nil)) | 141 (setcdr entry nil)) |
| 142 ;; Hack to prevent find-file from opening empty buffer | |
| 143 ;; when decryption failed (bug#6568). See the place | |
| 144 ;; where `find-file-not-found-functions' are called in | |
| 145 ;; `find-file-noselect-1'. | |
| 142 (when (file-exists-p local-file) | 146 (when (file-exists-p local-file) |
| 143 ;; Hack to prevent find-file from opening empty buffer | |
| 144 ;; when decryption failed (bug#6568). See the place | |
| 145 ;; where `find-file-not-found-functions' are called in | |
| 146 ;; `find-file-noselect-1'. | |
| 147 (make-local-variable 'epa-file-error) | 147 (make-local-variable 'epa-file-error) |
| 148 (setq epa-file-error error) | 148 (setq epa-file-error error) |
| 149 (add-hook 'find-file-not-found-functions | 149 (add-hook 'find-file-not-found-functions |
| 150 'epa-file--find-file-not-found-function | 150 'epa-file--find-file-not-found-function |
| 151 nil t)) | 151 nil t)) |