forked from pool/emacs
45 lines
1.1 KiB
Diff
45 lines
1.1 KiB
Diff
---
|
|
src/xrdb.c | 17 ++++++++++++++++-
|
|
1 file changed, 16 insertions(+), 1 deletion(-)
|
|
|
|
--- src/xrdb.c
|
|
+++ src/xrdb.c 2023-08-01 06:52:49.143452069 +0000
|
|
@@ -39,6 +39,9 @@ along with GNU Emacs. If not, see <http
|
|
#include <X11/X.h>
|
|
#include <X11/Xutil.h>
|
|
#include <X11/Xresource.h>
|
|
+#ifdef USE_X_TOOLKIT
|
|
+#include <X11/Intrinsic.h>
|
|
+#endif
|
|
#ifdef HAVE_PWD_H
|
|
#include <pwd.h>
|
|
#endif
|
|
@@ -423,7 +426,15 @@ x_load_resources (Display *display, cons
|
|
sprintf (line, "Emacs*horizontalScrollBar.background: grey75");
|
|
XrmPutLineResource (&rdb, line);
|
|
#endif /* not USE_MOTIF */
|
|
-
|
|
+#ifdef USE_X_TOOLKIT
|
|
+ if ((db = XtScreenDatabase(DefaultScreenOfDisplay (display))))
|
|
+ {
|
|
+ XrmCombineDatabase (rdb, &db, FALSE);
|
|
+ rdb = db;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+#endif /* not USE_X_TOOLKIT */
|
|
user_database = get_user_db (display);
|
|
|
|
/* Figure out what the "customization string" is, so we can use it
|
|
@@ -464,6 +475,10 @@ x_load_resources (Display *display, cons
|
|
XrmMergeDatabases (db, &rdb);
|
|
}
|
|
|
|
+#ifdef USE_X_TOOLKIT
|
|
+ } /* (db != XtScreenDatabase()) */
|
|
+#endif /* not USE_X_TOOLKIT */
|
|
+
|
|
return rdb;
|
|
}
|
|
|