Mercurial > emacs
comparison src/xfns.c @ 4367:f3657047d549
* xfns.c (Fx_open_connection): Test the CPP symbol
HAVE_XRMSETDATABASE to decide whether or not to call
XrmSetDatabase.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Sat, 31 Jul 1993 01:32:23 +0000 |
| parents | 7aae955c725b |
| children | 25bee4fe64aa |
comparison
equal
deleted
inserted
replaced
| 4366:04bd0c1a6245 | 4367:f3657047d549 |
|---|---|
| 3558 BLOCK_INPUT; | 3558 BLOCK_INPUT; |
| 3559 xrdb = x_load_resources (x_current_display, xrm_option, | 3559 xrdb = x_load_resources (x_current_display, xrm_option, |
| 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; |
| 3567 #endif | 3567 #endif |
| 3568 | 3568 |