mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-18 08:51:45 -08:00
Code Issues Projects Releases Wiki Activity

* nsterm.m (syms_of_nsterm): Use Qns.

Browse source 
* w32fns.c (Fx_open_connection): Remove old '#if 0' code.
* w32term.c (w32_create_terminal, syms_of_w32term): Use Qw32.
* xfns.c (x_display_info_for_name, Fx_open_connection):
Remove old '#if 0' code.
(syms_of_xfns): Use Qx.
This commit is contained in:
Dmitry Antipov 2013-09-11 20:03:42 +04:00
parent 656bd48388
commit 8d2db8be5b
5 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,5 +1,11 @@
2013-09-11 Dmitry Antipov <dmantipov@yandex.ru>
* nsterm.m (syms_of_nsterm): Use Qns.
* w32fns.c (Fx_open_connection): Remove old '#if 0' code.
* w32term.c (w32_create_terminal, syms_of_w32term): Use Qw32.
* xfns.c (x_display_info_for_name, Fx_open_connection):
Remove old '#if 0' code.
(syms_of_xfns): Use Qx.
* termhooks.h (fullscreen_hook): Remove the leftover.
(struct terminal): Fix typo in comment.

4
src/nsterm.m
View file

@ -7433,6 +7433,6 @@ variable `x-use-underline-position-properties', which is usually at the
baseline level. The default value is nil. */);
x_underline_at_descent_line = 0;
/* Tell emacs about this window system. */
Fprovide (intern ("ns"), Qnil);
/* Tell Emacs about this window system. */
Fprovide (Qns, Qnil);
}

5
src/w32fns.c
View file

@ -5201,11 +5201,6 @@ terminate Emacs if we can't open the connection.
if (! NILP (xrm_string))
CHECK_STRING (xrm_string);
#if 0
if (! EQ (Vwindow_system, intern ("w32")))
error ("Not using Microsoft Windows");
#endif
/* Allow color mapping to be defined externally; first look in user's
HOME directory, then in Emacs etc dir for a file called rgb.txt. */
{

5
src/w32term.c
View file

@ -6338,7 +6338,7 @@ w32_create_terminal (struct w32_display_info *dpyinfo)
terminal like X does. */
terminal->kboard = xmalloc (sizeof (KBOARD));
init_kboard (terminal->kboard);
kset_window_system (terminal->kboard, intern ("w32"));
kset_window_system (terminal->kboard, Qw32);
terminal->kboard->next_kboard = all_kboards;
all_kboards = terminal->kboard;
/* Don't let the initial kboard remain current longer than necessary.
@ -6691,5 +6691,6 @@ With MS Windows or Nextstep, the value is t. */);
staticpro (&last_mouse_motion_frame);
last_mouse_motion_frame = Qnil;
Fprovide (intern_c_string ("w32"), Qnil);
/* Tell Emacs about this window system. */
Fprovide (Qw32, Qnil);
}

13
src/xfns.c
View file

@ -4434,11 +4434,6 @@ x_display_info_for_name (Lisp_Object name)
CHECK_STRING (name);
#if 0
if (! EQ (Vinitial_window_system, intern ("x")))
error ("Not using X Windows"); /* That doesn't stop us anymore. */
#endif
for (dpyinfo = x_display_list, names = x_display_name_list;
dpyinfo;
dpyinfo = dpyinfo->next, names = XCDR (names))
@ -4482,11 +4477,6 @@ terminate Emacs if we can't open the connection.
if (! NILP (xrm_string))
CHECK_STRING (xrm_string);
#if 0
if (! EQ (Vinitial_window_system, intern ("x")))
error ("Not using X Windows"); /* That doesn't stop us anymore. */
#endif
xrm_option = NILP (xrm_string) ? 0 : SSDATA (xrm_string);
validate_x_resource_name ();
@ -6299,7 +6289,8 @@ Otherwise use Emacs own tooltip implementation.
When using Gtk+ tooltips, the tooltip face is not used. */);
x_gtk_use_system_tooltips = 1;
Fprovide (intern_c_string ("x"), Qnil);
/* Tell Emacs about this window system. */
Fprovide (Qx, Qnil);
#ifdef USE_X_TOOLKIT
Fprovide (intern_c_string ("x-toolkit"), Qnil);