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

Split keybindings out from evil-integration #1087

Closed
wants to merge 1 commit into from

Conversation

jojojames
Copy link
Contributor

@edkolev @Ambrevar @noctuid @justbur @wasamasa @syl20bnr @TheBB

Following from: emacs-evil/evil-collection#60

Most everyone seems to be on board to pull the keybindings out so that evil-collection can more easily leverage evil's evil-integration.el.

I took a quick look and pulled out the keybindings from evil-integration and put them in a separate file.

Any comments appreciated!

Copy link
Member

@TheBB TheBB left a comment

Choose a reason for hiding this comment

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

If evil-collection finds this useful I'm ok with it.

evil-keybindings.el Outdated Show resolved Hide resolved
@noctuid
Copy link
Contributor

noctuid commented Sep 12, 2018

Maybe also move the ELP configuration? Right now the configuration for changing the initial ag state to motion has been moved, but the elp configuration for entering motion state remains. Other than that, it looks good.

@jojojames
Copy link
Contributor Author

Thanks, changed @noctuid .

@noctuid
Copy link
Contributor

noctuid commented Sep 12, 2018

Since initial state changes and evil-make-overriding-map calls are also being moved (which I agree with) in addition to keybindings, you should probably explicitly document that as well.

@jojojames
Copy link
Contributor Author

Good idea, where to document this?

@noctuid
Copy link
Contributor

noctuid commented Sep 12, 2018

I'd mention what is expected to be included in the file in both evil-integration and evil-keybindings (in a commentary section), so that it's hopefully clear for anyone who wants to add something to those files (assuming they read the commentary). I'd also probably mention it in the docstring for evil-want-keybindings (though with a more high level description that doesn't mention the actual evil function/variables; for example, say that functionality in evil-keybindings may remove (mainly) insertion keybindings by changing the initial state and may have some mode's keybindings override evil's defaults).

@noctuid
Copy link
Contributor

noctuid commented Sep 12, 2018

I also think that it might be better to rename the file (and maybe the variable; e.g. add -integration or something) because if I didn't already know the difference, I might be confused about evil-keybindings.el vs. evil-maps.el.

@jojojames
Copy link
Contributor Author

I'll add something for the commentary section but my documentation skills aren't too good. :)

I also think that might be better to rename the file (and maybe the variable; e.g. add -integration or something) because if I didn't already know the difference, I might be confused about evil-keybindings.el vs. evil-maps.el.

I like the shortness of the current file/variable. evil-keybinding-integration and evil-want-keybinding-integration is a mouthful! Hopefully the commentary would be revealing enough? Not a strong opinion though.

@jojojames
Copy link
Contributor Author

Added some commentary, open to more polish, of course.

@TheBB
Copy link
Member

TheBB commented Sep 12, 2018

Thanks! I made some minor changes to the comments and merged manually.

@TheBB TheBB closed this Sep 12, 2018
@jojojames
Copy link
Contributor Author

Awesome, thanks @TheBB

AirManH added a commit to AirManH/.emacs.d that referenced this pull request Jul 12, 2021
`evil-collection' assumes `evil-want-keybinding' is set to `nil'
before loading `evil' and `evil-collection'

See also
- https://github.com/emacs-evil/evil-collection#installation
- emacs-evil/evil-collection#60
- emacs-evil/evil#1087
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.

4 participants