diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-01-23 10:07:24 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-01-23 10:07:24 -0500 |
| commit | c8b487ae40713e4b3b80a626444f34691dd9325f (patch) | |
| tree | dbb4c8f2ca00a19d49a9b77f8f72eb547c5bfa64 /src | |
| parent | 0ccd1ef725ce4fbe0f86929efad25b24b17c2485 (diff) | |
| parent | f583e512092ecada59f21bc0559b76bcb094b70f (diff) | |
| download | rneovim-c8b487ae40713e4b3b80a626444f34691dd9325f.tar.gz rneovim-c8b487ae40713e4b3b80a626444f34691dd9325f.tar.bz2 rneovim-c8b487ae40713e4b3b80a626444f34691dd9325f.zip | |
Merge pull request #4078 from jbradaric/vim-7.4.685
vim-patch:7.4.685
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/regexp.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index 39001939d8..e01e812a70 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -4186,7 +4186,7 @@ regmatch ( /* When only a composing char is given match at any * position where that composing char appears. */ status = RA_NOMATCH; - for (i = 0; reginput[i] != NUL; i += utf_char2len(inpc)) { + for (i = 0; reginput[i] != NUL; i += utf_ptr2len(reginput + i)) { inpc = mb_ptr2char(reginput + i); if (!utf_iscomposing(inpc)) { if (i > 0) diff --git a/src/nvim/version.c b/src/nvim/version.c index 9b4c191d89..3687087d85 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -439,7 +439,7 @@ static int included_patches[] = { // 688, // 687 NA 686, - // 685, + 685, // 684, // 683 NA 682, |