diff options
| author | Jim Blandy | 1993-07-31 01:32:23 +0000 |
|---|---|---|
| committer | Jim Blandy | 1993-07-31 01:32:23 +0000 |
| commit | f5db3b940fece464c15ec7b82a751ab9c3038963 (patch) | |
| tree | f90415c7dcabf5bd20267dcff022dc927706a590 /src | |
| parent | d8717d15088c8f9de6ed0a586614f31b4bb34df7 (diff) | |
| download | emacs-f5db3b940fece464c15ec7b82a751ab9c3038963.tar.gz emacs-f5db3b940fece464c15ec7b82a751ab9c3038963.zip | |
* xfns.c (Fx_open_connection): Test the CPP symbol
HAVE_XRMSETDATABASE to decide whether or not to call
XrmSetDatabase.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xfns.c b/src/xfns.c index 6b9a90f484b..07925ebb0ed 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -3560,7 +3560,7 @@ Optional second arg XRM_STRING is a string of resources in xrdb format.") | |||
| 3560 | (char *) XSTRING (Vx_resource_name)->data, | 3560 | (char *) XSTRING (Vx_resource_name)->data, |
| 3561 | EMACS_CLASS); | 3561 | EMACS_CLASS); |
| 3562 | UNBLOCK_INPUT; | 3562 | UNBLOCK_INPUT; |
| 3563 | #if defined (HAVE_X11R5) | 3563 | #ifdef HAVE_XRMSETDATABASE |
| 3564 | XrmSetDatabase (x_current_display, xrdb); | 3564 | XrmSetDatabase (x_current_display, xrdb); |
| 3565 | #else | 3565 | #else |
| 3566 | x_current_display->db = xrdb; | 3566 | x_current_display->db = xrdb; |