Skip to content

On branch brazilian-keymap-v2 #17161

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

Closed
wants to merge 3 commits into from

Conversation

LuMarquesIlva
Copy link
Contributor

Changes to be committed:
modified: runtime/keymap/brazilian_portuguese-abnt.vim
modified: runtime/keymap/brazilian_portuguese-compact.vim

 Changes to be committed:
	modified:   runtime/keymap/brazilian_portuguese-abnt.vim
	modified:   runtime/keymap/brazilian_portuguese-compact.vim
@chrisbra
Copy link
Member

thanks, but you seem to have comited a conflict in both files. Do you mean to include the following mapping in your keymap?

` ' ASCII SINGLE QUOTE

Then please just keep that part, else remove it. And then please also remove those conflict marker lines:

<<<<<<< HEAD
>>>>>>> 22cdd3434 ( Changes to be committed:)

@LuMarquesIlva
Copy link
Contributor Author

thanks, but you seem to have comited a conflict in both files. Do you mean to include the following mapping in your keymap?

` ' ASCII SINGLE QUOTE

Then please just keep that part, else remove it. And then please also remove those conflict marker lines:

<<<<<<< HEAD
>>>>>>> 22cdd3434 ( Changes to be committed:)

Yes I meant to commit that, because there wasn't any mapping for the single quote before, just the apostrophe had a keymap

@chrisbra
Copy link
Member

thanks

@chrisbra chrisbra closed this in 7938c40 Apr 20, 2025
zeertzjq added a commit to zeertzjq/neovim that referenced this pull request Apr 21, 2025
closes: vim/vim#17161

vim/vim@7938c40

Co-authored-by: LuMarquesIlva <luismarques0504@proton.me>
zeertzjq added a commit to neovim/neovim that referenced this pull request Apr 21, 2025
closes: vim/vim#17161

vim/vim@7938c40

Co-authored-by: LuMarquesIlva <luismarques0504@proton.me>
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