Customize.

(mail-abbrevs-enable, mail-abbrevs-disable): New functions.
(mail-abbrevs-mode): New variable enables use of the package.
Call mail-abbrevs-enable or mail-abbrevs-disable.
(mail-abbrevs-only): New variable.
(sendmail-pre-abbrev-expand-hook): Implement mail-abbrevs-only.

1 files changed, 46 insertions, 8 deletions

diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index e69e10cdf5..261822f843 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -1,6 +1,6 @@
 ;;; mailabbrev.el --- abbrev-expansion of mail aliases.
 
-;; Copyright (C) 1985, 1986, 87, 92, 93, 1996 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 86, 87, 92, 93, 96, 1997 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <[email protected]>
 ;; Maintainer: Jamie Zawinski <[email protected]>
@@ -129,6 +129,26 @@
 
 (require 'sendmail)
 
+(defgroup mail-abbrev nil
+  "Expand mail aliases as abbrevs, in certain mail headers."
+  :group 'abbrev-mode)
+
+(defcustom mail-abbrevs-mode nil
+  "*Non-nil means expand mail aliases as abbrevs, in certain message headers."
+  :type 'boolean
+  :group 'mail-abbrev
+  :require 'mailabbrev
+  :set '(lambda (symbol value)
+	  (setq mail-abbrevs-mode value)
+	  (if value (mail-abbrevs-enable) (mail-abbrevs-disable)))
+  :initialize 'custom-initialize-default)
+
+(defcustom mail-abbrevs-only nil
+  "*Non-nil means only mail abbrevs should expand automatically.
+Other abbrevs expand only when you explicitly use `expand-abbrev'."
+  :type 'boolean
+  :group 'mail-abbrev)
+
 ;; originally defined in sendmail.el - used to be an alist, now is a table.
 (defvar mail-abbrevs nil
   "Word-abbrev table of mail address aliases.
@@ -162,6 +182,14 @@ no aliases, which is represented by this being a table with no entries.)")
 	    nil t)
   (abbrev-mode 1))
 
+(defun mail-abbrevs-enable ()
+  (add-hook 'mail-setup-hook 'mail-abbrevs-setup))
+
+(defun mail-abbrevs-disable ()
+  "Turn off use of the `mailabbrev' package."
+  (remove-hook 'mail-setup-hook 'mail-abbrevs-setup)
+  (abbrev-mode (if (default-value 'abbrev-mode) 1 -1)))
+
 ;;;###autoload
 (defun build-mail-abbrevs (&optional file recursivep)
   "Read mail aliases from personal mail alias file and set `mail-abbrevs'.
@@ -482,13 +510,20 @@ of a mail alias.")
 	     (setq abbrev-start-location (point-max) ; This is the trick.
 		   abbrev-start-location-buffer (current-buffer)))
 
-	 ;; We're not in a mail header where mail aliases should
-	 ;; be expanded, then use the normal mail-mode abbrev table
-	 ;; (if any) and the normal mail-mode syntax table.
-
-	 (setq local-abbrev-table (and (boundp 'mail-mode-abbrev-table)
-				       mail-mode-abbrev-table))
-	 (set-syntax-table mail-mode-syntax-table))
+	 (if (or (not mail-abbrevs-only)
+		 (eq this-command 'expand-abbrev))
+	     (progn
+	       ;; We're not in a mail header where mail aliases should
+	       ;; be expanded, then use the normal mail-mode abbrev table
+	       ;; (if any) and the normal mail-mode syntax table.
+
+	       (setq local-abbrev-table (and (boundp 'mail-mode-abbrev-table)
+					     mail-mode-abbrev-table))
+	       (set-syntax-table mail-mode-syntax-table))
+	   ;; This is not a mail abbrev, and we should not expand it.
+	   ;; This kludge stops expand-abbrev from doing anything.
+	   (setq abbrev-start-location (point-max)
+		 abbrev-start-location-buffer (current-buffer))))
        ))
 
 ;;; utilities
@@ -573,4 +608,7 @@ Don't use this command in Lisp programs!
 
 (provide 'mailabbrev)
 
+(if mail-abbrevs-mode
+    (mail-abbrevs-enable))
+
 ;;; mailabbrev.el ends here.