(toplevel): Remove autoload for gnus-setup-message.

(gnus-dired-attach): Fake this-command value to prevent Gnus from displaying
 Gnus logo; always use compose-mail.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 107ba0eda07ddf63b914246ca46ff8bdb92ae9eb..a99b2fd5524ea0bdf8325eaef155b1ea0e7ae7a8 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-25  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-dired.el: Remove autoload for gnus-setup-message.
+       (gnus-dired-attach): Fake this-command value to prevent Gnus from
+       displaying Gnus logo; always use compose-mail.
+
 2009-02-23  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-dired.el: Tell autoload that gnus-setup-message is a macro.

diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el
index 0ad5ed1887dacccef9bc7f7f454c26110fab5164..a610991df68b3487348d00e6cf8a5b01d20de0e3 100644 (file)
--- a/lisp/gnus/gnus-dired.el
+++ b/lisp/gnus/gnus-dired.el
@@ -53,7 +53,6 @@
 ;; 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")
 
 (defvar gnus-dired-mode nil
@@ -162,9 +161,17 @@ filenames."
                                    bufs)
                                   nil t)))
        ;; setup a new mail composition buffer
-       (if (eq gnus-dired-mail-mode 'gnus-user-agent)
-           (gnus-setup-message 'message (message-mail))
-         ;; FIXME: Is this the right thing?
+       (let ((mail-user-agent gnus-dired-mail-mode)
+             ;; A workaround to prevent Gnus from displaying the Gnus
+             ;; logo when invoking this command without loading Gnus.
+             ;; Gnus demonstrates it when gnus.elc is being loaded if
+             ;; a command of which the name is prefixed with "gnus"
+             ;; causes that autoloading.  See the code in question,
+             ;; that is the one first found in gnus.el by performing
+             ;; `C-s this-command'.
+             (this-command (if (eq gnus-dired-mail-mode 'gnus-user-agent)
+                               'gnoose-dired-attach
+                             this-command)))
          (compose-mail))
        (setq destination (current-buffer)))