[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/epa-file.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/epa-file.el,v |
Date: |
Mon, 28 Apr 2008 07:16:38 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/04/28 07:16:37
Index: epa-file.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/epa-file.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- epa-file.el 27 Apr 2008 20:53:34 -0000 1.7
+++ epa-file.el 28 Apr 2008 07:16:36 -0000 1.8
@@ -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