diff options
author | Jim Blandy <jimb@redhat.com> | 1992-08-29 03:28:52 +0000 |
---|---|---|
committer | Jim Blandy <jimb@redhat.com> | 1992-08-29 03:28:52 +0000 |
commit | b631f17789edc259104f18aa5f340ab70787f9bb (patch) | |
tree | 555bc109f949126e123820b731170d398bced7e3 /src/xrdb.c | |
parent | fe24a618befa69ef62f1d82f97d3d6c7a434367a (diff) | |
download | emacs-b631f17789edc259104f18aa5f340ab70787f9bb.tar.gz |
* xrdb.c (get_user_db): Use XResourceManagerString when available
[HAVE_X11R4].
Diffstat (limited to 'src/xrdb.c')
-rw-r--r-- | src/xrdb.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/xrdb.c b/src/xrdb.c index d6defba4a86..8141444bef4 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -279,9 +279,12 @@ get_user_db (display) XrmDatabase db; char *xdefs; - /* Yes, I know we should probably get this using XResourceManagerString. - Who cares. */ +#ifdef HAVE_X11R4 + xdefs = XResourceManagerString (display); +#else xdefs = display->xdefaults; +#endif + if (xdefs != NULL) db = XrmGetStringDatabase (xdefs); else |