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

Fix bug #18873 with non-ASCII characters in user's HOME directory.

Browse source 
src/fileio.c (Fexpand_file_name): Use make_unibyte_string, not
 build_string, when importing a home directory.
This commit is contained in:
Eli Zaretskii 2014-10-28 19:48:21 +02:00
parent 7515423bc1
commit 205be0810a
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2014-10-28 Eli Zaretskii <eliz@gnu.org>
* fileio.c (Fexpand_file_name): Use make_unibyte_string, not
build_string, when importing a home directory. (Bug#18873)
2014-10-26 Eli Zaretskii <eliz@gnu.org>
* dispnew.c (buffer_posn_from_coords): Use

4
src/fileio.c
View file

@ -1166,7 +1166,7 @@ filesystem tree, not (expand-file-name ".." dirname). */)
char newdir_utf8[MAX_UTF8_PATH];
filename_from_ansi (newdir, newdir_utf8);
tem = build_string (newdir_utf8);
tem = make_unibyte_string (newdir_utf8, strlen (newdir_utf8));
}
else
#endif
@ -1200,7 +1200,7 @@ filesystem tree, not (expand-file-name ".." dirname). */)
/* `getpwnam' may return a unibyte string, which will
bite us since we expect the directory to be
multibyte. */
tem = build_string (newdir);
tem = make_unibyte_string (newdir, strlen (newdir));
if (multibyte && !STRING_MULTIBYTE (tem))
{
hdir = DECODE_FILE (tem);