/[emacs]/emacs/lisp/startup.el
ViewVC logotype

Diff of /emacs/lisp/startup.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.303 by gm, Sun Aug 4 16:18:18 2002 UTC revision 1.304 by monnier, Wed Aug 14 21:46:21 2002 UTC
# Line 932  or `CVS', and any subdirectory that cont Line 932  or `CVS', and any subdirectory that cont
932                                (sit-for 1))                                (sit-for 1))
933                              (setq user-init-file source))))                              (setq user-init-file source))))
934                                                
935                          (when (and (stringp custom-file)
936                                     (not (assoc custom-file load-history)))
937                            ;; If the .emacs file has set `custom-file' but hasn't
938                            ;; loaded the file yet, let's load it.
939                            (load custom-file t t))
940                          
941                        (or inhibit-default-init                        (or inhibit-default-init
942                            (let ((inhibit-startup-message nil))                            (let ((inhibit-startup-message nil))
943                              ;; Users are supposed to be told their rights.                              ;; Users are supposed to be told their rights.
# Line 1018  or `CVS', and any subdirectory that cont Line 1024  or `CVS', and any subdirectory that cont
1024    
1025    ;; If *scratch* exists and init file didn't change its mode, initialize it.    ;; If *scratch* exists and init file didn't change its mode, initialize it.
1026    (if (get-buffer "*scratch*")    (if (get-buffer "*scratch*")
1027        (save-excursion        (with-current-buffer "*scratch*"
         (set-buffer "*scratch*")  
1028          (if (eq major-mode 'fundamental-mode)          (if (eq major-mode 'fundamental-mode)
1029              (funcall initial-major-mode))))              (funcall initial-major-mode))))
1030        

Legend:
Removed from v.1.303  
changed lines
  Added in v.1.304

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26