Skip to content

Commit

Permalink
diff-hl: fix name incompatible (#758)
Browse files Browse the repository at this point in the history
* fix name incompatible

* add S to stage current hunk
  • Loading branch information
JiaweiChenC authored Oct 5, 2023
1 parent 4994157 commit 877cc09
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions modes/diff-hl/evil-collection-diff-hl.el
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 877cc09

Please sign in to comment.