[Emacs-diffs] emacs/src ChangeLog dispnew.c xterm.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/07/26 23:09:45

Modified files:
        src            : ChangeLog dispnew.c xterm.c 

Log message:
        * dispnew.c (init_display): Use Qx, Qw32, and Qns.
        
        * xterm.c (x_term_init): Use Qx.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7668&r2=1.7669
http://cvs.savannah.gnu.org/viewcvs/emacs/src/dispnew.c?cvsroot=emacs&r1=1.429&r2=1.430
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xterm.c?cvsroot=emacs&r1=1.1038&r2=1.1039

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7668
retrieving revision 1.7669
diff -u -b -r1.7668 -r1.7669
--- ChangeLog   26 Jul 2009 12:58:56 -0000      1.7668
+++ ChangeLog   26 Jul 2009 23:09:44 -0000      1.7669
@@ -1,5 +1,9 @@
 2009-07-26  Chong Yidong  <address@hidden>
 
+       * 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

Index: dispnew.c
===================================================================
RCS file: /sources/emacs/emacs/src/dispnew.c,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -b -r1.429 -r1.430
--- dispnew.c   22 Apr 2009 04:32:23 -0000      1.429
+++ dispnew.c   26 Jul 2009 23:09:45 -0000      1.430
@@ -6882,7 +6882,7 @@
 #endif
      )
     {
-      Vinitial_window_system = intern ("x");
+      Vinitial_window_system = Qx;
 #ifdef HAVE_X11
       Vwindow_system_version = make_number (11);
 #endif
@@ -6900,7 +6900,7 @@
 #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 @@
 #endif
       )
     {
-      Vinitial_window_system = intern("ns");
+      Vinitial_window_system = Qns;
       Vwindow_system_version = make_number(10);
       adjust_frame_glyphs_initially ();
       return;

Index: xterm.c
===================================================================
RCS file: /sources/emacs/emacs/src/xterm.c,v
retrieving revision 1.1038
retrieving revision 1.1039
diff -u -b -r1.1038 -r1.1039
--- xterm.c     16 Jul 2009 01:24:02 -0000      1.1038
+++ xterm.c     26 Jul 2009 23:09:45 -0000      1.1039
@@ -9977,7 +9977,7 @@
     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 @@
       {
        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);