mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-03 08:30:09 +00:00
Code Issues Releases Activity

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

Browse Source 
* xterm.c (x_term_init): Use Qx.
This commit is contained in:
Chong Yidong 2009-07-26 23:09:44 +00:00
parent 5704140c4d
commit 111d9af32f
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -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

6
src/dispnew.c
View File

@ -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;

4
src/xterm.c
View File

@ -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);