(top-level): Move require 'mail-utils to start.

(expand-mail-aliases): Define for compiler.

2 files changed, 10 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 91bc463f7ad..684d1bcffbb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-12-10  Glenn Morris  <rgm@gnu.org>
 
+        * mail/feedmail.el (top-level): Move require 'mail-utils to start.
+        (expand-mail-aliases): Define for compiler.
+
         * vc-annotate.el (log-view-vc-backend, log-view-vc-fileset):
         Define for compiler.
 
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 5fc8b1bc5ef..77d82f6076f 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -286,7 +286,12 @@
 
 (defconst feedmail-patch-level "8")
 
-(eval-when-compile (require 'smtpmail) (require 'cl))
+(require 'mail-utils)                ; pick up mail-strip-quoted-names
+
+(eval-when-compile
+  (require 'smtpmail)
+  (require 'cl))
+
 (autoload 'mail-do-fcc "sendmail")
 
 (defgroup feedmail nil
@@ -1950,6 +1955,7 @@ mapped to mostly alphanumerics for safety."
      (feedmail-rfc822-time-zone time)
      )))
 
+(declare-function expand-mail-aliases "mailalias" (beg end &optional exclude))
 
 (defun feedmail-send-it-immediately ()
   "Handle immediate sending, including during a queue run."
@@ -2582,7 +2588,6 @@ Resent-To:, Resent-Cc:, and Resent-Bcc:."
     ))
 
 
-(require 'mail-utils)                   ; pick up mail-strip-quoted-names
 (defun feedmail-deduce-address-list (message-buffer header-start header-end addr-regexp address-list)
   "Get address list with all comments and other excitement trimmed.
 Addresses are collected only from headers whose names match the fourth