-
Notifications
You must be signed in to change notification settings - Fork 397
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
Master #55
Open
MerlinRusi
wants to merge
1,284
commits into
vim
Choose a base branch
from
master
base: vim
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Master #55
Conversation
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
These do not make much sense to include (and they could not easily be mapped to because of the fact that they generate events as the gesture is being performed). Also, make some updates to the help.
Put keyboard input on Vim's input buffer as soon as it arrives instead of first putting it on the backend's input buffer. This should fix problems with MacVim spuriously locking up when opening files as has been reported by users of the PeepOpen utility.
This fixes a bug which caused DTerm not to work when in full screen mode.
Conflicts: src/main.c
This regression was introduced in commit be84460.
This change is to make the behavior more consistent and easier to predict (e.g. when MacVim is used with PeepOpen). If opening new files causes a new window to appear on screen, then the pwd is set to the directory of the first file being opened. If a window is already visible and new files are set to open in the "current" window, then the pwd will not change when opening files.
Conflicts: src/os_unix.c
The autocommand "au GUIEnter * set fu" would cause the full screen window to always appear on the primary monitor when multiple monitors were connected. This commit fixes this problem.
The window cascading code had an "off by one" bug which could cause the wrong screen to used when using more than one monitor.
The view constraining code could get called before the window had been placed sometimes causing the wrong screen to be used when more than one monitor was connected.
Conflicts: src/auto/configure
This way Vim is immediately made aware when the input source changes (previously it polled this on keyboard input) which is useful e.g. if ":hi CursorIM .." is set.
It fixes changing cursor with ":hi CursorIM" even though the cursor blinking is turned off (:set gcr=a:blinkon0) when the IM state is changed.
IM state change needs to update the cursor which may cause Vim state changes and so the processing of IM messages needs to be delayed.
Conflicts: src/auto/configure src/eval.c src/netbeans.c
Original patch by Kazuki Sakamoto.
Conflicts: runtime/syntax/vim.vim
The proxy icon is only disabled when the current buffer is modified (previously this happened when any buffer was modified). This also has the consequence that the dot in the red "close button" only appears when the current buffer is modified.
When resizing a (Vim-) window don't use the CLEAR flag as it causes the status line to be redrawn (which causes problems for plugins like Command-T). The reason CLEAR was used in the first place was because resizing a window would cause display corruption due to wide letters like "w" spilling over into the neigboring display cell. To circumvent this problem we now always clear neigboring blank cells whenever a cell is cleared (just like other GUIs deal with faked bold glyphs spilling over into neighboring display cells).
As a Mac user I’m used to using Option-Delete to delete to the beginning of the previous word; MacVim sets up this behavior with its gvimrc. But I also like to use Control-W to delete to the beginning of the line. This change makes it possible for these two mappings to coexist without a problem.
Use “noremap” in system gvimrc
Don't double-encode URLs before parsing them
Conflicts: src/auto/configure
This fixes a compilation problem on OS X 10.9. Patch by @felixbuenemann.
Mac OS X Mavericks ships with Ruby.framework 2.0 which requires some fixes to enable proper header inclusion and version defines.
getfontname() would incorrectly return strings of the form "FONTNAME:SIZE", when it should be returning strings of the form "FONTNAME:hSIZE"--notice the "h" in the last form. To fix this, we change the internal representation of the font name and size to include the "h", and peel it off when actually setting the font.
By managing autorelease pools in objc code we avoid warnings on OS X 10.9 and it is also safer than calling objc runtime functions from C.
This reverts commit fc64ef5.
This reverts commit df7b6fb.
Conflicts: src/auto/configure
Conflicts: src/if_ruby.c
Conflicts: runtime/syntax/vim.vim src/structs.h
Conflicts: src/option.c
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.