From 877cc09563430432b69d7987bfae9a9158683f1e Mon Sep 17 00:00:00 2001 From: JiaweiChenC <88721906+JiaweiChenC@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:21:55 -0400 Subject: [PATCH] diff-hl: fix name incompatible (#758) * fix name incompatible * add S to stage current hunk --- modes/diff-hl/evil-collection-diff-hl.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modes/diff-hl/evil-collection-diff-hl.el b/modes/diff-hl/evil-collection-diff-hl.el index 5b7df01..b49bc86 100644 --- a/modes/diff-hl/evil-collection-diff-hl.el +++ b/modes/diff-hl/evil-collection-diff-hl.el @@ -42,7 +42,7 @@ ;;; Code: (require 'evil-collection) -(defconst evil-collection-diff-hl-maps '(diff-hl-show-hunk--inline-popup-map +(defconst evil-collection-diff-hl-maps '(diff-hl-show-hunk-map diff-hl-inline-popup-transient-mode-map)) ;;;###autoload @@ -63,12 +63,13 @@ ;; Actually `diff-hl-inline-popup-transient-mode-map' will inherit it by ;; `set-keymap-parent'. - (evil-collection-define-key 'normal 'diff-hl-show-hunk--inline-popup-map + (evil-collection-define-key 'normal 'diff-hl-show-hunk-map ;; Keep it the same as the overlay shows. "p" 'diff-hl-show-hunk-previous "n" 'diff-hl-show-hunk-next "c" 'diff-hl-show-hunk-copy-original-text - "r" 'diff-hl-show-hunk-revert-hunk)) + "r" 'diff-hl-show-hunk-revert-hunk + "S" 'diff-hl-show-hunk-stage-hunk)) (provide 'evil-collection-diff-hl) ;;; evil-collection-diff-hl.el ends here