Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP1:Update
emacs.7839
emacs-24.3-x11r7.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File emacs-24.3-x11r7.patch of Package emacs.7839
--- src/xrdb.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) --- src/xrdb.c +++ src/xrdb.c 2016-09-19 09:10:35.504833294 +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 @@ -496,6 +499,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); @@ -537,6 +549,10 @@ x_load_resources (Display *display, cons XrmMergeDatabases (db, &rdb); } +#ifdef USE_X_TOOLKIT + } /* (db != XtScreenDatabase()) */ +#endif /* not USE_X_TOOLKIT */ + return rdb; }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
