diff options
| author | Jim Blandy <jimb@redhat.com> | 1993-06-11 16:20:38 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@redhat.com> | 1993-06-11 16:20:38 +0000 |
| commit | 9b37b1c26c4f4aa46aece198382e24b40ec4cc82 (patch) | |
| tree | e1da523a6caed5d8e58f3e88873718df1a59f687 /src/xrdb.c | |
| parent | e27c3564f22d969b65dc6b017cc7d02440fcbc0e (diff) | |
| download | emacs-9b37b1c26c4f4aa46aece198382e24b40ec4cc82.tar.gz | |
* xrdb.c (get_user_db): Get the screen-specific database too.
Diffstat (limited to 'src/xrdb.c')
| -rw-r--r-- | src/xrdb.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/xrdb.c b/src/xrdb.c index 19ca21f9e02..6a769e3aa6c 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -314,6 +314,15 @@ get_user_db (display) 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; } |