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

[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"))))



reply via email to

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