[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-start.el

[ShengHuo ZHU]

Index: emacs/lisp/gnus/gnus-start.el
diff -c emacs/lisp/gnus/gnus-start.el:1.17 emacs/lisp/gnus/gnus-start.el:1.18
*** emacs/lisp/gnus/gnus-start.el:1.17  Wed Aug  1 06:46:23 2001
--- emacs/lisp/gnus/gnus-start.el       Tue Jan  8 22:38:01 2002
***************
*** 395,405 ****
  
  ;;; 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-newsrc-file-version nil)
  (defvar gnus-override-subscribe-method nil)
--- 395,402 ----
  
  ;;; Internal variables
  
! (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,447 ****
      (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)))))))))
  
  ;; For subscribing new newsgroup
  
--- 424,438 ----
      (if gnus-init-inhibit
        (setq gnus-init-inhibit nil)
        (setq gnus-init-inhibit inhibit-next)
!       (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