* message.el (message-abbrevs-loaded): Remove.

	(mailabbrev): Require it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c617a52..21c83ef 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2002-03-12  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
+       * message.el (message-abbrevs-loaded): Remove.
+       (mailabbrev): Require it.
+
        * nnslashdot.el (nnslashdot-request-article): Remove IFRAME.
 
 2002-03-12  Katsumi Yamaoka  <yamaoka@jpl.org>

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 6874ace..86b336d 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -23,6 +23,7 @@
               image-type-from-file-header
               make-symbolic-link
               make-temp-file message-xmas-redefine
+              mail-abbrev-in-expansion-header-p
               mail-aliases-setup mm-copy-tree
               mule-write-region-no-coding-system put-image
               ring-elements

diff --git a/lisp/message.el b/lisp/message.el
index f7b5b31..aedae8a 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -36,9 +36,12 @@
 (require 'canlock)
 (require 'mailheader)
 (require 'nnheader)
-;; This is apparently necessary even though things are autoloaded:
+;; This is apparently necessary even though things are autoloaded.
+;; Because we dynamically bind mail-abbrev-mode-regexp, we'd better
+;; require mailabbrev here.
 (if (featurep 'xemacs)
-    (require 'mail-abbrevs))
+    (require 'mail-abbrevs)
+  (require 'mailabbrev))
 (require 'mail-parse)
 (require 'mml)
 (require 'rfc822)
@@ -645,8 +648,6 @@ point and mark around the citation text as modified."
   :type 'function
   :group 'message-insertion)
 
-(defvar message-abbrevs-loaded nil)
-
 ;;;###autoload
 (defcustom message-signature t
   "*String to be inserted at the end of the message buffer.
@@ -1215,7 +1216,6 @@ no, only reply back to the author."
   (autoload 'gnus-point-at-bol "gnus-util")
   (autoload 'gnus-output-to-rmail "gnus-util")
   (autoload 'gnus-output-to-mail "gnus-util")
-  (autoload 'mail-abbrev-in-expansion-header-p "mailabbrev")
   (autoload 'nndraft-request-associate-buffer "nndraft")
   (autoload 'nndraft-request-expire-articles "nndraft")
   (autoload 'gnus-open-server "gnus-int")