From: ShengHuo ZHU <zsh@cs.rochester.edu>
Date: Wed, 9 Jan 2002 03:38:01 +0000 (+0000)
Subject: * gnus-start.el (gnus-read-init-file): Cleaned up.
X-Git-Tag: ttn-vms-21-2-B4~17243
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=39d74434e3feb260477cbb4abec47fbd2988a9b1;p=emacs.git

* gnus-start.el (gnus-read-init-file): Cleaned up.
* gnus-start.el (gnus-startup-file-coding-system): Removed.
(gnus-read-init-file): Don't use it.
* gnus-start.el (gnus-read-init-file): Don't force coding system
for ~/.gnus.
From Lars Magne Ingebrigtsen  <larsi@gnus.org>
From Dave Love <fx@gnu.org>
From Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 015e07e5bc2..fb15fcb2a27 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,14 @@
+2002-01-08  ShengHuo ZHU  <zsh@cs.rochester.edu>
+	
+	* gnus-start.el (gnus-read-init-file): Cleaned up.
+	* gnus-start.el (gnus-startup-file-coding-system): Removed.
+	(gnus-read-init-file): Don't use it.
+	* gnus-start.el (gnus-read-init-file): Don't force coding system
+	for ~/.gnus.  
+	From Lars Magne Ingebrigtsen  <larsi@gnus.org>
+	From Dave Love <fx@gnu.org>
+ 	From Kai Gro,A_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
 2002-01-03  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* mm-util.el (mm-charset-to-coding-system): Don't setq charset.
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index d70124879cd..3aabf21817f 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -395,11 +395,8 @@ Can be used to turn version control on or off."
 
 ;;; Internal variables
 
-(defvar gnus-startup-file-coding-system 'binary
-  "*Coding system for startup file.")
-
-(defvar gnus-ding-file-coding-system 'emacs-mule
-  "*Coding system for ding file.")
+(defvar gnus-ding-file-coding-system mm-universal-coding-system
+  "Coding system for ding file.")
 
 (defvar gnus-newsrc-file-version nil)
 (defvar gnus-override-subscribe-method nil)
@@ -427,21 +424,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")))
-	       (condition-case var
-		   (let ((coding-system-for-read
-			  gnus-startup-file-coding-system))
-		     (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