diff --git a/src/search.c b/src/search.c index da7bc29612..5d02dd9e33 100644 --- a/src/search.c +++ b/src/search.c @@ -4680,8 +4680,8 @@ is_one_char(pattern) && regmatch.startpos[0].lnum == regmatch.endpos[0].lnum && regmatch.startpos[0].col == regmatch.endpos[0].col); - if (!result && incl(&pos) == 0 && pos.col == regmatch.endpos[0].col) - result = TRUE; + if (!result && inc(&pos) >= 0 && pos.col == regmatch.endpos[0].col) + result = TRUE; } called_emsg |= save_called_emsg; diff --git a/src/testdir/test53.in b/src/testdir/test53.in index 2cc7d10508..47cf6f562f 100644 --- a/src/testdir/test53.in +++ b/src/testdir/test53.in @@ -46,6 +46,9 @@ vlgnd :set selection=exclusive $cgNmongoose/i cgnj +:" Make sure there is no other match y uppercase. +/x59 +gggnd :/^start:/,/^end:/wq! test.out ENDTEST @@ -75,4 +78,7 @@ delete first and last chars uniquepattern uniquepattern my very excellent mother just served us nachos for (i=0; i<=10; i++) +Y +text +Y end: diff --git a/src/testdir/test53.ok b/src/testdir/test53.ok index 40031ed47a..e469869abb 100644 --- a/src/testdir/test53.ok +++ b/src/testdir/test53.ok @@ -27,4 +27,7 @@ elete first and last char uniquepattern my very excellent mongoose just served us nachos for (j=0; i<=10; i++) + +text +Y end: diff --git a/src/version.c b/src/version.c index 7b3e7edf06..664e07dd41 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 50, /**/ 49, /**/