summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.emacs.d/init.el7
1 files changed, 2 insertions, 5 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index f7419764..e66dd3ad 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -3581,8 +3581,7 @@ mutt's review view, after exiting EDITOR."
;; Save only buffers that weren't already modified.
(defun spw/diff-discard-hunk ()
(interactive)
- (let* ((beg (point))
- (diff-advance-after-apply-hunk t)
+ (let* (diff-advance-after-apply-hunk
(buffer (car (diff-find-source-location)))
(to-save (and (not (buffer-modified-p buffer)) buffer)))
;; We cannot just bind `display-buffer-no-window' into
@@ -3590,9 +3589,7 @@ mutt's review view, after exiting EDITOR."
;; `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))
+ (diff-hunk-kill)
(when to-save
(with-current-buffer to-save
(basic-save-buffer)))))