summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Jennings <c@cjennings.net>2025-10-20 09:53:49 -0500
committerCraig Jennings <c@cjennings.net>2025-10-20 09:53:49 -0500
commit745b95eec627ace99c184d524e2496ec78d8f948 (patch)
tree3745632a4f8a31b1c0c22594bae038e9a277de36
parent72c219b7056282f97d58f419686da80514fc90a6 (diff)
refactor: diff-config: replace define-key with keymap-set
Update keybinding setup by replacing `define-key` with `keymap-set`
-rw-r--r--modules/diff-config.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/diff-config.el b/modules/diff-config.el
index ff106ead..382b2250 100644
--- a/modules/diff-config.el
+++ b/modules/diff-config.el
@@ -32,18 +32,18 @@
;; adding this to a hook to make sure ediff is loaded due to :defer
(defvar cj/ediff-map
(let ((m (make-sparse-keymap)))
- (define-key m "f" #'ediff-files) ; C-c D f
- (define-key m "b" #'ediff-buffers) ; C-c D b
- (define-key m "r" #'ediff-revision) ; C-c D r
- (define-key m "D" #'ediff-directories) ; C-c D D
+ (keymap-set m "f" #'ediff-files) ; C-c D f
+ (keymap-set m "b" #'ediff-buffers) ; C-c D b
+ (keymap-set m "r" #'ediff-revision) ; C-c D r
+ (keymap-set m "D" #'ediff-directories) ; C-c D D
m)
"Prefix map for quick Ediff commands under C-c D.")
:config
(defun cj/ediff-hook ()
"Use j/k to navigate differences in Ediff."
(ediff-setup-keymap) ;; keep the defaults…
- (define-key ediff-mode-map "j" #'ediff-next-difference)
- (define-key ediff-mode-map "k" #'ediff-previous-difference))
+ (keymap-set ediff-mode-map "j" #'ediff-next-difference)
+ (keymap-set ediff-mode-map "k" #'ediff-previous-difference))
(add-hook 'ediff-mode-hook #'cj/ediff-hook)
(add-hook 'ediff-after-quit-hook-internal #'winner-undo))