# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1046013389 0
# Node ID 2d6097436427c7aa402056fefa455e5958bf1fd3
# Parent  43b8fcc10f4dfc586811c1a5e9cdf01d917e024a
(inhibit-startup-hooks): New variable.
(normal-top-level): Obey that variable.
(command-line-1): Run emacs-startup-hook before term-setup-hook.
Set inhibit-startup-hooks too.

diff -r 43b8fcc10f4d -r 2d6097436427 lisp/startup.el
--- a/lisp/startup.el	Sun Feb 23 15:14:08 2003 +0000
+++ b/lisp/startup.el	Sun Feb 23 15:16:29 2003 +0000
@@ -270,6 +270,10 @@
 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,9 +500,10 @@
 				       auto-save-list-file-prefix
 				       (emacs-pid)
 				       (system-name))))))))
-	(run-hooks 'emacs-startup-hook)
-	(and term-setup-hook
-	     (run-hooks 'term-setup-hook))
+	(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,10 +1760,10 @@
     ;; 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))
-    ;; Don't let the hook be run twice.
-    (setq term-setup-hook nil)
+    (setq inhibit-startup-hooks t)
 
     ;; It's important to notice the user settings before we
     ;; display the startup message; otherwise, the settings