aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/regexp.c
diff options
context:
space:
mode:
authorMichael Ennen <mike.ennen@gmail.com>2016-12-21 01:57:59 -0700
committerMichael Ennen <mike.ennen@gmail.com>2016-12-31 14:38:27 -0700
commit415495273c1c53dbc28fae55b08f9672bc5414b0 (patch)
tree2a4c9aaab0e41b200d3c246a6c470bc7ed894a85 /src/nvim/regexp.c
parent5366242789a4c2f53c52d2fe2f6be7284fcc73b5 (diff)
downloadrneovim-415495273c1c53dbc28fae55b08f9672bc5414b0.tar.gz
rneovim-415495273c1c53dbc28fae55b08f9672bc5414b0.tar.bz2
rneovim-415495273c1c53dbc28fae55b08f9672bc5414b0.zip
vim-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) https://github.com/vim/vim/commit/e8aee7dcf9b12becff86e8ce1783a86801c5f9f6
Diffstat (limited to 'src/nvim/regexp.c')
-rw-r--r--src/nvim/regexp.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 64a70c295a..122b589d2f 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -2309,14 +2309,18 @@ collection:
}
break;
case CLASS_ALNUM:
- for (cu = 1; cu <= 255; cu++)
- if (isalnum(cu))
+ for (cu = 1; cu < 128; cu++) {
+ if (isalnum(cu)) {
regc(cu);
+ }
+ }
break;
case CLASS_ALPHA:
- for (cu = 1; cu <= 255; cu++)
- if (isalpha(cu))
+ for (cu = 1; cu < 128; cu++) {
+ if (isalpha(cu)) {
regc(cu);
+ }
+ }
break;
case CLASS_BLANK:
regc(' ');
@@ -2338,9 +2342,11 @@ collection:
regc(cu);
break;
case CLASS_LOWER:
- for (cu = 1; cu <= 255; cu++)
- if (vim_islower(cu))
+ for (cu = 1; cu <= 255; cu++) {
+ if (vim_islower(cu) && cu != 170 && cu != 186) {
regc(cu);
+ }
+ }
break;
case CLASS_PRINT:
for (cu = 1; cu <= 255; cu++)
@@ -2348,9 +2354,11 @@ collection:
regc(cu);
break;
case CLASS_PUNCT:
- for (cu = 1; cu <= 255; cu++)
- if (ispunct(cu))
+ for (cu = 1; cu < 128; cu++) {
+ if (ispunct(cu)) {
regc(cu);
+ }
+ }
break;
case CLASS_SPACE:
for (cu = 9; cu <= 13; cu++)