(Fx_open_connection, x_display_info_for_name):

Error if window-system is not x.

diff --git a/src/xfns.c b/src/xfns.c
index f499355efdd1df3eee606261e42b6f51b308aa4f..3e32e3c82f03f6349db49b8a472cd69b6b4f9809 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4673,6 +4673,9 @@ x_display_info_for_name (name)
 
   CHECK_STRING (name, 0);
 
+  if (! EQ (Vwindow_system, intern ("x")))
+    error ("Not using X Windows");
+
   for (dpyinfo = x_display_list, names = x_display_name_list;
        dpyinfo;
        dpyinfo = dpyinfo->next, names = XCONS (names)->cdr)
@@ -4717,6 +4720,9 @@ terminate Emacs if we can't open the connection.")
   if (! NILP (xrm_string))
     CHECK_STRING (xrm_string, 1);
 
+  if (! EQ (Vwindow_system, intern ("x")))
+    error ("Not using X Windows");
+
   if (! NILP (xrm_string))
     xrm_option = (unsigned char *) XSTRING (xrm_string)->data;
   else