Replace "Maintainer: FSF" with the emacs-devel mailing address

[bpt/emacs.git] / lisp / mail / rmailmsc.el

diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index 1a7893c..2accd25 100644 (file)
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -1,10 +1,10 @@
 ;;; rmailmsc.el --- miscellaneous support functions for the RMAIL mail reader
 
-;; Copyright (C) 1985, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-;;   2009  Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2014 Free Software Foundation, Inc.
 
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: mail
+;; Package: rmail
 
 ;; This file is part of GNU Emacs.
 
@@ -25,20 +25,15 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'rmail))
-
-(defvar rmail-current-message)
-(defvar rmail-inbox-list)
-
-(declare-function mail-parse-comma-list "mail-utils" ())
-(declare-function rmail-show-message "rmail" (&optional msg))
+(require 'rmail)
 
 ;;;###autoload
 (defun set-rmail-inbox-list (file-name)
   "Set the inbox list of the current RMAIL file to FILE-NAME.
 You can specify one file name, or several names separated by commas.
-If FILE-NAME is empty, remove any existing inbox list."
+If FILE-NAME is empty, remove any existing inbox list.
+
+This applies only to the current session."
   (interactive "sSet mailbox list to (comma-separated list of filenames): ")
   (unless (eq major-mode 'rmail-mode)
     (error "set-rmail-inbox-list works only for an Rmail file"))
@@ -46,6 +41,7 @@ If FILE-NAME is empty, remove any existing inbox list."
         (with-temp-buffer
           (insert file-name)
           (goto-char (point-min))
+          ;; split-string does not remove leading/trailing whitespace.
           (nreverse (mail-parse-comma-list)))))
     (when (or (not rmail-inbox-list)
              (y-or-n-p (concat "Replace "
@@ -56,7 +52,10 @@ If FILE-NAME is empty, remove any existing inbox list."
       (message "Setting the inbox list for %s for this session"
               (file-name-nondirectory (buffer-file-name)))
       (setq rmail-inbox-list inbox-list)))
-  (rmail-show-message rmail-current-message))
+  (rmail-show-message-1 rmail-current-message))
+
+;; Local Variables:
+;; generated-autoload-file: "rmail.el"
+;; End:
 
-;; arch-tag: 94614a62-2a0a-4e25-bac9-06f461ed4c60
 ;;; rmailmsc.el ends here