[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*")))))
- [elpa] externals/diff-hl updated (8fa2d1b -> a0028d9), Dmitry Gutov, 2020/12/20
- [elpa] externals/diff-hl 1f35974 01/25: Fix windows getting messed up (Issue #125), Dmitry Gutov, 2020/12/20
- [elpa] externals/diff-hl ccf89ec 02/25: Fix #128, Dmitry Gutov, 2020/12/20
- [elpa] externals/diff-hl 9c1c95c 03/25: Fix typo, Dmitry Gutov, 2020/12/20
- [elpa] externals/diff-hl f95d123 04/25: Merge pull request #129 from tarsiiformes/typo, Dmitry Gutov, 2020/12/20
- [elpa] externals/diff-hl 3418630 05/25: diff-hl-flydiff-buffer-with-head: Honor diff-hl-reference-revision,
Dmitry Gutov <=
- [elpa] externals/diff-hl fb9eb1c 06/25: Merge pull request #127 from m-cat/diff-apply-hunk, Dmitry Gutov, 2020/12/20
- [elpa] externals/diff-hl 2cf8b48 07/25: Avoid the "args out of range error", Dmitry Gutov, 2020/12/20
- [elpa] externals/diff-hl bc02c99 08/25: Add variable to ask for confirmation when reverting a hunk, Dmitry Gutov, 2020/12/20
- [elpa] externals/diff-hl ba6cf44 12/25: Add tests., Dmitry Gutov, 2020/12/20
- [elpa] externals/diff-hl 7fce94f 09/25: Merge pull request #137 from erickgnavar/feature/ask-for-confirmation-on-revert-hunk, Dmitry Gutov, 2020/12/20
- [elpa] externals/diff-hl ab2f4f0 13/25: Merge pull request #140 from mookid/fix-indirect-buffers, Dmitry Gutov, 2020/12/20
- [elpa] externals/diff-hl 2281a89 17/25: Update docstring and untabify, Dmitry Gutov, 2020/12/20
- [elpa] externals/diff-hl a625033 10/25: Update Magit bridge to use the recommended approach, Dmitry Gutov, 2020/12/20
- [elpa] externals/diff-hl f3b2d15 11/25: diff-hl-diff-goto-hunk, diff-hl-revert-hunk: handle indirect buffers., Dmitry Gutov, 2020/12/20
- [elpa] externals/diff-hl 176f931 14/25: Support buffers in 'conflict' state as well, Dmitry Gutov, 2020/12/20