summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2009-01-24 20:24:18 +0000
committerEli Zaretskii <eliz@gnu.org>2009-01-24 20:24:18 +0000
commitf721dedaef4f90a1d16c5fc500cf50292c0dd3c6 (patch)
tree5cc8dabc8260db658e440e2b3375ab3691010bd9
parentb55b134f14ab27144f009900ce6860a82f8cdb95 (diff)
downloademacs-f721dedaef4f90a1d16c5fc500cf50292c0dd3c6.tar.gz
(Window Systems): Document the value of `initial-window-system' under --daemon.
-rw-r--r--doc/lispref/ChangeLog3
-rw-r--r--doc/lispref/display.texi5
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index bfe41f9bd0c..2a13dfc9d1e 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
2009-01-24 Eli Zaretskii <eliz@gnu.org>
+ * display.texi (Window Systems): Document the value of
+ `initial-window-system' under --daemon.
+
* os.texi (System Environment): Remove description of the
`environment' function which has been deleted.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index b29515cdc8f..42423f8309f 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5784,7 +5784,10 @@ Emacs is displaying the frame on a character-based terminal.
@defvar initial-window-system
This variable holds the value of @code{window-system} used for the
-first frame created by Emacs during startup.
+first frame created by Emacs during startup. (When Emacs is invoked
+with the @option{--daemon} option, it does not create any initial
+frames, so @code{initial-window-system} is @code{nil}. @xref{Initial
+Options, daemon,, emacs, The GNU Emacs Manual}.)
@end defvar
@defun window-system &optional frame