From: Dan Nicolaescu Date: Sun, 27 Apr 2008 20:53:34 +0000 (+0000) Subject: (epa-file-handler): Comment out, does not compile. X-Git-Tag: emacs-pretest-23.0.90~5993 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc062440cccd9ff52f181e5258d9934a7bc58668;p=emacs.git (epa-file-handler): Comment out, does not compile. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8df5b4958c7..7f496ec2728 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2008-04-27 Dan Nicolaescu + * 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. diff --git a/lisp/epa-file.el b/lisp/epa-file.el index 7d53b872c1b..e736667715a 100644 --- a/lisp/epa-file.el +++ b/lisp/epa-file.el @@ -124,15 +124,15 @@ 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) + ;; (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