# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 739815638 0
# Node ID d9313b9a63ada1a366a9943127a40b28ba7d07cf
# Parent  974055b516d942954c0c1e247630c474101a5a2a
	* xrdb.c (get_user_db): Get the screen-specific database too.

diff -r 974055b516d9 -r d9313b9a63ad src/xrdb.c
--- a/src/xrdb.c	Fri Jun 11 16:19:49 1993 +0000
+++ b/src/xrdb.c	Fri Jun 11 16:20:38 1993 +0000
@@ -314,6 +314,15 @@
       db = XrmGetFileDatabase (xdefault);
     }
 
+#ifdef XlibSpecificationRelease
+#if XlibSpecificationRelease >= 5
+  /* Get the screen-specific resources too.  */
+  xdefs = XScreenResourceString (DefaultScreenOfDisplay (display));
+  if (xdefs != NULL)
+    XrmMergeDatabases (XrmGetStringDatabase (xdefs), &db);
+#endif
+#endif
+
   return db;
 }