File emacs-24.3-x11r7.patch of Package emacs.3898
--- src/xrdb.c
+++ src/xrdb.c 2007-05-15 16:01:41.439517668 +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
@@ -539,6 +542,15 @@ x_load_resources (Display *display, cons
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);
@@ -580,6 +592,10 @@ x_load_resources (Display *display, cons
XrmMergeDatabases (db, &rdb);
}
+#ifdef USE_X_TOOLKIT
+ } /* (db != XtScreenDatabase()) */
+#endif /* not USE_X_TOOLKIT */
+
return rdb;
}