# HG changeset patch
# User Henrik Enberg <henrik.enberg@telia.com>
# Date 1137774457 0
# Node ID a98285deef682b165f9efc1b4ec702984ace6458
# Parent  c4d7d203421c5bcbe179704aad04403c829c70f1
(set-rmail-inbox-list): Rewrite to only set inbox
list temporarily for a session.

diff -r c4d7d203421c -r a98285deef68 lisp/mail/rmailmsc.el
--- a/lisp/mail/rmailmsc.el	Fri Jan 20 16:26:28 2006 +0000
+++ b/lisp/mail/rmailmsc.el	Fri Jan 20 16:27:37 2006 +0000
@@ -38,30 +38,22 @@
 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): ")
-
   (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))
+	   (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))
+      (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))
 
 ;;; arch-tag: 74ed1d50-2c25-4cbd-b5ae-d29ed8aba6e4