X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-start.el;h=c7f1f8ece05b3ab07b9d64e2ebac9f3025142fa4;hb=7140fbf33061efeae72c71509fca0abfba457933;hp=8b19bee1001f2104eda8d51547cd88eb84f4a624;hpb=fb74c6b3b0b50bbd8b88bff08b1f0998d9d7b1ff;p=gnus

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 8b19bee10..c7f1f8ece 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1103,10 +1103,16 @@ for new groups, and subscribe the new groups as zombies."
     got-new))
 
 (defun gnus-check-first-time-used ()
-  (if (or (file-exists-p gnus-startup-file)
-	  (file-exists-p (concat gnus-startup-file ".el"))
-	  (file-exists-p (concat gnus-startup-file ".eld")))
-      nil
+  (catch 'ended
+    (let ((files (list gnus-current-startup-file
+		       (concat gnus-current-startup-file ".el")
+		       (concat gnus-current-startup-file ".eld")
+		       gnus-startup-file
+		       (concat gnus-startup-file ".el")
+		       (concat gnus-startup-file ".eld"))))
+      (while files
+	(when (file-exists-p (pop files))
+	  (throw 'ended nil))))
     (gnus-message 6 "First time user; subscribing you to default groups")
     (unless (gnus-read-active-file-p)
       (let ((gnus-read-active-file t))