Merge #5704 from jamessan/vim-7.4.1748

vim-patch:7.4.1748
vim-patch:f9660b5
This commit is contained in:
Justin M. Keyes 2016-12-03 18:09:42 +01:00 committed by GitHub
commit e29a4ceede
4 changed files with 15 additions and 3 deletions

View File

@ -3646,10 +3646,11 @@ nv_gd (
size_t len;
char_u *ptr;
if ((len = find_ident_under_cursor(&ptr, FIND_IDENT)) == 0
|| !find_decl(ptr, len, nchar == 'd', thisblock, 0))
|| !find_decl(ptr, len, nchar == 'd', thisblock, SEARCH_START)) {
clearopbeep(oap);
else if ((fdo_flags & FDO_SEARCH) && KeyTyped && oap->op_type == OP_NOP)
} else if ((fdo_flags & FDO_SEARCH) && KeyTyped && oap->op_type == OP_NOP) {
foldOpenCursor();
}
}
/*

View File

@ -8,6 +8,7 @@ source test_ex_undo.vim
source test_expr.vim
source test_expr_utf8.vim
source test_feedkeys.vim
source test_goto.vim
source test_menu.vim
source test_messages.vim
source test_options.vim

View File

@ -0,0 +1,10 @@
" Test commands that jump somewhere.
func Test_geedee()
new
call setline(1, ["Filename x;", "", "int Filename", "int func() {", "Filename y;"])
/y;/
normal gD
call assert_equal(1, line('.'))
quit!
endfunc

View File

@ -696,7 +696,7 @@ static int included_patches[] = {
// 1751,
// 1750 NA
// 1749 NA
// 1748,
1748,
// 1747 NA
// 1746 NA
// 1745 NA