(Fx_open_connection): Set up Vx_resource_name and xrm_option

before calling x_term_init.  Pass new args.

diff --git a/src/xfns.c b/src/xfns.c
index b3c2731c7d1e8686986b76911c5f68e9fcc43b67..4a8840604360c6d256485f442ac88974fe155e5f 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4142,13 +4142,6 @@ Optional second arg XRM_STRING is a string of resources in xrdb format.")
   if (! NILP (xrm_string))
     CHECK_STRING (xrm_string, 1);
 
-  /* This is what opens the connection and sets x_current_display.
-     This also initializes many symbols, such as those used for input. */
-  x_term_init (XSTRING (display)->data);
-
-#ifdef HAVE_X11
-  XFASTINT (Vwindow_system_version) = 11;
-
   if (! NILP (xrm_string))
     xrm_option = (unsigned char *) XSTRING (xrm_string)->data;
   else
@@ -4156,6 +4149,14 @@ Optional second arg XRM_STRING is a string of resources in xrdb format.")
 
   validate_x_resource_name ();
 
+  /* This is what opens the connection and sets x_current_display.
+     This also initializes many symbols, such as those used for input. */
+  x_term_init (XSTRING (display)->data, xrm_option,
+              XSTRING (Vx_resource_name)->data);
+
+#ifdef HAVE_X11
+  XFASTINT (Vwindow_system_version) = 11;
+
   BLOCK_INPUT;
   xrdb = x_load_resources (x_current_display, xrm_option,
                           (char *) XSTRING (Vx_resource_name)->data,