[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/diff-hl fb9eb1c 06/25: Merge pull request #127 from m-c
From: |
Dmitry Gutov |
Subject: |
[elpa] externals/diff-hl fb9eb1c 06/25: Merge pull request #127 from m-cat/diff-apply-hunk |
Date: |
Sun, 20 Dec 2020 05:07:00 -0500 (EST) |
branch: externals/diff-hl
commit fb9eb1cd3c4c6ed24b93de1a7cfb369d2983be74
Merge: 3418630 1f35974
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: GitHub <noreply@github.com>
Merge pull request #127 from m-cat/diff-apply-hunk
Fix windows getting messed up
---
diff-hl.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/diff-hl.el b/diff-hl.el
index 056b0ea..e78ae10 100644
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -461,7 +461,8 @@ in the source file, or the last line of the hunk above it."
,(cl-caadr fileset)))
(user-error "Revert canceled"))
(let ((diff-advance-after-apply-hunk nil))
- (diff-apply-hunk t))
+ (save-window-excursion
+ (diff-apply-hunk t)))
(with-current-buffer ,buffer
(save-buffer))
(message "Hunk reverted"))))
- [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, 2020/12/20
- [elpa] externals/diff-hl fb9eb1c 06/25: Merge pull request #127 from m-cat/diff-apply-hunk,
Dmitry Gutov <=
- [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
- [elpa] externals/diff-hl 165a30f 16/25: Merge pull request #143 from walseb/master, Dmitry Gutov, 2020/12/20