Mercurial > emacs
changeset 42627:2270bf351eba
* 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>
| author | ShengHuo ZHU <zsh@cs.rochester.edu> |
|---|---|
| date | Wed, 09 Jan 2002 03:38:01 +0000 |
| parents | 56d339fb951d |
| children | 55e0120deff6 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-start.el |
| diffstat | 2 files changed, 22 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Wed Jan 09 00:31:58 2002 +0000 +++ b/lisp/gnus/ChangeLog Wed Jan 09 03:38:01 2002 +0000 @@ -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.
--- a/lisp/gnus/gnus-start.el Wed Jan 09 00:31:58 2002 +0000 +++ b/lisp/gnus/gnus-start.el Wed Jan 09 03:38:01 2002 +0000 @@ -395,11 +395,8 @@ ;;; 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 @@ (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