Mercurial > emacs

changeset 4366:04bd0c1a6245

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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.
author Jim Blandy <jimb@redhat.com>
date Sat, 31 Jul 1993 01:31:46 +0000
parents f3506c9677f3
children f3657047d549
files src/config.in src/xrdb.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/config.in	Sat Jul 31 01:21:21 1993 +0000
+++ b/src/config.in	Sat Jul 31 01:31:46 1993 +0000
@@ -111,6 +111,8 @@
 
 #undef HAVE_LIBXBSD
 #undef HAVE_XRMSETDATABASE
+#undef HAVE_XSCREENRESOURCESTRING
+
 #undef HAVE_RANDOM
 
 #undef HAVE_BCOPY
--- a/src/xrdb.c	Sat Jul 31 01:21:21 1993 +0000
+++ b/src/xrdb.c	Sat Jul 31 01:31:46 1993 +0000
@@ -459,8 +459,7 @@
       free (xdefault);
     }
 
-#ifdef XlibSpecificationRelease
-#if XlibSpecificationRelease >= 5
+#ifdef HAVE_XSCREENRESOURCESTRING
   /* Get the screen-specific resources too.  */
   xdefs = XScreenResourceString (DefaultScreenOfDisplay (display));
   if (xdefs != NULL)
@@ -469,7 +468,6 @@
       XFree (xdefs);
     }
 #endif
-#endif
 
   return db;
 }