diff options
| author | Jim Blandy | 1992-08-29 03:28:52 +0000 |
|---|---|---|
| committer | Jim Blandy | 1992-08-29 03:28:52 +0000 |
| commit | b631f17789edc259104f18aa5f340ab70787f9bb (patch) | |
| tree | 555bc109f949126e123820b731170d398bced7e3 | |
| parent | fe24a618befa69ef62f1d82f97d3d6c7a434367a (diff) | |
| download | emacs-b631f17789edc259104f18aa5f340ab70787f9bb.tar.gz emacs-b631f17789edc259104f18aa5f340ab70787f9bb.zip | |
* xrdb.c (get_user_db): Use XResourceManagerString when available
[HAVE_X11R4].
| -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) | |||
| 279 | XrmDatabase db; | 279 | XrmDatabase db; |
| 280 | char *xdefs; | 280 | char *xdefs; |
| 281 | 281 | ||
| 282 | /* Yes, I know we should probably get this using XResourceManagerString. | 282 | #ifdef HAVE_X11R4 |
| 283 | Who cares. */ | 283 | xdefs = XResourceManagerString (display); |
| 284 | #else | ||
| 284 | xdefs = display->xdefaults; | 285 | xdefs = display->xdefaults; |
| 286 | #endif | ||
| 287 | |||
| 285 | if (xdefs != NULL) | 288 | if (xdefs != NULL) |
| 286 | db = XrmGetStringDatabase (xdefs); | 289 | db = XrmGetStringDatabase (xdefs); |
| 287 | else | 290 | else |