aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc.el3
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 141eec983d9..e9cc351cec5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12005-02-27 Andreas Schwab <schwab@suse.de> 12005-02-27 Andreas Schwab <schwab@suse.de>
2 2
3 * vc.el (vc-do-command): Don't run command asynchronously when
4 operating in a remote directory.
5
3 * net/tramp.el (tramp-file-name-for-operation): Fix misapplied 6 * net/tramp.el (tramp-file-name-for-operation): Fix misapplied
4 change from sync with Tramp 2.0.47. 7 change from sync with Tramp 2.0.47.
5 8
diff --git a/lisp/vc.el b/lisp/vc.el
index 2daf100ff57..2e241e67f48 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -958,6 +958,9 @@ that is inserted into the command line before the filename."
958 (mapconcat 'identity vc-path path-separator)) 958 (mapconcat 'identity vc-path path-separator))
959 process-environment)) 959 process-environment))
960 (w32-quote-process-args t)) 960 (w32-quote-process-args t))
961 (if (and (eq okstatus 'async) (file-remote-p default-directory))
962 ;; start-process does not support remote execution
963 (setq okstatus nil))
961 (if (eq okstatus 'async) 964 (if (eq okstatus 'async)
962 (let ((proc (apply 'start-process command (current-buffer) command 965 (let ((proc (apply 'start-process command (current-buffer) command
963 squeezed))) 966 squeezed)))