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

[Juanma Barranquero]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.311 emacs/lisp/startup.el:1.312
*** emacs/lisp/startup.el:1.311 Sat Oct 26 18:41:33 2002
--- emacs/lisp/startup.el       Tue Feb  4 07:06:14 2003
***************
*** 366,372 ****
  More precisely, this uses only the subdirectories whose names
  start with letters or digits; it excludes any subdirectory named `RCS'
  or `CVS', and any subdirectory that contains a file named `.nosearch'."
!   (let (dirs 
        attrs
        (pending (list default-directory)))
      ;; This loop does a breadth-first tree walk on DIR's subtree,
--- 366,372 ----
  More precisely, this uses only the subdirectories whose names
  start with letters or digits; it excludes any subdirectory named `RCS'
  or `CVS', and any subdirectory that contains a file named `.nosearch'."
!   (let (dirs
        attrs
        (pending (list default-directory)))
      ;; This loop does a breadth-first tree walk on DIR's subtree,
***************
*** 485,491 ****
                              (make-directory
                               (file-name-directory auto-save-list-file-prefix)
                               t)
!                             (concat 
                               (make-temp-name
                                (expand-file-name
                                 auto-save-list-file-prefix))
--- 485,491 ----
                              (make-directory
                               (file-name-directory auto-save-list-file-prefix)
                               t)
!                             (concat
                               (make-temp-name
                                (expand-file-name
                                 auto-save-list-file-prefix))
***************
*** 880,886 ****
      ;; Run the site-start library if it exists.  The point of this file is
      ;; that it is run before .emacs.  There is no point in doing this after
      ;; .emacs; that is useless.
!     (if site-run-file 
        (load site-run-file t t))
  
      ;; Sites should not disable this.  Only individuals should disable
--- 880,886 ----
      ;; Run the site-start library if it exists.  The point of this file is
      ;; that it is run before .emacs.  There is no point in doing this after
      ;; .emacs; that is useless.
!     (if site-run-file
        (load site-run-file t t))
  
      ;; Sites should not disable this.  Only individuals should disable
***************
*** 907,913 ****
                             (if (directory-files "~" nil 
"^\\.emacs\\(\\.elc?\\)?$")
                                 "~/.emacs"
                               "~/_emacs"))
!                           ((eq system-type 'vax-vms) 
                             "sys$login:.emacs")
                            (t
                             (concat "~" init-file-user "/.emacs")))))
--- 907,913 ----
                             (if (directory-files "~" nil 
"^\\.emacs\\(\\.elc?\\)?$")
                                 "~/.emacs"
                               "~/_emacs"))
!                           ((eq system-type 'vax-vms)
                             "sys$login:.emacs")
                            (t
                             (concat "~" init-file-user "/.emacs")))))
***************
*** 915,921 ****
                      ;; into user-init-file.
                      (setq user-init-file t)
                      (load user-init-file-1 t t)
!                     
                      (when (eq user-init-file t)
                        ;; If we did not find ~/.emacs, try
                        ;; ~/.emacs.d/.emacs.
--- 915,921 ----
                      ;; into user-init-file.
                      (setq user-init-file t)
                      (load user-init-file-1 t t)
! 
                      (when (eq user-init-file t)
                        ;; If we did not find ~/.emacs, try
                        ;; ~/.emacs.d/.emacs.
***************
*** 933,939 ****
                          ;; Don't let it be set from default.el.
                          (when (eq user-init-file t)
                            (setq user-init-file user-init-file-1))))
!                     
                      ;; If we loaded a compiled file, set
                      ;; `user-init-file' to the source version if that
                      ;; exists.
--- 933,939 ----
                          ;; Don't let it be set from default.el.
                          (when (eq user-init-file t)
                            (setq user-init-file user-init-file-1))))
! 
                      ;; If we loaded a compiled file, set
                      ;; `user-init-file' to the source version if that
                      ;; exists.
***************
*** 951,963 ****
                                       source user-init-file)
                              (sit-for 1))
                            (setq user-init-file source))))
!                     
                      (when (and (stringp custom-file)
                                 (not (assoc custom-file load-history)))
                        ;; If the .emacs file has set `custom-file' but hasn't
                        ;; loaded the file yet, let's load it.
                        (load custom-file t t))
!                     
                      (or inhibit-default-init
                          (let ((inhibit-startup-message nil))
                            ;; Users are supposed to be told their rights.
--- 951,963 ----
                                       source user-init-file)
                              (sit-for 1))
                            (setq user-init-file source))))
! 
                      (when (and (stringp custom-file)
                                 (not (assoc custom-file load-history)))
                        ;; If the .emacs file has set `custom-file' but hasn't
                        ;; loaded the file yet, let's load it.
                        (load custom-file t t))
! 
                      (or inhibit-default-init
                          (let ((inhibit-startup-message nil))
                            ;; Users are supposed to be told their rights.
***************
*** 1025,1031 ****
        ;; originally done before unibyte was set and is sensitive to
        ;; unibyte (display table, terminal coding system &c).
        (set-language-environment current-language-environment)))
!     
      ;; Do this here in case the init file sets mail-host-address.
      (if (equal user-mail-address "")
        (setq user-mail-address (concat (user-login-name) "@"
--- 1025,1031 ----
        ;; originally done before unibyte was set and is sensitive to
        ;; unibyte (display table, terminal coding system &c).
        (set-language-environment current-language-environment)))
! 
      ;; Do this here in case the init file sets mail-host-address.
      (if (equal user-mail-address "")
        (setq user-mail-address (concat (user-login-name) "@"
***************
*** 1039,1045 ****
                 (eq font-list-limit old-font-list-limit)
                 (eq face-ignored-fonts old-face-ignored-fonts))
        (clear-face-cache)))
!     
    (run-hooks 'after-init-hook)
  
    ;; If *scratch* exists and init file didn't change its mode, initialize it.
--- 1039,1045 ----
                 (eq font-list-limit old-font-list-limit)
                 (eq face-ignored-fonts old-face-ignored-fonts))
        (clear-face-cache)))
! 
    (run-hooks 'after-init-hook)
  
    ;; If *scratch* exists and init file didn't change its mode, initialize it.
***************
*** 1047,1053 ****
        (with-current-buffer "*scratch*"
        (if (eq major-mode 'fundamental-mode)
            (funcall initial-major-mode))))
!   
    ;; Load library for our terminal type.
    ;; User init file can set term-file-prefix to nil to prevent this.
    (and term-file-prefix (not noninteractive) (not window-system)
--- 1047,1053 ----
        (with-current-buffer "*scratch*"
        (if (eq major-mode 'fundamental-mode)
            (funcall initial-major-mode))))
! 
    ;; Load library for our terminal type.
    ;; User init file can set term-file-prefix to nil to prevent this.
    (and term-file-prefix (not noninteractive) (not window-system)
***************
*** 1310,1316 ****
                    display-hourglass nil
                    minor-mode-map-alist nil
                    buffer-undo-list t
!                   mode-line-format (propertize "---- %b %-" 
                                                 'face '(:weight bold))
                    fancy-splash-stop-time (+ (float-time)
                                              (max 60 fancy-splash-max-time))
--- 1310,1316 ----
                    display-hourglass nil
                    minor-mode-map-alist nil
                    buffer-undo-list t
!                   mode-line-format (propertize "---- %b %-"
                                                 'face '(:weight bold))
                    fancy-splash-stop-time (+ (float-time)
                                              (max 60 fancy-splash-max-time))
***************
*** 1357,1363 ****
      (unwind-protect
        (with-current-buffer (get-buffer-create "GNU Emacs")
          (let ((tab-width 8)
!               (mode-line-format (propertize "---- %b %-" 
                                              'face '(:weight bold))))
  
            ;; The convention for this piece of code is that
--- 1357,1363 ----
      (unwind-protect
        (with-current-buffer (get-buffer-create "GNU Emacs")
          (let ((tab-width 8)
!               (mode-line-format (propertize "---- %b %-"
                                              'face '(:weight bold))))
  
            ;; The convention for this piece of code is that
***************
*** 1448,1454 ****
              (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
                       (eq (key-binding "\C-h\C-d") 'describe-distribution)
                       (eq (key-binding "\C-h\C-w") 'describe-no-warranty))
!                 (insert 
                   "\n
  GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for full details.
  Emacs is Free Software--Free as in Freedom--so you can redistribute copies
--- 1448,1454 ----
              (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
                       (eq (key-binding "\C-h\C-d") 'describe-distribution)
                       (eq (key-binding "\C-h\C-w") 'describe-no-warranty))
!                 (insert
                   "\n
  GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for full details.
  Emacs is Free Software--Free as in Freedom--so you can redistribute copies