summaryrefslogtreecommitdiff
path: root/lisp/epa-mail.el
diff options
context:
space:
mode:
authorMichael Olson <mwolson@gnu.org>2008-02-10 20:57:47 +0000
committerMichael Olson <mwolson@gnu.org>2008-02-10 20:57:47 +0000
commitf1914c4078082de71933f6cdf7735411e488d045 (patch)
treecfb6b673ff2bb8fdd02e1a5aa7b7e5e96c0d6f18 /lisp/epa-mail.el
parentc6588a85bcb0bdcd615f4f34496d71943120e7ae (diff)
downloademacs-f1914c4078082de71933f6cdf7735411e488d045.tar.gz
EasyPG: Implement some suggestions from emacs-devel.
Diffstat (limited to 'lisp/epa-mail.el')
-rw-r--r--lisp/epa-mail.el9
1 files changed, 9 insertions, 0 deletions
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index d1f1d3b5295..0fcff2806ca 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -40,6 +40,7 @@
(defvar epa-mail-mode-on-hook nil)
(defvar epa-mail-mode-off-hook nil)
+;;;###autoload
(define-minor-mode epa-mail-mode
"A minor-mode for composing encrypted/clearsigned mails."
nil " epa-mail" epa-mail-mode-map)
@@ -173,6 +174,14 @@ Don't use this command in Lisp programs!"
(interactive)
(epa-import-armor-in-region (point-min) (point-max)))
+;;;###autoload
+(define-minor-mode epa-mail-minor-mode
+ "Minor mode to hook EasyPG into Mail mode."
+ :global t :init-value nil :group 'epa-mail :version "23.1"
+ (remove-hook 'mail-mode-hook 'epa-mail-mode)
+ (if epa-mail-minor-mode
+ (add-hook 'mail-mode-hook 'epa-mail-mode)))
+
(provide 'epa-mail)
;; arch-tag: a6f82b3f-d177-4a11-af95-040da55927d2