/[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.311 by rms, Sat Oct 26 22:41:33 2002 UTC revision 1.312 by lektu, Tue Feb 4 12:06:14 2003 UTC
# Line 366  from being initialized." Line 366  from being initialized."
366  More precisely, this uses only the subdirectories whose names  More precisely, this uses only the subdirectories whose names
367  start with letters or digits; it excludes any subdirectory named `RCS'  start with letters or digits; it excludes any subdirectory named `RCS'
368  or `CVS', and any subdirectory that contains a file named `.nosearch'."  or `CVS', and any subdirectory that contains a file named `.nosearch'."
369    (let (dirs    (let (dirs
370          attrs          attrs
371          (pending (list default-directory)))          (pending (list default-directory)))
372      ;; This loop does a breadth-first tree walk on DIR's subtree,      ;; This loop does a breadth-first tree walk on DIR's subtree,
# Line 485  or `CVS', and any subdirectory that cont Line 485  or `CVS', and any subdirectory that cont
485                                (make-directory                                (make-directory
486                                 (file-name-directory auto-save-list-file-prefix)                                 (file-name-directory auto-save-list-file-prefix)
487                                 t)                                 t)
488                                (concat                                (concat
489                                 (make-temp-name                                 (make-temp-name
490                                  (expand-file-name                                  (expand-file-name
491                                   auto-save-list-file-prefix))                                   auto-save-list-file-prefix))
# Line 880  or `CVS', and any subdirectory that cont Line 880  or `CVS', and any subdirectory that cont
880      ;; Run the site-start library if it exists.  The point of this file is      ;; Run the site-start library if it exists.  The point of this file is
881      ;; that it is run before .emacs.  There is no point in doing this after      ;; that it is run before .emacs.  There is no point in doing this after
882      ;; .emacs; that is useless.      ;; .emacs; that is useless.
883      (if site-run-file      (if site-run-file
884          (load site-run-file t t))          (load site-run-file t t))
885    
886      ;; Sites should not disable this.  Only individuals should disable      ;; Sites should not disable this.  Only individuals should disable
# Line 907  or `CVS', and any subdirectory that cont Line 907  or `CVS', and any subdirectory that cont
907                               (if (directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$")                               (if (directory-files "~" nil "^\\.emacs\\(\\.elc?\\)?$")
908                                   "~/.emacs"                                   "~/.emacs"
909                                 "~/_emacs"))                                 "~/_emacs"))
910                              ((eq system-type 'vax-vms)                              ((eq system-type 'vax-vms)
911                               "sys$login:.emacs")                               "sys$login:.emacs")
912                              (t                              (t
913                               (concat "~" init-file-user "/.emacs")))))                               (concat "~" init-file-user "/.emacs")))))
# Line 915  or `CVS', and any subdirectory that cont Line 915  or `CVS', and any subdirectory that cont
915                        ;; into user-init-file.                        ;; into user-init-file.
916                        (setq user-init-file t)                        (setq user-init-file t)
917                        (load user-init-file-1 t t)                        (load user-init-file-1 t t)
918                          
919                        (when (eq user-init-file t)                        (when (eq user-init-file t)
920                          ;; If we did not find ~/.emacs, try                          ;; If we did not find ~/.emacs, try
921                          ;; ~/.emacs.d/.emacs.                          ;; ~/.emacs.d/.emacs.
# Line 933  or `CVS', and any subdirectory that cont Line 933  or `CVS', and any subdirectory that cont
933                            ;; Don't let it be set from default.el.                            ;; Don't let it be set from default.el.
934                            (when (eq user-init-file t)                            (when (eq user-init-file t)
935                              (setq user-init-file user-init-file-1))))                              (setq user-init-file user-init-file-1))))
936                          
937                        ;; If we loaded a compiled file, set                        ;; If we loaded a compiled file, set
938                        ;; `user-init-file' to the source version if that                        ;; `user-init-file' to the source version if that
939                        ;; exists.                        ;; exists.
# Line 951  or `CVS', and any subdirectory that cont Line 951  or `CVS', and any subdirectory that cont
951                                         source user-init-file)                                         source user-init-file)
952                                (sit-for 1))                                (sit-for 1))
953                              (setq user-init-file source))))                              (setq user-init-file source))))
954                          
955                        (when (and (stringp custom-file)                        (when (and (stringp custom-file)
956                                   (not (assoc custom-file load-history)))                                   (not (assoc custom-file load-history)))
957                          ;; If the .emacs file has set `custom-file' but hasn't                          ;; If the .emacs file has set `custom-file' but hasn't
958                          ;; loaded the file yet, let's load it.                          ;; loaded the file yet, let's load it.
959                          (load custom-file t t))                          (load custom-file t t))
960                          
961                        (or inhibit-default-init                        (or inhibit-default-init
962                            (let ((inhibit-startup-message nil))                            (let ((inhibit-startup-message nil))
963                              ;; Users are supposed to be told their rights.                              ;; Users are supposed to be told their rights.
# Line 1025  or `CVS', and any subdirectory that cont Line 1025  or `CVS', and any subdirectory that cont
1025          ;; originally done before unibyte was set and is sensitive to          ;; originally done before unibyte was set and is sensitive to
1026          ;; unibyte (display table, terminal coding system &c).          ;; unibyte (display table, terminal coding system &c).
1027          (set-language-environment current-language-environment)))          (set-language-environment current-language-environment)))
1028        
1029      ;; Do this here in case the init file sets mail-host-address.      ;; Do this here in case the init file sets mail-host-address.
1030      (if (equal user-mail-address "")      (if (equal user-mail-address "")
1031          (setq user-mail-address (concat (user-login-name) "@"          (setq user-mail-address (concat (user-login-name) "@"
# Line 1039  or `CVS', and any subdirectory that cont Line 1039  or `CVS', and any subdirectory that cont
1039                   (eq font-list-limit old-font-list-limit)                   (eq font-list-limit old-font-list-limit)
1040                   (eq face-ignored-fonts old-face-ignored-fonts))                   (eq face-ignored-fonts old-face-ignored-fonts))
1041        (clear-face-cache)))        (clear-face-cache)))
1042        
1043    (run-hooks 'after-init-hook)    (run-hooks 'after-init-hook)
1044    
1045    ;; 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.
# Line 1047  or `CVS', and any subdirectory that cont Line 1047  or `CVS', and any subdirectory that cont
1047        (with-current-buffer "*scratch*"        (with-current-buffer "*scratch*"
1048          (if (eq major-mode 'fundamental-mode)          (if (eq major-mode 'fundamental-mode)
1049              (funcall initial-major-mode))))              (funcall initial-major-mode))))
1050      
1051    ;; Load library for our terminal type.    ;; Load library for our terminal type.
1052    ;; User init file can set term-file-prefix to nil to prevent this.    ;; User init file can set term-file-prefix to nil to prevent this.
1053    (and term-file-prefix (not noninteractive) (not window-system)    (and term-file-prefix (not noninteractive) (not window-system)
# Line 1310  where FACE is a valid face specification Line 1310  where FACE is a valid face specification
1310                      display-hourglass nil                      display-hourglass nil
1311                      minor-mode-map-alist nil                      minor-mode-map-alist nil
1312                      buffer-undo-list t                      buffer-undo-list t
1313                      mode-line-format (propertize "---- %b %-"                      mode-line-format (propertize "---- %b %-"
1314                                                   'face '(:weight bold))                                                   'face '(:weight bold))
1315                      fancy-splash-stop-time (+ (float-time)                      fancy-splash-stop-time (+ (float-time)
1316                                                (max 60 fancy-splash-max-time))                                                (max 60 fancy-splash-max-time))
# Line 1357  we put it on this frame." Line 1357  we put it on this frame."
1357      (unwind-protect      (unwind-protect
1358          (with-current-buffer (get-buffer-create "GNU Emacs")          (with-current-buffer (get-buffer-create "GNU Emacs")
1359            (let ((tab-width 8)            (let ((tab-width 8)
1360                  (mode-line-format (propertize "---- %b %-"                  (mode-line-format (propertize "---- %b %-"
1361                                                'face '(:weight bold))))                                                'face '(:weight bold))))
1362    
1363              ;; The convention for this piece of code is that              ;; The convention for this piece of code is that
# Line 1448  Copyright (C) 2002 Free Software Foundat Line 1448  Copyright (C) 2002 Free Software Foundat
1448                (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)                (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
1449                         (eq (key-binding "\C-h\C-d") 'describe-distribution)                         (eq (key-binding "\C-h\C-d") 'describe-distribution)
1450                         (eq (key-binding "\C-h\C-w") 'describe-no-warranty))                         (eq (key-binding "\C-h\C-w") 'describe-no-warranty))
1451                    (insert                    (insert
1452                     "\n                     "\n
1453  GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for full details.  GNU Emacs comes with ABSOLUTELY NO WARRANTY; type C-h C-w for full details.
1454  Emacs is Free Software--Free as in Freedom--so you can redistribute copies  Emacs is Free Software--Free as in Freedom--so you can redistribute copies

Legend:
Removed from v.1.311  
changed lines
  Added in v.1.312

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