# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1260433558 0
# Node ID c22556bde6503c4ef3285a03e4a3d09ed46bf79c
# Parent  badae536951d528f0c86eda8d096cf7fe01fedbf
(top-level): Move require 'mail-utils to start.
(expand-mail-aliases): Define for compiler.

diff -r badae536951d -r c22556bde650 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Dec 10 08:24:41 2009 +0000
+++ b/lisp/ChangeLog	Thu Dec 10 08:25:58 2009 +0000
@@ -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 -r badae536951d -r c22556bde650 lisp/mail/feedmail.el
--- a/lisp/mail/feedmail.el	Thu Dec 10 08:24:41 2009 +0000
+++ b/lisp/mail/feedmail.el	Thu Dec 10 08:25:58 2009 +0000
@@ -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 @@
      (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 @@
     ))
 
 
-(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