X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/5bc6ddff00c50acf546530ef0e08a27140614d27..114f9c96795aff3b51b9060d7c9c1b77debcc99a:/lisp/mail/rmailmsc.el

diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index eb21e9d71a..fe8a627fe6 100644
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -1,17 +1,17 @@
 ;;; rmailmsc.el --- miscellaneous support functions for the RMAIL mail reader
 
-;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;;   2009, 2010  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
 
 ;; 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
@@ -19,51 +19,44 @@
 ;; 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:
 
 ;;; Code:
 
-(defvar rmail-current-message)
-(defvar rmail-inbox-list)
-
-(declare-function rmail-parse-file-inboxes "rmail" ())
-(declare-function rmail-show-message "rmail" (&optional n no-summary))
+(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."
-  (interactive "sSet mailbox list to (comma-separated list of filenames): ")
+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"))
-
-  (save-excursion
-    (let ((names (rmail-parse-file-inboxes))
-	  (standard-output nil))
-      (if (or (not names)
+  (let ((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 "
-				(mapconcat 'identity names ", ")
+				(mapconcat 'identity
+					   rmail-inbox-list
+					   ", ")
 				"? ")))
-	  (let ((buffer-read-only nil))
-	    (widen)
-	    (goto-char (point-min))
-	    (search-forward "\n\^_")
-	    (re-search-backward "^Mail" nil t)
-	    (forward-line 0)
-	    (if (looking-at "Mail:")
-		(delete-region (point)
-			       (progn (forward-line 1)
-				      (point))))
-	    (if (not (string= file-name ""))
-		(insert-before-markers "Mail: " file-name "\n"))))))
-  (setq rmail-inbox-list (rmail-parse-file-inboxes))
-  (rmail-show-message rmail-current-message))
+      (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-1 rmail-current-message))
+
+;; Local Variables:
+;; generated-autoload-file: "rmail.el"
+;; End:
 
-;;; arch-tag: 74ed1d50-2c25-4cbd-b5ae-d29ed8aba6e4
+;; arch-tag: 94614a62-2a0a-4e25-bac9-06f461ed4c60
 ;;; rmailmsc.el ends here