/[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.313 by kfstorm, Fri Feb 21 12:43:31 2003 UTC revision 1.314 by rms, Sun Feb 23 15:16:29 2003 UTC
# Line 270  It also follows `emacs-startup-hook'.  T Line 270  It also follows `emacs-startup-hook'.  T
270  so as to override the definitions made by the terminal-specific file.  so as to override the definitions made by the terminal-specific file.
271  Emacs never sets this variable itself.")  Emacs never sets this variable itself.")
272    
273    (defvar inhibit-startup-hooks nil
274      "Non-nil means don't run `term-setup-hook' and `emacs-startup-hook'.
275    This is because we already did so.")
276    
277  (defvar keyboard-type nil  (defvar keyboard-type nil
278    "The brand of keyboard you are using.    "The brand of keyboard you are using.
279  This variable is used to define  This variable is used to define
# Line 496  or `CVS', and any subdirectory that cont Line 500  or `CVS', and any subdirectory that cont
500                                         auto-save-list-file-prefix                                         auto-save-list-file-prefix
501                                         (emacs-pid)                                         (emacs-pid)
502                                         (system-name))))))))                                         (system-name))))))))
503          (run-hooks 'emacs-startup-hook)          (unless inhibit-startup-hooks
504          (and term-setup-hook            (run-hooks 'emacs-startup-hook)
505               (run-hooks 'term-setup-hook))            (and term-setup-hook
506                   (run-hooks 'term-setup-hook)))
507    
508          ;; Don't do this if we failed to create the initial frame,          ;; Don't do this if we failed to create the initial frame,
509          ;; for instance due to a dense colormap.          ;; for instance due to a dense colormap.
# Line 1755  normal otherwise." Line 1760  normal otherwise."
1760      ;; If there are no switches to process, we might as well      ;; If there are no switches to process, we might as well
1761      ;; run this hook now, and there may be some need to do it      ;; run this hook now, and there may be some need to do it
1762      ;; before doing any output.      ;; before doing any output.
1763        (run-hooks 'emacs-startup-hook)
1764      (and term-setup-hook      (and term-setup-hook
1765           (run-hooks 'term-setup-hook))           (run-hooks 'term-setup-hook))
1766      ;; Don't let the hook be run twice.      (setq inhibit-startup-hooks t)
     (setq term-setup-hook nil)  
1767    
1768      ;; It's important to notice the user settings before we      ;; It's important to notice the user settings before we
1769      ;; display the startup message; otherwise, the settings      ;; display the startup message; otherwise, the settings

Legend:
Removed from v.1.313  
changed lines
  Added in v.1.314

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