diff options
| author | Johan Bockgård <bojohan@gnu.org> | 2017-10-04 15:24:43 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-10-04 15:25:08 -0700 |
| commit | 3d8df4d63604fd64c9feb3b43c4b9fa2fc487347 (patch) | |
| tree | b516f1e2fa6fde8326d77f833d89c895235e9e22 | |
| parent | 3db388b0bf83d3138562f09ce25fab8ba89bcc81 (diff) | |
| download | emacs-3d8df4d63604fd64c9feb3b43c4b9fa2fc487347.tar.gz | |
Fix search for ~/.Xdefaults-HOSTNAME
* src/xrdb.c (get_environ_db): Fix typo when handling
~/.Xdefaults-HOSTNAME (Bug#28708).
| -rw-r--r-- | src/xrdb.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/xrdb.c b/src/xrdb.c index 15a01475b7c..3c1bad1c735 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -345,6 +345,7 @@ get_user_db (Display *display) db = XrmGetStringDatabase (xdefs); else { + /* Use ~/.Xdefaults. */ char *home = gethomedir (); ptrdiff_t homelen = strlen (home); char *filename = xrealloc (home, homelen + sizeof xdefaults); @@ -375,13 +376,15 @@ get_environ_db (void) if (!p) { + /* Use ~/.Xdefaults-HOSTNAME. */ char *home = gethomedir (); ptrdiff_t homelen = strlen (home); Lisp_Object system_name = Fsystem_name (); ptrdiff_t filenamesize = (homelen + sizeof xdefaults - + SBYTES (system_name)); + + 1 + SBYTES (system_name)); p = filename = xrealloc (home, filenamesize); - lispstpcpy (stpcpy (filename + homelen, xdefaults), system_name); + lispstpcpy (stpcpy (stpcpy (filename + homelen, xdefaults), "-"), + system_name); } db = XrmGetFileDatabase (p); |