Mercurial > emacs
changeset 3654:d9313b9a63ad
* xrdb.c (get_user_db): Get the screen-specific database too.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Fri, 11 Jun 1993 16:20:38 +0000 |
| parents | 974055b516d9 |
| children | 3e6cc11cfe9f |
| files | src/xrdb.c |
| diffstat | 1 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xrdb.c Fri Jun 11 16:19:49 1993 +0000 +++ b/src/xrdb.c Fri Jun 11 16:20:38 1993 +0000 @@ -314,6 +314,15 @@ db = XrmGetFileDatabase (xdefault); } +#ifdef XlibSpecificationRelease +#if XlibSpecificationRelease >= 5 + /* Get the screen-specific resources too. */ + xdefs = XScreenResourceString (DefaultScreenOfDisplay (display)); + if (xdefs != NULL) + XrmMergeDatabases (XrmGetStringDatabase (xdefs), &db); +#endif +#endif + return db; }