From: Jim Blandy <jimb@redhat.com>
Date: Sat, 31 Jul 1993 01:31:46 +0000 (+0000)
Subject: * config.h.in (HAVE_XSCREENRESOURCESTRING): New #undef for
X-Git-Tag: emacs-19.34~11485
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8717d15088c8f9de6ed0a586614f31b4bb34df7;p=emacs.git

* config.h.in (HAVE_XSCREENRESOURCESTRING): New #undef for
configure to edit.
* xrdb.c (get_user_db): Test it to decide whether or not to try to
retrieve the screen-dependent resources.
---

diff --git a/src/config.in b/src/config.in
index 6ebcde54c24..174f6bac195 100644
--- a/src/config.in
+++ b/src/config.in
@@ -111,6 +111,8 @@ and this notice must be preserved on all copies.  */
 
 #undef HAVE_LIBXBSD
 #undef HAVE_XRMSETDATABASE
+#undef HAVE_XSCREENRESOURCESTRING
+
 #undef HAVE_RANDOM
 
 #undef HAVE_BCOPY
diff --git a/src/xrdb.c b/src/xrdb.c
index 7bced538a8b..ea0cbc89b31 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -459,8 +459,7 @@ get_user_db (display)
       free (xdefault);
     }
 
-#ifdef XlibSpecificationRelease
-#if XlibSpecificationRelease >= 5
+#ifdef HAVE_XSCREENRESOURCESTRING
   /* Get the screen-specific resources too.  */
   xdefs = XScreenResourceString (DefaultScreenOfDisplay (display));
   if (xdefs != NULL)
@@ -468,7 +467,6 @@ get_user_db (display)
       XrmMergeDatabases (XrmGetStringDatabase (xdefs), &db);
       XFree (xdefs);
     }
-#endif
 #endif
 
   return db;