(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.

diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 6c08d5ca4117d3e2161cfae9a995ac6d5033703a..3794fa6cd323b585bc6e2bf1814f45b065839d5b 100644 (file)
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -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 @@ no aliases, which is represented by this being a table with no entries.)")
   (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