[Emacs-diffs] emacs-24 r117680: * callproc.c (encode_current_directory): Support handling of file

[Michael Albinus]

------------------------------------------------------------
revno: 117680
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18891
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-11-07 15:45:34 +0100
message:
  * callproc.c (encode_current_directory): Support handling of file
  names prepended by "/:".
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/callproc.c                 callproc.c-20091113204419-o5vbwnq5f7feedwu-248

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-11-06 14:05:58 +0000
+++ b/src/ChangeLog     2014-11-07 14:45:34 +0000
@@ -1,3 +1,8 @@
+2014-11-07  Michael Albinus  <address@hidden>
+
+       * callproc.c (encode_current_directory): Support handling of file
+       names prepended by "/:".  (Bug#18891)
+
 2014-11-06  Alan Mackenzie  <address@hidden>
 
        * syntax.c (back_comment): Fix off-by-one error (bug#18022).

=== modified file 'src/callproc.c'
--- a/src/callproc.c    2014-06-02 18:42:07 +0000
+++ b/src/callproc.c    2014-11-07 14:45:34 +0000
@@ -152,10 +152,14 @@
 
   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);
 }