diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-04-28 07:16:36 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-04-28 07:16:36 +0000 |
| commit | dbc9f96d8238da065ebd2fa0d3dcd23c69f0d4f3 (patch) | |
| tree | 3185377921b7a77893859ed8eed812d542b06e90 /lisp/epa-file.el | |
| parent | 90fce9106c87353c43027eb15bf7491415672cbe (diff) | |
| download | emacs-dbc9f96d8238da065ebd2fa0d3dcd23c69f0d4f3.tar.gz | |
Daiki Ueno <ueno at unixuser.org>
(epa-file-handler): Restore 2008-03-16T04:04:15Z!mwolson@gnu.org version; previous change was buggy
patch.
Diffstat (limited to 'lisp/epa-file.el')
| -rw-r--r-- | lisp/epa-file.el | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/lisp/epa-file.el b/lisp/epa-file.el index e736667715a..d7076d4b3a7 100644 --- a/lisp/epa-file.el +++ b/lisp/epa-file.el @@ -124,15 +124,12 @@ May either be a string or a list of strings.") (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 |