From: Johan Bockgård <bojohan@gnu.org>
Date: Wed, 4 Oct 2017 22:24:43 +0000 (-0700)
Subject: Fix search for ~/.Xdefaults-HOSTNAME
X-Git-Tag: emacs-26.0.90~48
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3d8df4d63604fd64c9feb3b43c4b9fa2fc487347;p=emacs.git

Fix search for ~/.Xdefaults-HOSTNAME

* src/xrdb.c (get_environ_db): Fix typo when handling
~/.Xdefaults-HOSTNAME (Bug#28708).
---

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);