Skip to content

Conversation

laniakea64
Copy link
Collaborator

This PR brings vim/vim@61fd270#diff-a43cea7603144b91369f5717ea0d128a0dd09242dfb2eec713ecc12eaa8d15cc upstream:

vim-just makes extensive use of Vim syntaxes that require part of the effect of set nocompatible. And even with Vim configurations that do set nocompatible, I have seen cases where some syntax files get loaded before the set nocompatible is applied, resulting in very obscure, hard-to-diagnose errors.

This patch fixes vim-just to work even when user's Vim config outright does set compatible. It should not affect user's Vim setup and this method does not have side effects.

Ping @pbnj as original author of this patch (I only added comments and minor reorganization) - hope the way of crediting you in the commit message is OK with you, if you would like something different please let us know.

@NoahTheDuke
Copy link
Owner

You can always use authored-by to indicate someone else wrote the patch, you're merely committing it.

@laniakea64
Copy link
Collaborator Author

You can always use authored-by to indicate someone else wrote the patch, you're merely committing it.

Not sure I know what authored-by is? Do you mean crediting original author with git commit --author='(author line from original patch)' and using Co-authored-by: laniakea64 <...> to note that minor changes were made by me?

@NoahTheDuke
Copy link
Owner

Oops, yes, I meant --author, not --authored-by. If you didn't make any changes yourself, you can just write git commit --author="..." and it will use the author you enter while leaving you as the "committer", which indicates that the original author wrote the patch and you're the person who applied the patch.

If you did make changes, then using Co-authored-by: ... is the best way to show that you were a contributor to the patch.

@NoahTheDuke NoahTheDuke merged commit 5a644fd into main Feb 3, 2025
1 check passed
@laniakea64 laniakea64 deleted the cpoptions branch February 3, 2025 02:13
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.

3 participants