# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 739436163 0
# Node ID c14c0f2954fd5c69f378194fb980d30b804aa050
# Parent  a9b1e2a5523bdde6436c06a5732b913b2e91ec24
(rmail-variables): Default rmail-inbox-list here.
(rmail): Not here.

diff -r a9b1e2a5523b -r c14c0f2954fd lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Mon Jun 07 05:32:28 1993 +0000
+++ b/lisp/mail/rmail.el	Mon Jun 07 06:56:03 1993 +0000
@@ -222,14 +222,6 @@
 	(or (eq major-mode 'rmail-mode)
 	    (rmail-mode-2))
       (rmail-mode-2)
-      ;; Provide default set of inboxes for primary mail file ~/RMAIL.
-      (and (null rmail-inbox-list)
-	   (null file-name-arg)
-	   (setq rmail-inbox-list
-		 (or rmail-primary-inbox-list
-		     (list (or (getenv "MAIL")
-			       (concat rmail-spool-directory
-				       (user-original-login-name)))))))
       ;; Convert all or part to Babyl file if possible.
       (rmail-convert-file)
       (goto-char (point-max))
@@ -450,6 +442,14 @@
   (make-local-variable 'rmail-last-file)
   (make-local-variable 'rmail-inbox-list)
   (setq rmail-inbox-list (rmail-parse-file-inboxes))
+  ;; Provide default set of inboxes for primary mail file ~/RMAIL.
+  (and (null rmail-inbox-list)
+       (equal buffer-file-name (expand-file-name rmail-file-name))
+       (setq rmail-inbox-list
+	     (or rmail-primary-inbox-list
+		 (list (or (getenv "MAIL")
+			   (concat rmail-spool-directory
+				   (user-original-login-name)))))))
   (make-local-variable 'rmail-keywords)
   ;; this gets generated as needed
   (setq rmail-keywords nil))