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

[Richard M. Stallman]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.313 emacs/lisp/startup.el:1.314
*** emacs/lisp/startup.el:1.313 Fri Feb 21 07:43:31 2003
--- emacs/lisp/startup.el       Sun Feb 23 10:16:29 2003
***************
*** 270,275 ****
--- 270,279 ----
  so as to override the definitions made by the terminal-specific file.
  Emacs never sets this variable itself.")
  
+ (defvar inhibit-startup-hooks nil
+   "Non-nil means don't run `term-setup-hook' and `emacs-startup-hook'.
+ This is because we already did so.")
+ 
  (defvar keyboard-type nil
    "The brand of keyboard you are using.
  This variable is used to define
***************
*** 496,504 ****
                                       auto-save-list-file-prefix
                                       (emacs-pid)
                                       (system-name))))))))
!       (run-hooks 'emacs-startup-hook)
!       (and term-setup-hook
!            (run-hooks 'term-setup-hook))
  
        ;; Don't do this if we failed to create the initial frame,
        ;; for instance due to a dense colormap.
--- 500,509 ----
                                       auto-save-list-file-prefix
                                       (emacs-pid)
                                       (system-name))))))))
!       (unless inhibit-startup-hooks
!         (run-hooks 'emacs-startup-hook)
!         (and term-setup-hook
!              (run-hooks 'term-setup-hook)))
  
        ;; Don't do this if we failed to create the initial frame,
        ;; for instance due to a dense colormap.
***************
*** 1755,1764 ****
      ;; If there are no switches to process, we might as well
      ;; run this hook now, and there may be some need to do it
      ;; before doing any output.
      (and term-setup-hook
         (run-hooks 'term-setup-hook))
!     ;; Don't let the hook be run twice.
!     (setq term-setup-hook nil)
  
      ;; It's important to notice the user settings before we
      ;; display the startup message; otherwise, the settings
--- 1760,1769 ----
      ;; If there are no switches to process, we might as well
      ;; run this hook now, and there may be some need to do it
      ;; before doing any output.
+     (run-hooks 'emacs-startup-hook)
      (and term-setup-hook
         (run-hooks 'term-setup-hook))
!     (setq inhibit-startup-hooks t)
  
      ;; It's important to notice the user settings before we
      ;; display the startup message; otherwise, the settings