diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-01-13 22:06:10 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-01-13 22:06:10 -0500 |
| commit | 2c76651438a297d9e104bf9c669a7a1339e24bb4 (patch) | |
| tree | 9fb3500324a1dd75a76815341835c39e69e1a64d | |
| parent | 59e1f8996dcfbe9f5adc8b5106fa816f9afc6af6 (diff) | |
| parent | 39ef2195357996ce0d2b2d2d41275a572f2891b3 (diff) | |
| download | rneovim-2c76651438a297d9e104bf9c669a7a1339e24bb4.tar.gz rneovim-2c76651438a297d9e104bf9c669a7a1339e24bb4.tar.bz2 rneovim-2c76651438a297d9e104bf9c669a7a1339e24bb4.zip | |
Merge pull request #4002 from brcolow/7.4.714
Vim 7.4.714
| -rw-r--r-- | src/nvim/regexp.c | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index e2c4b590d0..39001939d8 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -5333,10 +5333,12 @@ do_class: if ((len = (*mb_ptr2len)(opnd)) > 1) { if (ireg_ic && enc_utf8) cf = utf_fold(utf_ptr2char(opnd)); - while (count < maxcount) { - for (i = 0; i < len; ++i) - if (opnd[i] != scan[i]) + while (count < maxcount && (*mb_ptr2len)(scan) >= len) { + for (i = 0; i < len; ++i) { + if (opnd[i] != scan[i]) { break; + } + } if (i < len && (!ireg_ic || !enc_utf8 || utf_fold(utf_ptr2char(scan)) != cf)) break; diff --git a/src/nvim/version.c b/src/nvim/version.c index da3ee09429..f41bcad244 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -410,7 +410,7 @@ static int included_patches[] = { // 717, // 716, // 715, - // 714, + 714, 713, 712, 711, |