Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement
gui_mch_mousehide
to make merging from upstream easier
Add an empty implementation to remove a diff from upstream, which constantly shows up when resolving merge conflicts. We just make the implementation empty because we already handle mouse hide in the MacVim process using NSCursor instead, and don't need Vim's manual handling of it. Also, refactor test_macvim.vim a little.
- Loading branch information
Showing
4 changed files
with
14 additions
and
3 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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