aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-03-30 16:04:08 +0000
committerRichard M. Stallman1994-03-30 16:04:08 +0000
commitb4484ea80e0e74a5ccacde75032fa8936923aa5a (patch)
tree5166540c07225238124c6f127caf2ebeb466926a
parentb02c5fea9079154ee8388d9b8a93699e9323fcf6 (diff)
downloademacs-b4484ea80e0e74a5ccacde75032fa8936923aa5a.tar.gz
emacs-b4484ea80e0e74a5ccacde75032fa8936923aa5a.zip
Doc fixes.
-rw-r--r--lisp/startup.el21
1 files changed, 10 insertions, 11 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index a600c96a3c3..2742984888c 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -82,13 +82,13 @@ remaining command-line args are in the variable `command-line-args-left'.")
82(defvar command-line-functions nil ;; lrs 7/31/89 82(defvar command-line-functions nil ;; lrs 7/31/89
83 "List of functions to process unrecognized command-line arguments. 83 "List of functions to process unrecognized command-line arguments.
84Each function should access the dynamically bound variables 84Each function should access the dynamically bound variables
85argi (the current argument) and command-line-args-left (the remaining 85`argi' (the current argument) and `command-line-args-left' (the remaining
86arguments). The function should return non-nil only if it recognizes and 86arguments). The function should return non-nil only if it recognizes and
87processes argi. If it does so, it may consume successive arguments by 87processes `argi'. If it does so, it may consume successive arguments by
88altering command-line-args-left to remove them.") 88altering `command-line-args-left' to remove them.")
89 89
90(defvar before-init-hook nil 90(defvar before-init-hook nil
91 "Functions to call after handling urgent options but before loading init file. 91 "Functions to call after handling urgent options but before init files.
92The frame system uses this to open frames to display messages while 92The frame system uses this to open frames to display messages while
93Emacs loads the user's initialization file.") 93Emacs loads the user's initialization file.")
94 94
@@ -98,22 +98,21 @@ The call is not protected by a condition-case, so you can set `debug-on-error'
98in `.emacs', and put all the actual code on `after-init-hook'.") 98in `.emacs', and put all the actual code on `after-init-hook'.")
99 99
100(defvar term-setup-hook nil 100(defvar term-setup-hook nil
101 "Functions to be called after loading terminal-specific lisp code. 101 "Functions to be called after loading terminal-specific Lisp code.
102See `run-hooks'. This variable exists for users to set, 102See `run-hooks'. This variable exists for users to set,
103so as to override the definitions made by the terminal-specific file. 103so as to override the definitions made by the terminal-specific file.
104Emacs never sets this variable itself.") 104Emacs never sets this variable itself.")
105 105
106(defvar keyboard-type nil 106(defvar keyboard-type nil
107 "The brand of keyboard you are using. This variable is used to define 107 "The brand of keyboard you are using.
108This variable is used to define
108the proper function and keypad keys for use under X. It is used in a 109the proper function and keypad keys for use under X. It is used in a
109fashion analogous to the environment value TERM.") 110fashion analogous to the environment value TERM.")
110 111
111(defvar window-setup-hook nil 112(defvar window-setup-hook nil
112 "Function called to initialize window system display. 113 "Normal hook run to initialize window system display.
113Emacs calls this after processing the command line arguments and loading 114Emacs runs this hook after processing the command line arguments and loading
114the user's init file. 115the user's init file.")
115
116Users should not set this variable; use term-setup-hook instead.")
117 116
118(defconst initial-major-mode 'lisp-interaction-mode 117(defconst initial-major-mode 'lisp-interaction-mode
119 "Major mode command symbol to use for the initial *scratch* buffer.") 118 "Major mode command symbol to use for the initial *scratch* buffer.")