HCoop
/
bpt
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2c3b35b
)
(x_load_resources) [USE_X_TOOLKIT]: Don't call XrmInitialize.
author
Richard M. Stallman
<rms@gnu.org>
Thu, 5 May 1994 20:30:32 +0000
(20:30 +0000)
committer
Richard M. Stallman
<rms@gnu.org>
Thu, 5 May 1994 20:30:32 +0000
(20:30 +0000)
src/xrdb.c
patch
|
blob
|
blame
|
history
diff --git
a/src/xrdb.c
b/src/xrdb.c
index
8ce0ac1
..
a064bb5
100644
(file)
--- 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);