Mercurial > emacs
changeset 7802:d687e885fa6a
(Fx_open_connection): Set up Vx_resource_name and xrm_option
before calling x_term_init. Pass new args.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 05 Jun 1994 17:43:51 +0000 |
| parents | 10e818a0248a |
| children | 89be456088ef |
| files | src/xfns.c |
| diffstat | 1 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfns.c Sun Jun 05 17:42:38 1994 +0000 +++ b/src/xfns.c Sun Jun 05 17:43:51 1994 +0000 @@ -4142,13 +4142,6 @@ 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 @@ 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,