Require gnus-msg instead of autoloading it for the gnus-setup-message macro.

2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 57239349d51..77f68991c27 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-dired.el: Require gnus-msg instead of autoloading it for
+        the gnus-setup-message macro.
+
 2009-02-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-nocem.el (gnus-nocem-groups): Remove invalid NoCeM groups.
diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el
index 30099131771..c6639a285ac 100644
--- a/lisp/gnus/gnus-dired.el
+++ b/lisp/gnus/gnus-dired.el
@@ -53,9 +53,11 @@
 ;; Autoloads to avoid byte-compiler warnings.  These are used only if the user
 ;; customizes `gnus-dired-mail-mode' to use Message and/or Gnus.
 (autoload 'message-buffers "message")
-(autoload 'gnus-setup-message "gnus-msg")
 (autoload 'gnus-print-buffer "gnus-sum")
 
+;; Load the `gnus-setup-message' macro that `gnus-dired-attach' uses.
+(require 'gnus-msg)
+
 (defvar gnus-dired-mode nil
   "Minor mode for intersections of MIME mail composition and dired.")