branch: externals/diff-hl commit dafd697d2f376275abdf457b0ec7f5bceafd0aab Author: Dmitry Gutov <dmi...@gutov.dev> Commit: Dmitry Gutov <dmi...@gutov.dev>
Support staging over Tramp Fixes #234 --- diff-hl.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/diff-hl.el b/diff-hl.el index ea8ae4d8b6..61d8f49c26 100644 --- a/diff-hl.el +++ b/diff-hl.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/dgutov/diff-hl ;; Keywords: vc, diff ;; Version: 1.10.0 -;; Package-Requires: ((cl-lib "0.2") (emacs "25.1")) +;; Package-Requires: ((cl-lib "0.2") (emacs "26.1")) ;; This file is part of GNU Emacs. @@ -761,7 +761,7 @@ its end position." (user-error "Only Git supports staging; this file is controlled by %s" backend)))) (defun diff-hl-stage-diff (orig-buffer) - (let ((patchfile (make-temp-file "diff-hl-stage-patch")) + (let ((patchfile (make-nearby-temp-file "diff-hl-stage-patch")) success) (write-region (point-min) (point-max) patchfile nil 'silent) @@ -769,7 +769,7 @@ its end position." (with-current-buffer orig-buffer (with-output-to-string (vc-git-command standard-output 0 - patchfile + (file-local-name patchfile) "apply" "--cached" ) (setq success t))) (delete-file patchfile))