From 39d74434e3feb260477cbb4abec47fbd2988a9b1 Mon Sep 17 00:00:00 2001 From: ShengHuo ZHU Date: Wed, 9 Jan 2002 03:38:01 +0000 Subject: [PATCH] =?utf8?q?*=20gnus-start.el=20(gnus-read-init-file):=20Cle?= =?utf8?q?aned=20up.=20*=20gnus-start.el=20(gnus-startup-file-coding-syste?= =?utf8?q?m):=20Removed.=20(gnus-read-init-file):=20Don't=20use=20it.=20*?= =?utf8?q?=20gnus-start.el=20(gnus-read-init-file):=20Don't=20force=20codi?= =?utf8?q?ng=20system=20for=20~/.gnus.=20From=20Lars=20Magne=20Ingebrigtse?= =?utf8?q?n=20=20=20From=20Dave=20Love=20=20Fr?= =?utf8?q?om=20Kai=20Gro=1B,A=5F=1B(Bjohann=20=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lisp/gnus/ChangeLog | 11 +++++++++++ lisp/gnus/gnus-start.el | 31 +++++++++++-------------------- 2 files changed, 22 insertions(+), 20 deletions(-) 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 + + * 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 + From Dave Love + From Kai Gro,A_(Bjohann + 2002-01-03 ShengHuo ZHU * 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 -- 2.39.2