Mercurial > emacs
changeset 104077:3abca9a8122f
* dispnew.c (init_display): Use Qx, Qw32, and Qns.
* xterm.c (x_term_init): Use Qx.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 26 Jul 2009 23:09:44 +0000 |
| parents | 5a8c46298f5a |
| children | 2658bfb08516 |
| files | src/ChangeLog src/dispnew.c src/xterm.c |
| diffstat | 3 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Jul 26 23:06:49 2009 +0000 +++ b/src/ChangeLog Sun Jul 26 23:09:44 2009 +0000 @@ -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
--- a/src/dispnew.c Sun Jul 26 23:06:49 2009 +0000 +++ b/src/dispnew.c Sun Jul 26 23:09:44 2009 +0000 @@ -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;
--- a/src/xterm.c Sun Jul 26 23:06:49 2009 +0000 +++ b/src/xterm.c Sun Jul 26 23:09:44 2009 +0000 @@ -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);