updated for version 7.3.982

Problem:    In the new regexp engine \p does not work on multi-byte
            characters.
Solution:   Don't point to an integer but the characters.

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index d70e46a6f1c2658dba575dd97b0b5f5e68363679..9ae59ae63f9860d5d86b58346ad46bba05458949 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -2931,7 +2931,7 @@ again:
        }
        if (c == NUL)
            n = 0;
-       cc = (char_u *)&c;
+       cc = reginput;
 
        /* swap lists */
        thislist = &list[flag];
@@ -2960,7 +2960,7 @@ again:
            if (neglist->n > 0)
            {
                t = &neglist->t[0];
-               neglist->n --;
+               neglist->n--;
                i--;
            }
            else

diff --git a/src/testdir/test95.in b/src/testdir/test95.in
index 78a999f566510d5d4dd9140944643db1f2e9acfa..fb78b88dd17dbc8e4d663f9a82de7b92f38147a2 100644 (file)
--- a/src/testdir/test95.in
+++ b/src/testdir/test95.in
@@ -25,6 +25,9 @@ STARTTEST
 :call add(tl, [' [^ ]\+', 'start มabcdม ', ' มabcdม'])
 :call add(tl, ['[ม[:alpha:][=a=]]\+', '879 aiaãมâมaiuvna ', 'aiaãมâมaiuvna'])
 
+:" this is not a normal "i" but 0xec
+:call add(tl, ['\p\+', 'ìa', 'ìa'])
+
 :"""" Run the tests
 
 :"

diff --git a/src/testdir/test95.ok b/src/testdir/test95.ok
index d135b0eb84634f71d5449715159a85e98f05e336..cb1577a7e4fe774a82498b7205287205b9f7a4c6 100644 (file)
--- a/src/testdir/test95.ok
+++ b/src/testdir/test95.ok
@@ -4,3 +4,4 @@ OK - [[=a=]]\+
 OK - [^ม ]\+
 OK -  [^ ]\+
 OK - [ม[:alpha:][=a=]]\+
+OK - \p\+

diff --git a/src/version.c b/src/version.c
index 80ac755911b360e032d9cec2e39dbca6050655bc..a57f685bfece2f3b4f5bcc8fdb4adf9021dec1c3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    982,
 /**/
     981,
 /**/