aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Oliver2019-10-17 04:43:38 +0200
committerLars Ingebrigtsen2019-10-17 04:43:38 +0200
commitf75f90a5ddb5e282594483dd7b5dae36f94794c3 (patch)
treecd917936d49f5fccba7183c859bfd5a7d10e845c
parent1610d67051f5160f3c3e74c8ea396368cfb0bbd7 (diff)
downloademacs-f75f90a5ddb5e282594483dd7b5dae36f94794c3.tar.gz
emacs-f75f90a5ddb5e282594483dd7b5dae36f94794c3.zip
Allow vc-sccs-diff to work with TRAMP
* lisp/vc/vc-sccs.el (vc-sccs-diff): If the diff command is to be run remotely, then the temporary files it's acting on must be remote too (bug#37777). Copyright-paperwork-exempt: yes
-rw-r--r--lisp/vc/vc-sccs.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index 805e738f7a9..b59d8178fe8 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -347,7 +347,7 @@ Remaining arguments are ignored."
347 (message "Running %s in foreground..." fake-command)) 347 (message "Running %s in foreground..." fake-command))
348 (if oldproc (delete-process oldproc)) 348 (if oldproc (delete-process oldproc))
349 (dolist (file files) 349 (dolist (file files)
350 (let ((oldfile (make-temp-file "vc-sccs")) 350 (let ((oldfile (make-nearby-temp-file "vc-sccs"))
351 newfile) 351 newfile)
352 (unwind-protect 352 (unwind-protect
353 (progn 353 (progn
@@ -364,7 +364,7 @@ Remaining arguments are ignored."
364 (this-status 364 (this-status
365 (apply 'process-file "diff" nil t nil 365 (apply 'process-file "diff" nil t nil
366 (append (vc-switches 'SCCS 'diff) 366 (append (vc-switches 'SCCS 'diff)
367 (list oldfile 367 (list (file-local-name oldfile)
368 (or newfile 368 (or newfile
369 (file-relative-name file))))))) 369 (file-relative-name file)))))))
370 (or (integerp this-status) (setq status 'error)) 370 (or (integerp this-status) (setq status 'error))