aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Bockgård2017-10-04 15:24:43 -0700
committerPaul Eggert2017-10-04 15:25:08 -0700
commit3d8df4d63604fd64c9feb3b43c4b9fa2fc487347 (patch)
treeb516f1e2fa6fde8326d77f833d89c895235e9e22
parent3db388b0bf83d3138562f09ce25fab8ba89bcc81 (diff)
downloademacs-3d8df4d63604fd64c9feb3b43c4b9fa2fc487347.tar.gz
emacs-3d8df4d63604fd64c9feb3b43c4b9fa2fc487347.zip
Fix search for ~/.Xdefaults-HOSTNAME
* src/xrdb.c (get_environ_db): Fix typo when handling ~/.Xdefaults-HOSTNAME (Bug#28708).
-rw-r--r--src/xrdb.c7
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)
345 db = XrmGetStringDatabase (xdefs); 345 db = XrmGetStringDatabase (xdefs);
346 else 346 else
347 { 347 {
348 /* Use ~/.Xdefaults. */
348 char *home = gethomedir (); 349 char *home = gethomedir ();
349 ptrdiff_t homelen = strlen (home); 350 ptrdiff_t homelen = strlen (home);
350 char *filename = xrealloc (home, homelen + sizeof xdefaults); 351 char *filename = xrealloc (home, homelen + sizeof xdefaults);
@@ -375,13 +376,15 @@ get_environ_db (void)
375 376
376 if (!p) 377 if (!p)
377 { 378 {
379 /* Use ~/.Xdefaults-HOSTNAME. */
378 char *home = gethomedir (); 380 char *home = gethomedir ();
379 ptrdiff_t homelen = strlen (home); 381 ptrdiff_t homelen = strlen (home);
380 Lisp_Object system_name = Fsystem_name (); 382 Lisp_Object system_name = Fsystem_name ();
381 ptrdiff_t filenamesize = (homelen + sizeof xdefaults 383 ptrdiff_t filenamesize = (homelen + sizeof xdefaults
382 + SBYTES (system_name)); 384 + 1 + SBYTES (system_name));
383 p = filename = xrealloc (home, filenamesize); 385 p = filename = xrealloc (home, filenamesize);
384 lispstpcpy (stpcpy (filename + homelen, xdefaults), system_name); 386 lispstpcpy (stpcpy (stpcpy (filename + homelen, xdefaults), "-"),
387 system_name);
385 } 388 }
386 389
387 db = XrmGetFileDatabase (p); 390 db = XrmGetFileDatabase (p);