mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-14 23:40:39 -08:00
Code Issues Projects Releases Wiki Activity

(Fx_open_connection): Set up Vx_resource_name and xrm_option

Browse source 
before calling x_term_init.  Pass new args.
This commit is contained in:
Richard M. Stallman 1994-06-05 17:43:51 +00:00
parent 1f8255f228
commit e1b1bee872
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/xfns.c
View file

@ -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,