procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix search for ~/.Xdefaults-HOSTNAME

Browse source 
* src/xrdb.c (get_environ_db): Fix typo when handling
~/.Xdefaults-HOSTNAME (Bug#28708).
This commit is contained in:
Johan Bockgård 2017-10-04 15:24:43 -07:00 • committed by Paul Eggert
parent 3db388b0bf
commit 3d8df4d636
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/xrdb.c
View file

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