# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1235535632 0
# Node ID dc8e84db30d819b5ee9c9235270b6a0498b6205b
# Parent  8931d7f39598d4ad761eb6f0e1c0444d0863c15d
(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 -r 8931d7f39598 -r dc8e84db30d8 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Wed Feb 25 04:01:00 2009 +0000
+++ b/lisp/gnus/ChangeLog	Wed Feb 25 04:20:32 2009 +0000
@@ -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 -r 8931d7f39598 -r dc8e84db30d8 lisp/gnus/gnus-dired.el
--- a/lisp/gnus/gnus-dired.el	Wed Feb 25 04:01:00 2009 +0000
+++ b/lisp/gnus/gnus-dired.el	Wed Feb 25 04:20:32 2009 +0000
@@ -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 @@
 				    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)))