/[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.336 by rms, Tue Dec 28 15:30:39 2004 UTC revision 1.337 by teirllm, Mon Jan 3 23:43:34 2005 UTC
# Line 871  or `CVS', and any subdirectory that cont Line 871  or `CVS', and any subdirectory that cont
871                                (sit-for 1))                                (sit-for 1))
872                              (setq user-init-file source))))                              (setq user-init-file source))))
873    
                       (when (stringp custom-file)  
                         (unless (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)))  
   
874                        (unless inhibit-default-init                        (unless inhibit-default-init
875                          (let ((inhibit-startup-message nil))                          (let ((inhibit-startup-message nil))
876                            ;; Users are supposed to be told their rights.                            ;; Users are supposed to be told their rights.

Legend:
Removed from v.1.336  
changed lines
  Added in v.1.337

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