commit 09ea9fcf3f0eef0e0f8f8552d856f8896749e846
author Bram Moolenaar <Bram@vim.org> Tue May 21 00:03:02 2013 +0200
committer Bram Moolenaar <Bram@vim.org> Tue May 21 00:03:02 2013 +0200
tree 3c82bfddd0ebfc5c7563eb4b264e78d4f19b42fa
parent 745fc029ba7541ac08b93bb2304a1a407e73336b

updated for version 7.3.981
Problem:    In the old regexp engine \i, \I, \f and \F don't work on
            multi-byte characters.
Solution:   Dereference pointer properly.

src/regexp.c

diff --git a/src/regexp.c b/src/regexp.c
index 60765d7..29b4081 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -5758,7 +5758,7 @@
       case SIDENT + ADD_NL:
 	while (count < maxcount)
 	{
-	    if (vim_isIDc(*scan) && (testval || !VIM_ISDIGIT(*scan)))
+	    if (vim_isIDc(PTR2CHAR(scan)) && (testval || !VIM_ISDIGIT(*scan)))
 	    {
 		mb_ptr_adv(scan);
 	    }
@@ -5819,7 +5819,7 @@
       case SFNAME + ADD_NL:
 	while (count < maxcount)
 	{
-	    if (vim_isfilec(*scan) && (testval || !VIM_ISDIGIT(*scan)))
+	    if (vim_isfilec(PTR2CHAR(scan)) && (testval || !VIM_ISDIGIT(*scan)))
 	    {
 		mb_ptr_adv(scan);
 	    }

src/testdir/test64.in

diff --git a/src/testdir/test64.in b/src/testdir/test64.in
index be71282..37f263b 100644
--- a/src/testdir/test64.in
+++ b/src/testdir/test64.in
@@ -262,6 +262,10 @@
 :call add(tl, ['[a-zA-Z]', 'a', 'a'])
 :call add(tl, ['[A-Z]', 'a'])
 :call add(tl, ['\C[^A-Z]\+', 'ABCOIJDEOIFNSD jsfoij sa', ' jsfoij sa'])
+:call add(tl, ['\i\+', '&*§xx ', 'xx'])
+:call add(tl, ['\%#=1\i\+', '&*§xx ', 'xx'])
+:call add(tl, ['\f\+', '&*Ÿfname ', 'fname'])
+:call add(tl, ['\%#=1\i\+', '&*Ÿfname ', 'fname'])
 
 :"""" Tests for \z features
 :call add(tl, ['xx \ze test', 'xx '])					" must match after \ze

src/testdir/test64.ok

diff --git a/src/testdir/test64.ok b/src/testdir/test64.ok
index c315a23..e3f5657 100644
--- a/src/testdir/test64.ok
+++ b/src/testdir/test64.ok
@@ -203,6 +203,10 @@
 OK - [a-zA-Z]
 OK - [A-Z]
 OK - \C[^A-Z]\+
+OK - \i\+
+OK - \%#=1\i\+
+OK - \f\+
+OK - \%#=1\i\+
 OK - xx \ze test
 OK - abc\zeend
 OK - abc\zsdd

src/version.c

diff --git a/src/version.c b/src/version.c
index bef4af2..80ac755 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    981,
+/**/
     980,
 /**/
     979,