From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 20 Dec 2008 13:48:32 +0000 (+0000)
Subject: (Window Systems): Document `window-system' the function.  The variable
X-Git-Tag: emacs-pretest-23.0.90~946
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=77bb04766a65e20947979127779efd878b2eaea1;p=emacs.git

(Window Systems): Document `window-system' the function.  The variable
`window-system' is now frame-local.
---

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 9b1b646f7f7..438d825b3bd 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-20  Eli Zaretskii  <eliz@gnu.org>
+
+	* display.texi (Window Systems): Document `window-system' the
+	function.  The variable `window-system' is now frame-local.
+
 2008-12-19  Martin Rudalics  <rudalics@gmx.at>
 
 	* windows.texi (Windows): Rewrite description of
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 1a8520f3855..5995d4cbbaa 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5644,22 +5644,29 @@ differently.  An Emacs frame is a single window as far as X is
 concerned; the individual Emacs windows are not known to X at all.
 
 @defvar window-system
-This variable tells Lisp programs what window system Emacs is running
-under.  The possible values are
+This frame-local variable tells Lisp programs what window system Emacs is using
+for displaying the frame.  The possible values are
 
 @table @code
 @item x
 @cindex X Window System
-Emacs is displaying using X.
-@item pc
-Emacs is displaying using MS-DOS.
+Emacs is displaying the frame using X.
 @item w32
-Emacs is displaying using Windows.
+Emacs is displaying the frame using native MS-Windows GUI.
+@item pc
+Emacs is displaying the frame using MS-DOS direct screen writes.
 @item nil
-Emacs is using a character-based terminal.
+Emacs is displaying the frame on a character-based terminal.
 @end table
 @end defvar
 
+@defun window-system &optional frame
+This function returns a symbol whose name tells what window system is
+used for displaying @var{frame} (which defaults to the currently
+selected frame).  The list of possible symbols it returns is the same
+one documented for the variable @code{window-system} above.
+@end defun
+
 @defvar window-setup-hook
 This variable is a normal hook which Emacs runs after handling the
 initialization files.  Emacs runs this hook after it has completed