* dispnew.c (init_display): Use Qx, Qw32, and Qns.

* xterm.c (x_term_init): Use Qx.

diff --git a/src/ChangeLog b/src/ChangeLog
index 164fdbccce40066fc83bf484295601b43fbdf630..0205c76c38d55f211a1d8cad4e318c768cfc366d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2009-07-26  Chong Yidong  <cyd@stupidchicken.com>
 
+       * 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 da0deaa90b6e7b962585fc530da2949106e1762d..5236d53c01e21ec5ea5ffd53a6e2b3a45af8e401 100644 (file)
--- 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 7ec0e0268e8e5a96d948336a763b63e21b33abd1..ae61983fae45635578f90d43cc6b2e09b94c9e0f 100644 (file)
--- 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);