# HG changeset patch # User Glenn Morris # Date 1209366996 0 # Node ID 3898a5665f50470346706f564fcdd0237e6c8576 # Parent b158297ed3f49e5875dd5d3ecb892e70d22008af Daiki Ueno (epa-file-handler): Restore rev 1.5 version; previous change was buggy patch. diff -r b158297ed3f4 -r 3898a5665f50 lisp/epa-file.el --- 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