Fix doc.

[gnus] / lisp / gnus-dired.el

diff --git a/lisp/gnus-dired.el b/lisp/gnus-dired.el
index 4f29fe8..a610991 100644 (file)
--- a/lisp/gnus-dired.el
+++ b/lisp/gnus-dired.el
@@ -1,7 +1,7 @@
 ;;; gnus-dired.el --- utility functions where gnus and dired meet
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 ;; Authors: Benjamin Rutt <brutt@bloomington.in.us>,
 ;;          Shenghuo Zhu <zsh@cs.rochester.edu>
@@ -9,10 +9,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -55,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")
 (autoload 'gnus-print-buffer "gnus-sum")
 
 (defvar gnus-dired-mode nil
@@ -71,7 +68,7 @@
   (define-key gnus-dired-mode-map "\C-c\C-m\C-p" 'gnus-dired-print))
 
 ;; FIXME: Make it customizable, change the default to `mail-user-agent' when
-;; this file if renamed (e.g. to `dired-mime.el').
+;; this file is renamed (e.g. to `dired-mime.el').
 
 (defcustom gnus-dired-mail-mode 'gnus-user-agent ;; mail-user-agent
   "Your preference for a mail composition package.
@@ -164,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)))
 
@@ -258,5 +263,5 @@ file to save in."
 
 (provide 'gnus-dired)
 
-;;; arch-tag: 44737731-e445-4638-a31e-713c7590ec76
+;; arch-tag: 44737731-e445-4638-a31e-713c7590ec76
 ;;; gnus-dired.el ends here