Mercurial > emacs
changeset 94423:3898a5665f50
Daiki Ueno <ueno at unixuser.org>
(epa-file-handler): Restore rev 1.5 version; previous change was buggy
patch.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Mon, 28 Apr 2008 07:16:36 +0000 |
| parents | b158297ed3f4 |
| children | 5daa3021b13a |
| files | lisp/epa-file.el |
| diffstat | 1 files changed, 6 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/epa-file.el Sun Apr 27 23:15:22 2008 +0000 +++ b/lisp/epa-file.el Mon Apr 28 07:16:36 2008 +0000 @@ -124,15 +124,12 @@ (epa-passphrase-callback-function context key-id nil))) (defun epa-file-handler (operation &rest args) - ;; (save-match-data - ;; (let ((op (get operation 'epa-file))) - ;; (if (and op - ;; (if (and (eq operation 'insert-file-contents) - - ;; (y-or-n-p "" - ;; (apply op args) - ;; (epa-file-run-real-handler operation args))))) - nil) + (save-match-data + (let ((op (get operation 'epa-file))) + (if op + (apply op args) + (epa-file-run-real-handler operation args))))) + (defun epa-file-run-real-handler (operation args) (let ((inhibit-file-name-handlers (cons 'epa-file-handler