]> git.eshelyaron.com Git - emacs.git/commitdiff
Make subprocess functions resolve the default directory
authorPhilipp Stephani <phst@google.com>
Fri, 3 Mar 2017 16:56:01 +0000 (17:56 +0100)
committerPhilipp Stephani <phst@google.com>
Tue, 4 Apr 2017 12:32:01 +0000 (14:32 +0200)
`call-process' doesn't respect file name handlers in
`default-directory', so `file-name-non-special' has to resolve them
for `process-file', `start-file-process', and
`shell-command' (Bug#25949).

* lisp/files.el (file-name-non-special): Also resolve default
directory for 'process-file', 'start-file-process', and
'shell-command'.
* test/lisp/files-tests.el
(files-tests--file-name-non-special--subprocess): Add unit test.

lisp/files.el
test/lisp/files-tests.el

index b4872e46b01d518d0fe5482e8a1c1a680667f7c0..204c26416a666ef797980b19acd6456fcfdb2d08 100644 (file)
@@ -6915,7 +6915,15 @@ only these files will be asked to be saved."
 (defun file-name-non-special (operation &rest arguments)
   (let ((file-name-handler-alist nil)
        (default-directory
-         (if (eq operation 'insert-directory)
+          ;; Some operations respect file name handlers in
+          ;; `default-directory'.  Because core function like
+          ;; `call-process' don't care about file name handlers in
+          ;; `default-directory', we here have to resolve the
+          ;; directory into a local one.  For `process-file',
+          ;; `start-file-process', and `shell-command', this fixes
+          ;; Bug#25949.
+         (if (memq operation '(insert-directory process-file start-file-process
+                                                 shell-command))
              (directory-file-name
               (expand-file-name
                (unhandled-file-name-directory default-directory)))
index 9d456c512b0960c2cd33b6058c4f95b1a6733151..80bbeb1bc544dfcb5118303f96f8e8d215a133db 100644 (file)
@@ -243,5 +243,13 @@ be $HOME."
                          (concat "/:/:" subdir)))))
       (delete-directory dir 'recursive))))
 
+(ert-deftest files-tests--file-name-non-special--subprocess ()
+  "Check that Bug#25949 is fixed."
+  (skip-unless (executable-find "true"))
+  (should (eq (let ((default-directory "/:/")) (process-file "true")) 0))
+  (should (processp (let ((default-directory "/:/"))
+                      (start-file-process "foo" nil "true"))))
+  (should (eq (let ((default-directory "/:/")) (shell-command "true")) 0)))
+
 (provide 'files-tests)
 ;;; files-tests.el ends here