summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatsumi Yamaoka <yamaoka@jpl.org>2009-02-25 04:20:32 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2009-02-25 04:20:32 +0000
commit87202be1092491092032d55362f050ea8fc8aa76 (patch)
treef5cdb0490423b18250f0ad7babcb1e09f9599cb8
parent8a76755b738856ddd953f4514567ce583ae3b419 (diff)
downloademacs-87202be1092491092032d55362f050ea8fc8aa76.tar.gz
(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.
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/gnus-dired.el15
2 files changed, 17 insertions, 4 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 107ba0eda07..a99b2fd5524 100644
--- 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 0ad5ed1887d..a610991df68 100644
--- 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)))