Update to 7.4.953#163
Merged
chdiza merged 7 commits intomacvim-dev:masterfrom Dec 3, 2015
chdiza:master
Merged
Conversation
Problem: Can't build when the insert_expand feature is disabled. Solution: Add #ifdefs. (Dan Pasanen, closes #499)
Problem: When using 'colorcolumn' and there is a sign with a fullwidth
character the highlighting is wrong. (Andrew Stewart)
Solution: Only increment vcol when in the right state. (Christian Brabandt)
Problem: v:errors is not initialized. Solution: Initialze it to an empty list. (Thinca)
Problem: Sorting number strings does not work as expected. (Luc Hermitte) Solution: Add the 'N" argument to sort()
Problem: 'lispwords' is tested in the old way. Solution: Make a new style test for 'lispwords'.
Problem: When a test script navigates to another buffer the .res file is
created with the wrong name.
Solution: Use the "testname" for the .res file. (Damien)
Contributor
Author
|
I think I did a better job this time. Next time, assuming my permissions allow it, I won't make a PR but will just push straight up. |
Contributor
Author
|
The failing test is not our problem. Merging. |
chdiza
added a commit
that referenced
this pull request
Dec 3, 2015
Merge remote-tracking branch 'vim/master'
Contributor
|
If you have any conflicts at merging, please hold on to merge it on the master branch directly. I'll do it. |
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
3 participants
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.