diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-05-05 20:30:32 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-05-05 20:30:32 +0000 |
| commit | 082dc2112313d8e38a22d63e65226cb56a10807e (patch) | |
| tree | feea9ab764c20dae24855d8e5dc91a49a9982391 /src/xrdb.c | |
| parent | 2c3b35b0cd1a35516623cae344c14b1bfde68c21 (diff) | |
| download | emacs-082dc2112313d8e38a22d63e65226cb56a10807e.tar.gz | |
(x_load_resources) [USE_X_TOOLKIT]: Don't call XrmInitialize.
Diffstat (limited to 'src/xrdb.c')
| -rw-r--r-- | src/xrdb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xrdb.c b/src/xrdb.c index 8ce0ac1ec6c..a064bb59a57 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -521,7 +521,11 @@ x_load_resources (display, xrm_string, myname, myclass) XrmDatabase db; x_rm_string = XrmStringToQuark (XrmStringType); +#ifndef USE_X_TOOLKIT + /* pmr@osf.org says this shouldn't be done if USE_X_TOOLKIT. + I suspect it's because the toolkit version does this elsewhere. */ XrmInitialize (); +#endif rdb = XrmGetStringDatabase (""); user_database = get_user_db (display); |