summaryrefslogtreecommitdiff
path: root/src/xrdb.c
diff options
context:
space:
mode:
authorJim Blandy <jimb@redhat.com>1993-07-31 01:31:46 +0000
committerJim Blandy <jimb@redhat.com>1993-07-31 01:31:46 +0000
commitd8717d15088c8f9de6ed0a586614f31b4bb34df7 (patch)
tree8fe9e06b2113c32260972561b1356c551429ac78 /src/xrdb.c
parent1f88d61ef52d925a90a0423b375e620665cf26fa (diff)
downloademacs-d8717d15088c8f9de6ed0a586614f31b4bb34df7.tar.gz
emacs-d8717d15088c8f9de6ed0a586614f31b4bb34df7.tar.bz2
emacs-d8717d15088c8f9de6ed0a586614f31b4bb34df7.zip
* 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.
Diffstat (limited to 'src/xrdb.c')
-rw-r--r--src/xrdb.c4
1 files changed, 1 insertions, 3 deletions
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)
@@ -469,7 +468,6 @@ get_user_db (display)
XFree (xdefs);
}
#endif
-#endif
return db;
}