Skip to content

Commit 44f028e

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 60009f2 + f9660b5 commit 44f028e

4 files changed

Lines changed: 15 additions & 1 deletion

File tree

src/normal.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4233,7 +4233,8 @@ nv_gd(
42334233
char_u *ptr;
42344234

42354235
if ((len = find_ident_under_cursor(&ptr, FIND_IDENT)) == 0
4236-
|| find_decl(ptr, len, nchar == 'd', thisblock, 0) == FAIL)
4236+
|| find_decl(ptr, len, nchar == 'd', thisblock, SEARCH_START)
4237+
== FAIL)
42374238
clearopbeep(oap);
42384239
#ifdef FEAT_FOLDING
42394240
else if ((fdo_flags & FDO_SEARCH) && KeyTyped && oap->op_type == OP_NOP)

src/testdir/test_alot.vim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ source test_feedkeys.vim
1212
source test_fnamemodify.vim
1313
source test_file_perm.vim
1414
source test_glob2regpat.vim
15+
source test_goto.vim
1516
source test_help_tagjump.vim
1617
source test_join.vim
1718
source test_lispwords.vim

src/testdir/test_goto.vim

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
" Test commands that jump somewhere.
2+
3+
func Test_geedee()
4+
new
5+
call setline(1, ["Filename x;", "", "int Filename", "int func() {", "Filename y;"])
6+
/y;/
7+
normal gD
8+
call assert_equal(1, line('.'))
9+
quit!
10+
endfunc

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ static char *(features[]) =
763763

764764
static int included_patches[] =
765765
{ /* Add new patch number below this line */
766+
/**/
767+
1748,
766768
/**/
767769
1747,
768770
/**/

0 commit comments

Comments
 (0)