# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 732660514 0
# Node ID 997f8e481bf86f2fbfe34d4a92aaf66a275e6012
# Parent  f727944c11aaae168d05e1360ec1ae26067e60e1
	* xfns.c (Fx_open_connection): If we have X11R5, use
	XrmSetDatabase to set the display's database.  In older versions,
	just store the value into x_current_display->db.

diff -r f727944c11aa -r 997f8e481bf8 src/xfns.c
--- a/src/xfns.c	Sat Mar 20 20:18:44 1993 +0000
+++ b/src/xfns.c	Sat Mar 20 20:48:34 1993 +0000
@@ -3756,7 +3756,11 @@
   else
     xrm_option = (unsigned char *) 0;
   xrdb = x_load_resources (x_current_display, xrm_option, EMACS_CLASS);
+#ifdef HAVE_X11R5
+  XrmSetDatabase (x_current_display, xrdb);
+#else
   x_current_display->db = xrdb;
+#endif
 
   x_screen = DefaultScreenOfDisplay (x_current_display);