* xrdb.c (get_user_db): Get the screen-specific database too.

9b37b1c2 · Jim Blandy · e27c3564 · 9b37b1c2
Commit 9b37b1c2 authored Jun 11, 1993 by Jim Blandy
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

src/xrdb.c src/xrdb.c +9 -0

No files found.
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -314,6 +314,15 @@ get_user_db (display)
      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;
 }