From 5282dec1ecab229a8296887c15db949c90ad13ad Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 7 Nov 2014 15:45:34 +0100 Subject: [PATCH] * callproc.c (encode_current_directory): Support handling of file names prepended by "/:". Fixes: debbugs:18891 --- src/ChangeLog | 5 +++++ src/callproc.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index a812fd4a771..81e2a27c200 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-11-07 Michael Albinus + + * callproc.c (encode_current_directory): Support handling of file + names prepended by "/:". (Bug#18891) + 2014-11-06 Alan Mackenzie * syntax.c (back_comment): Fix off-by-one error (bug#18022). diff --git a/src/callproc.c b/src/callproc.c index 7ba3e398b41..488fae3644e 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -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); } -- 2.39.5