summaryrefslogtreecommitdiff
path: root/lisp/files.el
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2008-04-27 19:49:15 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2008-04-27 19:49:15 +0000
commitbfeee9d15131df60ef028dda6ca4ab7c29e7d7d2 (patch)
tree63e31d81a53dd40a472d7d4152eadda4dedf1fd0 /lisp/files.el
parentb576c5808af88b494ccc9323061d9a44e9f67284 (diff)
downloademacs-bfeee9d15131df60ef028dda6ca4ab7c29e7d7d2.tar.gz
* epa-file.el (auto-encryption-mode): Rename from epa-file-mode.
(epa-file-handler): Put 'safe-magic and 'operations properties. * epa.el (epa-global-minor-modes, epa-mode, epa-menu) (epa-menu-items): Remove. * epa-dired.el (epa-dired-do-decrypt, epa-dired-do-verify) (epa-dired-do-sign, epa-dired-do-encrypt): Add autoload cookie. (epa-dired-mode, epa-global-dired-mode): Remove. * dired.el (dired-mode-map): Bind encryption/decryption commands. * menu-bar.el (menu-bar-encryption-decryption-menu): New menu item. * files.el (insert-file-contents-literally): Inhibit epa-file-handler.
Diffstat (limited to 'lisp/files.el')
-rw-r--r--lisp/files.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/files.el b/lisp/files.el
index fc86df1bc3b..68c0657df7f 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1803,7 +1803,7 @@ This function ensures that none of these modifications will take place."
(symbol-function 'find-buffer-file-type)
nil))
(inhibit-file-name-handlers
- (append '(jka-compr-handler image-file-handler)
+ (append '(jka-compr-handler image-file-handler epa-file-handler)
inhibit-file-name-handlers))
(inhibit-file-name-operation 'insert-file-contents))
(unwind-protect