Mercurial > emacs
changeset 94419:1ea022d5b378
(epa-file-handler): Comment out, does not compile.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sun, 27 Apr 2008 20:53:34 +0000 |
parents | d27d80ade7b7 |
children | 090cf85895a7 |
files | lisp/ChangeLog lisp/epa-file.el |
diffstat | 2 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Apr 27 19:52:13 2008 +0000 +++ b/lisp/ChangeLog Sun Apr 27 20:53:34 2008 +0000 @@ -1,5 +1,7 @@ 2008-04-27 Dan Nicolaescu <dann@ics.uci.edu> + * epa-file.el (epa-file-handler): Comment out, does not compile. + * vc.el (vc-dir-mode-map): Change bindings for unmark all and revert. (vc-dir-parent-marked-p, vc-dir-children-marked-p): Implement. (vc-dir-mark-file): Add an optional argument.
--- a/lisp/epa-file.el Sun Apr 27 19:52:13 2008 +0000 +++ b/lisp/epa-file.el Sun Apr 27 20:53:34 2008 +0000 @@ -124,15 +124,15 @@ (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) + ;; (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))))) - + ;; (y-or-n-p "" + ;; (apply op args) + ;; (epa-file-run-real-handler operation args))))) + nil) (defun epa-file-run-real-handler (operation args) (let ((inhibit-file-name-handlers (cons 'epa-file-handler