From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 5 May 1994 20:30:32 +0000 (+0000)
Subject: (x_load_resources) [USE_X_TOOLKIT]: Don't call XrmInitialize.
X-Git-Tag: emacs-19.34~8511
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=082dc2112313d8e38a22d63e65226cb56a10807e;p=emacs.git

(x_load_resources) [USE_X_TOOLKIT]: Don't call XrmInitialize.
---

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);