diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-12-03 18:09:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-03 18:09:42 +0100 |
| commit | e29a4ceede086bcf5e6242b75fe8f38c30cf3945 (patch) | |
| tree | 2d9e9a58595ede63af66b29c20c578850187ac5a /src | |
| parent | 3607e0b8ff772683668127b92a841a57f8412ebc (diff) | |
| parent | d9dffeb4868c2c036663faa142f1ed7b1d51400a (diff) | |
| download | rneovim-e29a4ceede086bcf5e6242b75fe8f38c30cf3945.tar.gz rneovim-e29a4ceede086bcf5e6242b75fe8f38c30cf3945.tar.bz2 rneovim-e29a4ceede086bcf5e6242b75fe8f38c30cf3945.zip | |
Merge #5704 from jamessan/vim-7.4.1748
vim-patch:7.4.1748
vim-patch:f9660b5
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/normal.c | 5 | ||||
| -rw-r--r-- | src/nvim/testdir/test_alot.vim | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_goto.vim | 10 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
4 files changed, 15 insertions, 3 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 76e3829bee..312777d3b9 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -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(); + } } /* diff --git a/src/nvim/testdir/test_alot.vim b/src/nvim/testdir/test_alot.vim index 083f57aec1..c9d7b332e4 100644 --- a/src/nvim/testdir/test_alot.vim +++ b/src/nvim/testdir/test_alot.vim @@ -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 diff --git a/src/nvim/testdir/test_goto.vim b/src/nvim/testdir/test_goto.vim new file mode 100644 index 0000000000..fb8f190fa6 --- /dev/null +++ b/src/nvim/testdir/test_goto.vim @@ -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 diff --git a/src/nvim/version.c b/src/nvim/version.c index 05855ee385..29e7990b1b 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -696,7 +696,7 @@ static int included_patches[] = { // 1751, // 1750 NA // 1749 NA - // 1748, + 1748, // 1747 NA // 1746 NA // 1745 NA |