Mercurial > emacs
diff src/dispnew.c @ 91073:4bc33ffdda1a
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 902-908)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 27 Oct 2007 09:12:07 +0000 |
parents | a0e466c4d599 9f3a25157e4f |
children | 880960b70474 |
line wrap: on
line diff
--- a/src/dispnew.c Sat Oct 27 00:30:50 2007 +0000 +++ b/src/dispnew.c Sat Oct 27 09:12:07 2007 +0000 @@ -6956,7 +6956,6 @@ (*initial_terminal->delete_terminal_hook) (initial_terminal); /* Update frame parameters to reflect the new type. */ - Fmodify_frame_parameters (selected_frame, Fcons (Fcons (Qwindow_system, Qnil), Qnil)); Fmodify_frame_parameters (selected_frame, Fcons (Fcons (Qtty_type, Ftty_type (selected_frame)), Qnil)); @@ -7106,6 +7105,11 @@ The value is a symbol--for instance, `x' for X windows. The value is nil if Emacs is using a text-only terminal. */); + DEFVAR_KBOARD ("window-system", Vwindow_system, + doc: /* Name of window system through which the selected frame is displayed. +The value is a symbol--for instance, `x' for X windows. +The value is nil if the selected frame is on a text-only-terminal. */); + DEFVAR_LISP ("window-system-version", &Vwindow_system_version, doc: /* The version number of the window system in use. For X windows, this is 10 or 11. */);