aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2008-12-20 13:54:24 +0000
committerEli Zaretskii2008-12-20 13:54:24 +0000
commit028e2c1919444ef5cfdd29fd90eab3125e976f91 (patch)
tree3f88d309db57159e16271f3e33fc5ec9f4158800
parent4267d515096e7f1699c5545a5f83e14330178128 (diff)
downloademacs-028e2c1919444ef5cfdd29fd90eab3125e976f91.tar.gz
emacs-028e2c1919444ef5cfdd29fd90eab3125e976f91.zip
(Startup Summary): Add xref to documentation of `initial-window-system'.
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/os.texi3
-rw-r--r--etc/NEWS1
3 files changed, 7 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 438d825b3bd..4809e1f231b 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,7 +1,11 @@
12008-12-20 Eli Zaretskii <eliz@gnu.org> 12008-12-20 Eli Zaretskii <eliz@gnu.org>
2 2
3 * os.texi (Startup Summary): Add xref to documentation of
4 `initial-window-system'.
5
3 * display.texi (Window Systems): Document `window-system' the 6 * display.texi (Window Systems): Document `window-system' the
4 function. The variable `window-system' is now frame-local. 7 function. The variable `window-system' is now frame-local.
8 Document `initial-window-system'.
5 9
62008-12-19 Martin Rudalics <rudalics@gmx.at> 102008-12-19 Martin Rudalics <rudalics@gmx.at>
7 11
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 8c3d680fad4..a5cf70160dc 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -80,7 +80,8 @@ that Emacs initialization is in progress.
80@vindex window-system-initialization-alist 80@vindex window-system-initialization-alist
81@item 81@item
82It loads the initialization library for the window system specified by 82It loads the initialization library for the window system specified by
83the variable @code{initial-window-system}. This library's name is 83the variable @code{initial-window-system} (@pxref{Window Systems,
84initial-window-system}). This library's name is
84@file{term/@var{windowsystem}-win.el}, where @var{windowsystem} is the 85@file{term/@var{windowsystem}-win.el}, where @var{windowsystem} is the
85value of @code{initial-window-system}. From that library, it calls 86value of @code{initial-window-system}. From that library, it calls
86the appropriate initialization function. The initialization function 87the appropriate initialization function. The initialization function
diff --git a/etc/NEWS b/etc/NEWS
index e67850ad95a..c3e8db82ca6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1646,6 +1646,7 @@ $TERM inherited by Emacs you will have to look inside initial-environment.
1646--- 1646---
1647*** $DISPLAY is now dynamically inherited from the frame's `display'. 1647*** $DISPLAY is now dynamically inherited from the frame's `display'.
1648 1648
1649+++
1649*** The `window-system' variable is now frame-local. The new 1650*** The `window-system' variable is now frame-local. The new
1650`initial-window-system' variable contains the `window-system' value 1651`initial-window-system' variable contains the `window-system' value
1651for the first frame. `window-system' is also now a function that 1652for the first frame. `window-system' is also now a function that