[Emacs-diffs] Changes to emacs/lisp/epa-mail.el,v

[Michael W. Olson]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael W. Olson <mwolson>      08/02/10 20:57:47

Index: lisp/epa-mail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/epa-mail.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- lisp/epa-mail.el    9 Feb 2008 02:29:01 -0000       1.2
+++ lisp/epa-mail.el    10 Feb 2008 20:57:47 -0000      1.3
@@ -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 @@
   (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