Fix previous commit: tell autoload that gnus-setup-message is a macro.

2 files changed, 2 insertions, 5 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 77f68991c27..107ba0eda07 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,7 +1,6 @@
 2009-02-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-        * gnus-dired.el: Require gnus-msg instead of autoloading it for
-        the gnus-setup-message macro.
+        * gnus-dired.el: Tell autoload that gnus-setup-message is a macro.
 
 2009-02-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el
index c6639a285ac..0ad5ed1887d 100644
--- a/lisp/gnus/gnus-dired.el
+++ b/lisp/gnus/gnus-dired.el
@@ -53,11 +53,9 @@
 ;; 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" nil nil 'macro)
 (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.")