diff options
| author | Glenn Morris | 2008-04-28 07:16:36 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-04-28 07:16:36 +0000 |
| commit | dbc9f96d8238da065ebd2fa0d3dcd23c69f0d4f3 (patch) | |
| tree | 3185377921b7a77893859ed8eed812d542b06e90 | |
| parent | 90fce9106c87353c43027eb15bf7491415672cbe (diff) | |
| download | emacs-dbc9f96d8238da065ebd2fa0d3dcd23c69f0d4f3.tar.gz emacs-dbc9f96d8238da065ebd2fa0d3dcd23c69f0d4f3.zip | |
Daiki Ueno <ueno at unixuser.org>
(epa-file-handler): Restore 2008-03-16T04:04:15Z!mwolson@gnu.org version; previous change was buggy
patch.
| -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.") | |||
| 124 | (epa-passphrase-callback-function context key-id nil))) | 124 | (epa-passphrase-callback-function context key-id nil))) |
| 125 | 125 | ||
| 126 | (defun epa-file-handler (operation &rest args) | 126 | (defun epa-file-handler (operation &rest args) |
| 127 | ;; (save-match-data | 127 | (save-match-data |
| 128 | ;; (let ((op (get operation 'epa-file))) | 128 | (let ((op (get operation 'epa-file))) |
| 129 | ;; (if (and op | 129 | (if op |
| 130 | ;; (if (and (eq operation 'insert-file-contents) | 130 | (apply op args) |
| 131 | 131 | (epa-file-run-real-handler operation args))))) | |
| 132 | ;; (y-or-n-p "" | 132 | |
| 133 | ;; (apply op args) | ||
| 134 | ;; (epa-file-run-real-handler operation args))))) | ||
| 135 | nil) | ||
| 136 | (defun epa-file-run-real-handler (operation args) | 133 | (defun epa-file-run-real-handler (operation args) |
| 137 | (let ((inhibit-file-name-handlers | 134 | (let ((inhibit-file-name-handlers |
| 138 | (cons 'epa-file-handler | 135 | (cons 'epa-file-handler |