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.

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

[keyboard-layout] Add ediff remapping #13674

Merged
merged 1 commit into from
Jun 14, 2020

Conversation

iv-nn
Copy link
Contributor

@iv-nn iv-nn commented Jun 14, 2020

Add ediff support to the keyboard-layout layer.

It works well using the bepo layout and should work with the other layouts but is untested with those.

ediff-mode-map is only defined once ediff is started, that's why I used ediff-startup-hook instead of spacemacs|use-package-add-hook or with-eval-after-load as I read in this issue: noctuid/general.el#59 but there may be another way. I'm new to emacs and spacemacs and this is my first time writing elisp so I'm not entirely sure.

See also this issue: emacs-evil/evil-collection#196 (comment)

Copy link
Collaborator

@smile13241324 smile13241324 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @iv-nn,
I have reviewed your PR and it looks good. I like your detailed explanation about the necessity of the hack and I agree currently there is no better way to do this.

I have noticed that you have not entered a new line to changelog.develop. Would you mind adding your change to the keyboard layout section? Its mentioned in conventions to do so but we currently don't enforce it but it just saves us maintainers some time if the PR authors include it in their PR.

Last but not least, welcome to the project :).

@iv-nn iv-nn force-pushed the add-ediff-keyboard-layout branch from b580fbe to ed899be Compare June 14, 2020 20:31
@iv-nn
Copy link
Contributor Author

iv-nn commented Jun 14, 2020

Done :)

@smile13241324 smile13241324 merged commit f60997e into syl20bnr:develop Jun 14, 2020
@smile13241324
Copy link
Collaborator

Thank you for contributing to spacemacs 💜, I have cherry picked your commit into develop.

@iv-nn iv-nn deleted the add-ediff-keyboard-layout branch June 14, 2020 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants