emacs-elpa-diffs
[Top][All Lists]
Advanced

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

[elpa] externals/diff-hl 3418630 05/25: diff-hl-flydiff-buffer-with-head


From: Dmitry Gutov
Subject: [elpa] externals/diff-hl 3418630 05/25: diff-hl-flydiff-buffer-with-head: Honor diff-hl-reference-revision
Date: Sun, 20 Dec 2020 05:06:59 -0500 (EST)

branch: externals/diff-hl
commit 3418630c44283c7fcb35c31c73283c39e7d96aee
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>

    diff-hl-flydiff-buffer-with-head: Honor diff-hl-reference-revision
    
    Fixes #131
---
 diff-hl-flydiff.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/diff-hl-flydiff.el b/diff-hl-flydiff.el
index 9de22a9..c09293a 100644
--- a/diff-hl-flydiff.el
+++ b/diff-hl-flydiff.el
@@ -132,7 +132,8 @@ This requires the external program `diff' to be in your 
`exec-path'."
               temporary-file-directory))
            (rev (diff-hl-flydiff-create-revision
                  file
-                 (diff-hl-flydiff/working-revision file))))
+                 (or diff-hl-reference-revision
+                     (diff-hl-flydiff/working-revision file)))))
       ;; FIXME: When against staging, do it differently!
       (diff-no-select rev (current-buffer) "-U 0 --strip-trailing-cr" 'noasync
                       (get-buffer-create " *diff-hl-diff*")))))



reply via email to

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