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

* callproc.c (encode_current_directory): Support handling of file

Browse source 
names prepended by "/:".

Fixes: debbugs:18891
This commit is contained in:
Michael Albinus 2014-11-07 15:45:34 +01:00
parent fd16108130
commit 5282dec1ec
2 changed files with 10 additions and 1 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-11-07 Michael Albinus <michael.albinus@gmx.de>
* callproc.c (encode_current_directory): Support handling of file
names prepended by "/:". (Bug#18891)
2014-11-06 Alan Mackenzie <acm@muc.de>
* syntax.c (back_comment): Fix off-by-one error (bug#18022).

6
src/callproc.c
View file

@ -152,10 +152,14 @@ encode_current_directory (void)
if (STRING_MULTIBYTE (dir))
dir = ENCODE_FILE (dir);
if (! file_accessible_directory_p (SSDATA (dir)))
if (NILP (Ffile_accessible_directory_p (dir)))
report_file_error ("Setting current directory",
BVAR (current_buffer, directory));
/* Remove "/:" from dir. */
if (Fstring_match (build_string ("^/:"), dir, Qnil))
dir = Fsubstring (dir, make_number (2), Qnil);
RETURN_UNGCPRO (dir);
}