Mercurial > emacs
comparison src/dispnew.c @ 111163:bf6806de6892
Merge changes from emacs-23
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sun, 24 Oct 2010 17:36:09 -0400 |
parents | 0e84d4500f6b bfc9f85a0e9d |
children | e302712538dc |
comparison
equal
deleted
inserted
replaced
111147:b8d9a3e4de08 | 111163:bf6806de6892 |
---|---|
6581 Emacs's frame display when you reenter Emacs. | 6581 Emacs's frame display when you reenter Emacs. |
6582 It is up to you to set this variable if your terminal can do that. */); | 6582 It is up to you to set this variable if your terminal can do that. */); |
6583 | 6583 |
6584 DEFVAR_LISP ("initial-window-system", &Vinitial_window_system, | 6584 DEFVAR_LISP ("initial-window-system", &Vinitial_window_system, |
6585 doc: /* Name of the window system that Emacs uses for the first frame. | 6585 doc: /* Name of the window system that Emacs uses for the first frame. |
6586 The value is a symbol--for instance, `x' for X windows. | 6586 The value is a symbol: |
6587 The value is nil if Emacs is using a text-only terminal. */); | 6587 nil for a termcap frame (a character-only terminal), |
6588 'x' for an Emacs frame that is really an X window, | |
6589 'w32' for an Emacs frame that is a window on MS-Windows display, | |
6590 'ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display, | |
6591 'pc' for a direct-write MS-DOS frame. | |
6592 | |
6593 Use of this variable as a boolean is deprecated. Instead, | |
6594 use `display-graphic-p' or any of the other `display-*-p' | |
6595 predicates which report frame's specific UI-related capabilities. */); | |
6588 | 6596 |
6589 DEFVAR_KBOARD ("window-system", Vwindow_system, | 6597 DEFVAR_KBOARD ("window-system", Vwindow_system, |
6590 doc: /* Name of window system through which the selected frame is displayed. | 6598 doc: /* Name of window system through which the selected frame is displayed. |
6591 The value is a symbol--for instance, `x' for X windows. | 6599 The value is a symbol: |
6592 The value is nil if the selected frame is on a text-only-terminal. */); | 6600 nil for a termcap frame (a character-only terminal), |
6601 'x' for an Emacs frame that is really an X window, | |
6602 'w32' for an Emacs frame that is a window on MS-Windows display, | |
6603 'ns' for an Emacs frame on a GNUstep or Macintosh Cocoa display, | |
6604 'pc' for a direct-write MS-DOS frame. | |
6605 | |
6606 Use of this variable as a boolean is deprecated. Instead, | |
6607 use `display-graphic-p' or any of the other `display-*-p' | |
6608 predicates which report frame's specific UI-related capabilities. */); | |
6593 | 6609 |
6594 DEFVAR_LISP ("window-system-version", &Vwindow_system_version, | 6610 DEFVAR_LISP ("window-system-version", &Vwindow_system_version, |
6595 doc: /* The version number of the window system in use. | 6611 doc: /* The version number of the window system in use. |
6596 For X windows, this is 11. */); | 6612 For X windows, this is 11. */); |
6597 | 6613 |