* 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.

5 files changed, 13 insertions, 20 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index dda202af89f..e3fd6e96ec2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
 
diff --git a/src/nsterm.m b/src/nsterm.m
index 38d76e9389c..59627a38087 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -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);
 }
diff --git a/src/w32fns.c b/src/w32fns.c
index 58c63d959ef..a8b444e0409 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -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. */
   {
diff --git a/src/w32term.c b/src/w32term.c
index 681f70b5888..d47509e4ece 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -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);
 }
diff --git a/src/xfns.c b/src/xfns.c
index 1626e2177cb..9b3bf79c088 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -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);