updated for version 7.4.050

Problem:    "gn" selects too much for the pattern "\d" when there are two
            lines with a single digit. (Ryan Carney)
Solution:   Adjust the logic of is_one_char(). (Christian Brabandt)

diff --git a/src/search.c b/src/search.c
index da7bc29612292f5ffb45d4695901e15bb5a0385b..5d02dd9e3344df060df27503570c87ebd0bb83e4 100644 (file)
--- 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 2cc7d105083fb0b486e5c1856b1fc104986add2e..47cf6f562f9c47a96bb3b3a0dc28bf5746373b8e 100644 (file)
--- a/src/testdir/test53.in
+++ b/src/testdir/test53.in
@@ -46,6 +46,9 @@ vlgnd
 :set selection=exclusive
 $cgNmongoose\e/i
 cgnj\e
+:" Make sure there is no other match y uppercase.
+/\16x59
+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 40031ed47ae28c69703cbc73fc23741864855ef7..e469869abb95e6bccf783c643158c97d4949bfea 100644 (file)
--- 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 7b3e7edf060102a902604362ccae958a76e8d4fe..664e07dd41a26fc8b20c46de8fcf8358d5a8587e 100644 (file)
--- 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,
 /**/