[Emacs-diffs] trunk r114214: * nsterm.m (syms_of_nsterm): Use Qns.

[Dmitry Antipov]

------------------------------------------------------------
revno: 114214
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-09-11 20:03:42 +0400
message:
  * 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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747
  src/w32fns.c                   w32fns.c-20091113204419-o5vbwnq5f7feedwu-945
  src/w32term.c                  w32term.c-20091113204419-o5vbwnq5f7feedwu-950
  src/xfns.c                     xfns.c-20091113204419-o5vbwnq5f7feedwu-274

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-11 13:56:46 +0000
+++ b/src/ChangeLog     2013-09-11 16:03:42 +0000
@@ -1,5 +1,11 @@
 2013-09-11  Dmitry Antipov  <address@hidden>
 
+       * 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.
 

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-09-09 12:15:45 +0000
+++ b/src/nsterm.m      2013-09-11 16:03:42 +0000
@@ -7433,6 +7433,6 @@
 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);
 }

=== modified file 'src/w32fns.c'
--- a/src/w32fns.c      2013-09-06 07:00:29 +0000
+++ b/src/w32fns.c      2013-09-11 16:03:42 +0000
@@ -5201,11 +5201,6 @@
   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. */
   {

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2013-09-09 12:15:45 +0000
+++ b/src/w32term.c     2013-09-11 16:03:42 +0000
@@ -6338,7 +6338,7 @@
      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 @@
   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);
 }

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2013-09-11 08:56:33 +0000
+++ b/src/xfns.c        2013-09-11 16:03:42 +0000
@@ -4434,11 +4434,6 @@
 
   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 @@
   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 @@
 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);