diff options
author | Karl Heuer <kwzh@gnu.org> | 1996-02-21 21:21:31 +0000 |
---|---|---|
committer | Karl Heuer <kwzh@gnu.org> | 1996-02-21 21:21:31 +0000 |
commit | abfb86be1683175648fbc4ebac2a2747a116f4be (patch) | |
tree | 954600671d34acfa9ac6cf9899f3f9fc4b8dd30f /lisp/startup.el | |
parent | eb4f3bd2ead93c5201aa827072f0c97635a0cad2 (diff) | |
download | emacs-abfb86be1683175648fbc4ebac2a2747a116f4be.tar.gz |
(before-init-hook, after-init-hook): Doc fix.
(term-setup-hook): Doc fix.
(emacs-startup-hook): New defvar.
Diffstat (limited to 'lisp/startup.el')
-rw-r--r-- | lisp/startup.el | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 65be36abc26..b21fc83eebd 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -215,18 +215,20 @@ and VALUE is the value which is given to that frame parameter \(most options use the argument for this, so VALUE is not present).") (defvar before-init-hook nil - "Functions to call after handling urgent options but before init files. -The frame system uses this to open frames to display messages while -Emacs loads the user's initialization file.") + "Normal hook run after handling urgent options but before loading init files.") (defvar after-init-hook nil - "Functions to call after loading the init file (`~/.emacs'). -The call is not protected by a condition-case, so you can set `debug-on-error' -in `.emacs', and put all the actual code on `after-init-hook'.") + "Normal hook run after loading the init files, `~/.emacs' and `default.el'. +There is no `condition-case' around the running of these functions; +therefore, if you set `debug-on-error' non-nil in `.emacs', +an error in one of these functions will invoke the debugger.") + +(defvar emacs-startup-hook nil + "Normal hook run after loading init files and handling the command line.") (defvar term-setup-hook nil - "Functions to be called after loading terminal-specific Lisp code. -See `run-hooks'. This variable exists for users to set, + "Normal hook run after loading terminal-specific Lisp code. +It also follows `emacs-startup-hook'. This hook exists for users to set, so as to override the definitions made by the terminal-specific file. Emacs never sets this variable itself.") |