]> git.eshelyaron.com Git - emacs.git/commitdiff
Allow vc-sccs-diff to work with TRAMP
authorPeter Oliver <git@mavit.org.uk>
Thu, 17 Oct 2019 02:43:38 +0000 (04:43 +0200)
committerLars Ingebrigtsen <larsi@gnus.org>
Thu, 17 Oct 2019 02:43:38 +0000 (04:43 +0200)
* 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

lisp/vc/vc-sccs.el

index 805e738f7a9562f8ee49bf663f404b717f0ff603..b59d8178fe87f736c14478736ff47a9864340a92 100644 (file)
@@ -347,7 +347,7 @@ Remaining arguments are ignored."
       (message "Running %s in foreground..." fake-command))
     (if oldproc (delete-process oldproc))
     (dolist (file files)
-      (let ((oldfile (make-temp-file "vc-sccs"))
+      (let ((oldfile (make-nearby-temp-file "vc-sccs"))
            newfile)
        (unwind-protect
            (progn
@@ -364,7 +364,7 @@ Remaining arguments are ignored."
                     (this-status
                      (apply 'process-file "diff" nil t nil
                             (append (vc-switches 'SCCS 'diff)
-                                    (list oldfile
+                                    (list (file-local-name oldfile)
                                           (or newfile
                                               (file-relative-name file)))))))
                (or (integerp this-status) (setq status 'error))