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

[Stefan Monnier]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.303 emacs/lisp/startup.el:1.304
*** emacs/lisp/startup.el:1.303 Sun Aug  4 12:18:18 2002
--- emacs/lisp/startup.el       Wed Aug 14 17:46:21 2002
***************
*** 932,937 ****
--- 932,943 ----
                              (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.
***************
*** 1018,1025 ****
  
    ;; If *scratch* exists and init file didn't change its mode, initialize it.
    (if (get-buffer "*scratch*")
!       (save-excursion
!       (set-buffer "*scratch*")
        (if (eq major-mode 'fundamental-mode)
            (funcall initial-major-mode))))
    
--- 1024,1030 ----
  
    ;; If *scratch* exists and init file didn't change its mode, initialize it.
    (if (get-buffer "*scratch*")
!       (with-current-buffer "*scratch*"
        (if (eq major-mode 'fundamental-mode)
            (funcall initial-major-mode))))