2002-01-03 Lars Magne Ingebrigtsen <larsi@gnus.org>

	* gnus-start.el (gnus-read-init-file): Cleaned up.

2002-01-03  Dave Love  <d.love@dl.ac.uk>

	* gnus-start.el (gnus-startup-file-coding-system): Removed.
	(gnus-read-init-file): Don't use it.

2002-01-03  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>

	* gnus-start.el (gnus-read-init-file): Don't force coding system
	for ~/.gnus.  From Dave Love <fx@gnu.org>.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2092dd639e45b8ae3cf960c3bbd84606b0ff9cb0..5b3776c0329393fd7bbf8fb2cab1f5e18997fa97 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,17 @@
+2002-01-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-start.el (gnus-read-init-file): Cleaned up.
+
+2002-01-03  Dave Love  <d.love@dl.ac.uk>
+
+       * gnus-start.el (gnus-startup-file-coding-system): Removed.
+       (gnus-read-init-file): Don't use it.
+
+2002-01-03  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * gnus-start.el (gnus-read-init-file): Don't force coding system
+       for ~/.gnus.  From Dave Love <fx@gnu.org>.
+       
 2001-10-30  Simon Josefsson  <jas@extundo.com>
 
        * nnimap.el (nnimap-date-days-ago): Defeat locale.

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index d70124879cd9c30572372884071b5c03b5d2b37e..69ff17b4d7f79e4ce6a7cf4060d865d535015655 100644 (file)
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/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>
@@ -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