emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master f75f90a: Allow vc-sccs-diff to work with TRAMP


From: Lars Ingebrigtsen
Subject: [Emacs-diffs] master f75f90a: Allow vc-sccs-diff to work with TRAMP
Date: Wed, 16 Oct 2019 22:43:48 -0400 (EDT)

branch: master
commit f75f90a5ddb5e282594483dd7b5dae36f94794c3
Author: Peter Oliver <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    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
---
 lisp/vc/vc-sccs.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index 805e738..b59d817 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]