Merge from emacs-23 branch.

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

diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index 5ea1848..919f52a 100644 (file)
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -1,10 +1,11 @@
 ;;; rmailmsc.el --- miscellaneous support functions for the RMAIL mail reader
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-;;   2009  Free Software Foundation, Inc.
+;;   2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
+;; Package: rmail
 
 ;; This file is part of GNU Emacs.
 
@@ -31,7 +32,9 @@
 (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"))
@@ -39,6 +42,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 "
@@ -51,5 +55,9 @@ If FILE-NAME is empty, remove any existing inbox list."
       (setq rmail-inbox-list inbox-list)))
   (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