summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Olson <mwolson@gnu.org>2008-02-10 21:59:27 +0000
committerMichael Olson <mwolson@gnu.org>2008-02-10 21:59:27 +0000
commit78df961d5989299fc8e663fd83a33ea65256efdd (patch)
tree6ee5bb4fd0e315f8bfbf2da2e80d1f60bf8cbb24
parentc53956feade4a83a7f3a18379aa83657f8976aa1 (diff)
downloademacs-78df961d5989299fc8e663fd83a33ea65256efdd.tar.gz
EasyPG: Rename epa-mail-minor-mode to epa-global-mail-mode.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/epa-mail.el4
-rw-r--r--lisp/epa.el2
3 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c19e27d04db..3157aeef6e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,7 +6,7 @@
(epg-bug-report-address): New constant.
* epa-mail.el (epa-mail-mode): Add autoload cookie.
- (epa-mail-minor-mode): New global minor mode.
+ (epa-global-mail-mode): New global minor mode.
* epa-file.el (epa-file-mode): New global minor mode.
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index 0fcff2806ca..b18fca06e8f 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -175,11 +175,11 @@ Don't use this command in Lisp programs!"
(epa-import-armor-in-region (point-min) (point-max)))
;;;###autoload
-(define-minor-mode epa-mail-minor-mode
+(define-minor-mode epa-global-mail-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
+ (if epa-global-mail-mode
(add-hook 'mail-mode-hook 'epa-mail-mode)))
(provide 'epa-mail)
diff --git a/lisp/epa.el b/lisp/epa.el
index 5d40a6345a0..16c418b362b 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -47,7 +47,7 @@ the separate window."
(defcustom epa-global-minor-modes '(epa-dired-mode
epa-file-mode
- epa-mail-minor-mode
+ epa-global-mail-mode
epa-menu-mode)
"Globally defined minor modes to hook into other modes."
:type '(repeat symbol)