aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2018-10-13 11:36:04 +0300
committerEli Zaretskii2018-10-13 11:36:04 +0300
commit91c4c46fd5538c1c8dbe00f272e2a65175940de8 (patch)
treea0fb318f93cc22cd1927361c72f2b1580710f3ba
parent18b42c6b4b411c217a4a2a16ccfe48640f6582e8 (diff)
downloademacs-91c4c46fd5538c1c8dbe00f272e2a65175940de8.tar.gz
emacs-91c4c46fd5538c1c8dbe00f272e2a65175940de8.zip
Update the description of startup in ELisp manual
* doc/lispref/os.texi (Startup Summary): Remove stale reference to window-system-initialization-alist. Reported by Zhang Haijun <ccsmile2008@outlook.com>.
-rw-r--r--doc/lispref/os.texi25
1 files changed, 15 insertions, 10 deletions
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index e60a2c5a708..44fc9a1eea2 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -96,24 +96,29 @@ if requested by environment variables such as @env{LANG}.
96It does some basic parsing of the command-line arguments. 96It does some basic parsing of the command-line arguments.
97 97
98@vindex initial-window-system@r{, and startup} 98@vindex initial-window-system@r{, and startup}
99@vindex window-system-initialization-alist 99@findex window-system-initialization
100@item 100@item
101If not running in batch mode, it initializes the window system that 101If not running in batch mode, it initializes the window system that
102the variable @code{initial-window-system} specifies (@pxref{Window 102the variable @code{initial-window-system} specifies (@pxref{Window
103Systems, initial-window-system}). The initialization function for 103Systems, initial-window-system}). The initialization function,
104each supported window system is specified by 104@code{window-system-initialization}, is a @dfn{generic function}
105@code{window-system-initialization-alist}. If the value 105(@pxref{Generic Functions}) whose actual implementation is different
106of @code{initial-window-system} is @var{windowsystem}, then the 106for each supported window system. If the value of
107appropriate initialization function is defined in the file 107@code{initial-window-system} is @var{windowsystem}, then the
108@file{term/@var{windowsystem}-win.el}. This file should have been 108appropriate implementation of the initialization function is defined
109compiled into the Emacs executable when it was built. 109in the file @file{term/@var{windowsystem}-win.el}. This file should
110have been compiled into the Emacs executable when it was built.
110 111
111@item 112@item
112It runs the normal hook @code{before-init-hook}. 113It runs the normal hook @code{before-init-hook}.
113 114
114@item 115@item
115If appropriate, it creates a graphical frame. This is not done in 116If appropriate, it creates a graphical frame. As part of creating the
116batch (noninteractive) or daemon mode. 117graphical frame, it initializes the window system specified by
118@code{initial-frame-alist} and @code{default-frame-alist}
119(@pxref{Initial Parameters}) for the graphical frame, by calling the
120@code{window-system-initialization} function for that window system.
121This is not done in batch (noninteractive) or daemon mode.
117 122
118@item 123@item
119It initializes the initial frame's faces, and sets up the menu bar 124It initializes the initial frame's faces, and sets up the menu bar