changeset 27353:611b3854d888

*** empty log message ***
author Richard M. Stallman <rms@gnu.org>
date Tue, 18 Jan 2000 02:48:57 +0000
parents 213da4da6910
children d56b84cbed9d
files lispref/os.texi
diffstat 1 files changed, 16 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lispref/os.texi	Mon Jan 17 17:26:27 2000 +0000
+++ b/lispref/os.texi	Tue Jan 18 02:48:57 2000 +0000
@@ -118,7 +118,7 @@
 It processes the action arguments from the command line.
 
 @item 
-It runs @code{term-setup-hook}.
+It runs @code{emacs-startup-hook} and then @code{term-setup-hook}.
 
 @item
 It calls @code{frame-notice-user-settings}, which modifies the
@@ -231,7 +231,21 @@
 @defvar after-init-hook
 This normal hook is run, once, just after loading all the init files
 (the user's init file, @file{default.el}, and/or @file{site-start.el}),
-before the terminal-specific initialization.
+before loading the terminal-specific library and processing the
+command-line arguments.
+@end defvar
+
+@defvar emacs-startup-hook
+@tindex emacs-startup-hook
+This normal hook is run, once, just after handling the command line
+arguments, just before @code{term-setup-hook}.
+@end defvar
+
+@defvar user-init-file
+@tindex user-init-file
+This variable holds the file name of the user's init file.  If the
+actual init file loaded is a compiled file, such as @file{.emacs.elc},
+the value refers to the corresponding source file.
 @end defvar
 
 @node Terminal-Specific