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

1 files changed, 2 insertions, 11 deletions

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