IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #970 from atwupack/vp-7.4.328

Browse Source 
vim-patch:7.4.328
This commit is contained in:
Justin M. Keyes 2014-08-14 14:21:44 -04:00
commit 6d45309797
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/search.c
View File

@ -3015,21 +3015,21 @@ current_block (
}
curwin->w_cursor = *end_pos;
/*
* Try to exclude the '(', '{', ')', '}', etc. when "include" is FALSE.
* If the ending '}' is only preceded by indent, skip that indent.
* But only if the resulting area is not smaller than what we started with.
*/
// Try to exclude the '(', '{', ')', '}', etc. when "include" is FALSE.
// If the ending '}', ')' or ']' is only preceded by indent, skip that
// indent. But only if the resulting area is not smaller than what we
// started with.
while (!include) {
incl(&start_pos);
sol = (curwin->w_cursor.col == 0);
decl(&curwin->w_cursor);
if (what == '{')
while (inindent(1)) {
sol = TRUE;
if (decl(&curwin->w_cursor) != 0)
break;
while (inindent(1)) {
sol = TRUE;
if (decl(&curwin->w_cursor) != 0) {
break;
}
}
/*
* In Visual mode, when the resulting area is not bigger than what we
* started with, extend it to the next block, and then exclude again.

2
src/nvim/version.c
View File

@ -221,7 +221,7 @@ static int included_patches[] = {
331,
//330,
//329,
//328,
328,
327,
//326,
//325,