Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[keyboard-layout] Add ediff remapping #13674

Merged
merged 1 commit into from
Jun 14, 2020
Merged

[keyboard-layout] Add ediff remapping #13674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.develop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2395,6 +2395,7 @@ Other:
- Fixed =bepo= layout, commented out broken evil-window :common bindings
(thanks to CharlesHD)
- Added evil-lisp-state mapping (thanks to Damien Picard)
- Added ediff mapping (thanks to iv-nn)
**** Kivy
- Added the =kivy= package (thanks to Nasser Alshammari and Ryota Kayanuma)
**** LaTeX
Expand Down
1 change: 1 addition & 0 deletions layers/+intl/keyboard-layout/README.org
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ The available configurations are:
- avy
- comint
- company
- ediff
- elfeed
- evil
- evil-escape
Expand Down
15 changes: 15 additions & 0 deletions layers/+intl/keyboard-layout/packages.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
avy
comint
company
ediff
elfeed
evil
evil-cleverparens
Expand Down Expand Up @@ -105,6 +106,20 @@
"C-k"
"C-l")))

(defun keyboard-layout/pre-init-ediff ()
(kl|config ediff
:description
"Remap `ediff' bindings."
:loader
;; HACK: ediff-mode-map is only defined when ediff is started
(add-hook 'ediff-startup-hook #'(lambda () BODY))
:common
(kl/correct-keys ediff-mode-map
"h"
"j"
"k"
"l")))

(defun keyboard-layout/pre-init-elfeed ()
(kl|config elfeed
:description
Expand Down