From 111d9af32feb1d251050fbd4f07121fa5c5e3113 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 26 Jul 2009 23:09:44 +0000 Subject: [PATCH] * dispnew.c (init_display): Use Qx, Qw32, and Qns. * xterm.c (x_term_init): Use Qx. --- src/ChangeLog | 4 ++++ src/dispnew.c | 6 +++--- src/xterm.c | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 164fdbccce4..0205c76c38d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2009-07-26 Chong Yidong + * dispnew.c (init_display): Use Qx, Qw32, and Qns. + + * xterm.c (x_term_init): Use Qx. + * nsfont.m (nsfont_draw): Revert 2009-07-15 change. * nsterm.m (ns_maybe_dumpglyphs_background): Revert 2009-07-15 diff --git a/src/dispnew.c b/src/dispnew.c index da0deaa90b6..5236d53c01e 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -6882,7 +6882,7 @@ init_display () #endif ) { - Vinitial_window_system = intern ("x"); + Vinitial_window_system = Qx; #ifdef HAVE_X11 Vwindow_system_version = make_number (11); #endif @@ -6900,7 +6900,7 @@ init_display () #ifdef HAVE_NTGUI if (!inhibit_window_system) { - Vinitial_window_system = intern ("w32"); + Vinitial_window_system = Qw32; Vwindow_system_version = make_number (1); adjust_frame_glyphs_initially (); return; @@ -6914,7 +6914,7 @@ init_display () #endif ) { - Vinitial_window_system = intern("ns"); + Vinitial_window_system = Qns; Vwindow_system_version = make_number(10); adjust_frame_glyphs_initially (); return; diff --git a/src/xterm.c b/src/xterm.c index 7ec0e0268e8..ae61983fae4 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -9977,7 +9977,7 @@ x_term_init (display_name, xrm_option, resource_name) GdkAtom atom; #ifndef HAVE_GTK_MULTIDISPLAY - if (!EQ (Vinitial_window_system, intern ("x"))) + if (!EQ (Vinitial_window_system, Qx)) error ("Sorry, you cannot connect to X servers with the GTK toolkit"); #endif @@ -10107,7 +10107,7 @@ x_term_init (display_name, xrm_option, resource_name) { terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD)); init_kboard (terminal->kboard); - terminal->kboard->Vwindow_system = intern ("x"); + terminal->kboard->Vwindow_system = Qx; if (!EQ (XSYMBOL (Qvendor_specific_keysyms)->function, Qunbound)) { char *vendor = ServerVendor (dpy); -- 2.39.2