diff lisp/mail/mailabbrev.el @ 34921:fc01ec9131a8

(mail-abbrevs-enable, mail-abbrevs-disable): Use mail-mode-hook instead of mail-setup-hook. Otherwise continuing an interrupted message with C-u C-x m for instence, winds up in Mail mode without abbrevs.

--- a/lisp/mail/mailabbrev.el	Fri Dec 29 11:48:50 2000 +0000
+++ b/lisp/mail/mailabbrev.el	Fri Dec 29 12:19:28 2000 +0000
@@ -109,7 +109,7 @@
 ;; type SPC at the end of the abbrev before moving away) then you can do
 ;;
 ;;  (add-hook
-;;   'mail-setup-hook
+;;   'mail-mode-hook
 ;;   (lambda ()
 ;;      (substitute-key-definition 'next-line 'mail-abbrev-next-line
 ;;				 mail-mode-map global-map)
@@ -124,7 +124,7 @@
 ;; Thanks to Harald Hanche-Olsen, Michael Ernst, David Loeffler, and
 ;; Noah Friedman for suggestions and bug reports.
 
-;; To use this package, do (add-hook 'mail-setup-hook 'mail-abbrevs-setup).
+;; To use this package, do (add-hook 'mail-mode-hook 'mail-abbrevs-setup).
 
 ;;; Code:
 
@@ -185,11 +185,11 @@
   (abbrev-mode 1))
 
 (defun mail-abbrevs-enable ()
-  (add-hook 'mail-setup-hook 'mail-abbrevs-setup))
+  (add-hook 'mail-mode-hook 'mail-abbrevs-setup))
 
 (defun mail-abbrevs-disable ()
   "Turn off use of the `mailabbrev' package."
-  (remove-hook 'mail-setup-hook 'mail-abbrevs-setup)
+  (remove-hook 'mail-mode-hook 'mail-abbrevs-setup)
   (abbrev-mode (if (default-value 'abbrev-mode) 1 -1)))
 
 ;;;###autoload