diff options
| author | Dan Nicolaescu | 2008-04-27 20:53:34 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-04-27 20:53:34 +0000 |
| commit | dc062440cccd9ff52f181e5258d9934a7bc58668 (patch) | |
| tree | 408a0a015872062e471432b2bfc69a7b07d1a6d1 | |
| parent | 6e61fbe177d5b08be97cc05935f33b52051a3692 (diff) | |
| download | emacs-dc062440cccd9ff52f181e5258d9934a7bc58668.tar.gz emacs-dc062440cccd9ff52f181e5258d9934a7bc58668.zip | |
(epa-file-handler): Comment out, does not compile.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/epa-file.el | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8df5b4958c7..7f496ec2728 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2008-04-27 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2008-04-27 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * epa-file.el (epa-file-handler): Comment out, does not compile. | ||
| 4 | |||
| 3 | * vc.el (vc-dir-mode-map): Change bindings for unmark all and revert. | 5 | * vc.el (vc-dir-mode-map): Change bindings for unmark all and revert. |
| 4 | (vc-dir-parent-marked-p, vc-dir-children-marked-p): Implement. | 6 | (vc-dir-parent-marked-p, vc-dir-children-marked-p): Implement. |
| 5 | (vc-dir-mark-file): Add an optional argument. | 7 | (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.") | |||
| 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 (and op |
| 130 | (if (and (eq operation 'insert-file-contents) | 130 | ;; (if (and (eq operation 'insert-file-contents) |
| 131 | 131 | ||
| 132 | (y-or-n-p "" | 132 | ;; (y-or-n-p "" |
| 133 | (apply op args) | 133 | ;; (apply op args) |
| 134 | (epa-file-run-real-handler operation args))))) | 134 | ;; (epa-file-run-real-handler operation args))))) |
| 135 | 135 | nil) | |
| 136 | (defun epa-file-run-real-handler (operation args) | 136 | (defun epa-file-run-real-handler (operation args) |
| 137 | (let ((inhibit-file-name-handlers | 137 | (let ((inhibit-file-name-handlers |
| 138 | (cons 'epa-file-handler | 138 | (cons 'epa-file-handler |