X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-start.el;h=61bec7d31732bbff09407629ef10c1f4329d146a;hb=72d4e01800a11f08c04173e1868a8683070e0463;hp=84801c70ce869e070b4a1f3f76b1c9a202ea63f1;hpb=04a88241179b917402a18b430f0c15814d7bbd2a;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 84801c7..61bec7d 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1,5 +1,5 @@
 ;;; gnus-start.el --- startup functions for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -415,17 +415,14 @@ Can be used to turn version control on or off."
   :group 'gnus-newsrc
   :type 'boolean)
 
-(defvar gnus-startup-file-coding-system (static-if (boundp 'MULE)
-					    '*ctext*
-					  'ctext)
-  "*Coding system for startup file.")
+;;; Internal variables
 
-(defvar gnus-ding-file-coding-system gnus-startup-file-coding-system
-  "*Coding system for ding file.")
+(defvar gnus-ding-file-coding-system (static-if (boundp 'MULE)
+					 '*ctext*
+				       'ctext)
+  "Coding system for ding file.")
 ;; Note that the ding file for T-gnus ought not to have byte-codes.
 
-;;; Internal variables
-
 (defvar gnus-newsrc-file-version nil)
 (defvar gnus-override-subscribe-method nil)
 (defvar gnus-dribble-buffer nil)
@@ -452,21 +449,15 @@ Can be used to turn version control on or off."
     (if gnus-init-inhibit
 	(setq gnus-init-inhibit nil)
       (setq gnus-init-inhibit inhibit-next)
-      (let ((files (list gnus-site-init-file gnus-init-file))
-	    file)
-	(while files
-	  (and (setq file (pop files))
-	       (or (and (file-exists-p file)
-			;; Don't try to load a directory.
-			(not (file-directory-p file)))
-		   (file-exists-p (concat file ".el"))
-		   (file-exists-p (concat file ".elc")))
-	       (if (or debug-on-error debug-on-quit)
-		   (load file nil t)
-		 (condition-case var
-		     (load file nil t)
-		   (error
-		    (error "Error in %s: %s" file var))))))))))
+      (dolist (file (list gnus-site-init-file gnus-init-file))
+	(when (and file
+		   (locate-library file))
+	  (if (or debug-on-error debug-on-quit)
+	      (load file nil t)
+	    (condition-case var
+		(load file nil t)
+	      (error
+	       (error "Error in %s: %s" file var)))))))))
 
 ;; For subscribing new newsgroup
 
@@ -1199,10 +1190,8 @@ for new groups, and subscribe the new groups as zombies."
   (catch 'ended
     ;; First check if any of the following files exist.  If they do,
     ;; it's not the first time the user has used Gnus.
-    (dolist (file (list gnus-current-startup-file
-			(concat gnus-current-startup-file ".el")
+    (dolist (file (list (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")))
       (when (file-exists-p file)