[vim] 110/139: patch 7.4.1793 Problem: Some character classes may differ between systems. On OS/X the regexp test fails. Solution: Make this less dependent on the system. (idea by Kazunobu Kuriyama)

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit e8aee7dcf9b12becff86e8ce1783a86801c5f9f6
Author: Bram Moolenaar <Bram at vim.org>
Date:   Tue Apr 26 21:39:13 2016 +0200

    patch 7.4.1793
    Problem:    Some character classes may differ between systems.  On OS/X the
                regexp test fails.
    Solution:   Make this less dependent on the system. (idea by Kazunobu Kuriyama)
---
 src/regexp.c     | 9 +++++----
 src/regexp_nfa.c | 8 ++++----
 src/version.c    | 2 ++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/regexp.c b/src/regexp.c
index 733d564..5f1fc1c 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -2542,12 +2542,12 @@ collection:
 				}
 				break;
 			    case CLASS_ALNUM:
-				for (cu = 1; cu <= 255; cu++)
+				for (cu = 1; cu < 128; cu++)
 				    if (isalnum(cu))
 					regmbc(cu);
 				break;
 			    case CLASS_ALPHA:
-				for (cu = 1; cu <= 255; cu++)
+				for (cu = 1; cu < 128; cu++)
 				    if (isalpha(cu))
 					regmbc(cu);
 				break;
@@ -2572,7 +2572,8 @@ collection:
 				break;
 			    case CLASS_LOWER:
 				for (cu = 1; cu <= 255; cu++)
-				    if (MB_ISLOWER(cu))
+				    if (MB_ISLOWER(cu) && cu != 170
+								 && cu != 186)
 					regmbc(cu);
 				break;
 			    case CLASS_PRINT:
@@ -2581,7 +2582,7 @@ collection:
 					regmbc(cu);
 				break;
 			    case CLASS_PUNCT:
-				for (cu = 1; cu <= 255; cu++)
+				for (cu = 1; cu < 128; cu++)
 				    if (ispunct(cu))
 					regmbc(cu);
 				break;
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 5e073ee..4ca29f2 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -4837,11 +4837,11 @@ check_char_class(int class, int c)
     switch (class)
     {
 	case NFA_CLASS_ALNUM:
-	    if (c >= 1 && c <= 255 && isalnum(c))
+	    if (c >= 1 && c < 128 && isalnum(c))
 		return OK;
 	    break;
 	case NFA_CLASS_ALPHA:
-	    if (c >= 1 && c <= 255 && isalpha(c))
+	    if (c >= 1 && c < 128 && isalpha(c))
 		return OK;
 	    break;
 	case NFA_CLASS_BLANK:
@@ -4861,7 +4861,7 @@ check_char_class(int class, int c)
 		return OK;
 	    break;
 	case NFA_CLASS_LOWER:
-	    if (MB_ISLOWER(c))
+	    if (MB_ISLOWER(c) && c != 170 && c != 186)
 		return OK;
 	    break;
 	case NFA_CLASS_PRINT:
@@ -4869,7 +4869,7 @@ check_char_class(int class, int c)
 		return OK;
 	    break;
 	case NFA_CLASS_PUNCT:
-	    if (c >= 1 && c <= 255 && ispunct(c))
+	    if (c >= 1 && c < 128 && ispunct(c))
 		return OK;
 	    break;
 	case NFA_CLASS_SPACE:
diff --git a/src/version.c b/src/version.c
index 8b713ca..56af2f0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1793,
+/**/
     1792,
 /**/
     1791,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git