Mercurial > emacs
changeset 100597:849c161c893f
(Window Systems): Document `window-system' the function. The variable
`window-system' is now frame-local.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 20 Dec 2008 13:48:09 +0000 |
parents | c389955a734a |
children | 53da782ac1b9 |
files | doc/lispref/display.texi |
diffstat | 1 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/lispref/display.texi Sat Dec 20 13:34:44 2008 +0000 +++ b/doc/lispref/display.texi Sat Dec 20 13:48:09 2008 +0000 @@ -5644,22 +5644,29 @@ 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