Repository navigation
Refactor to avoid future Vim merge conflicts - #1706
Merged
ychin merged 1 commit intoOct 21, 2026
Merged
Conversation
Change how different parts of the MacVim-specific code are added on top of Vim in order to reduce repetitive merge conflicts when sycing from upstream. This should hopefully help reduce churn. The main strategy is to move declarations to the top rather than at the end, which is frequently touched by Vim upstream. We also want to avoid having to manually re-calculate index numbers which is error-prone. For keymap.h, we now allocates a fixed offset (210) to the MacVim-specific keys like trackpad gesture swipes. Previously we always re-calculated the numeric values of these keys every time upstream added more keys, but it made the value of "\<SwipeLeft>" inconsistent which is not supposed to be how key values work. Now, we should have a stable value for them that would persist. The value is large enough that there should be very little chance for upstream Vim to add enough keys to cause a conflict.
ychin
added
the
Non User Facing
ychin
enabled auto-merge
October 20, 2026 23:46
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Change how different parts of the MacVim-specific code are added on top of Vim in order to reduce repetitive merge conflicts when sycing from upstream. This should hopefully help reduce churn.
The main strategy is to move declarations to the top rather than at the end, which is frequently touched by Vim upstream. We also want to avoid having to manually re-calculate index numbers which is error-prone.
For keymap.h, we now allocates a fixed offset (210) to the MacVim-specific keys like trackpad gesture swipes. Previously we always re-calculated the numeric values of these keys every time upstream added more keys, but it made the value of
"\<SwipeLeft>"inconsistent which is not supposed to be how key values work. Now, we should have a stable value for them that would persist. The value is large enough that there should be very little chance for upstream Vim to add enough keys to cause a conflict.