From 58a51e7a29d271d7356af86df9a16c168fcd4d9e Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 18 Oct 2022 11:26:59 -0700 Subject: spw/diff-discard-hunk: use save-window-excursion w/ diff-apply-hunk --- .emacs.d/init.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index ad2c90d5..f7419764 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -3585,7 +3585,11 @@ mutt's review view, after exiting EDITOR." (diff-advance-after-apply-hunk t) (buffer (car (diff-find-source-location))) (to-save (and (not (buffer-modified-p buffer)) buffer))) - (diff-apply-hunk t) + ;; We cannot just bind `display-buffer-no-window' into + ;; `display-buffer-overriding-action' because `diff-apply-hunk' assumes + ;; `display-buffer' returns non-nil. See docstring for + ;; `display-buffer-no-window'. + (save-window-excursion (diff-apply-hunk t)) (unless (= beg (point)) (diff-hunk-next -1) (diff-hunk-kill)) -- cgit v1.2.3