Merge pull request #4078 from jbradaric/vim-7.4.685

vim-patch:7.4.685
This commit is contained in:
Justin M. Keyes 2016-01-23 10:07:24 -05:00
commit c8b487ae40
2 changed files with 2 additions and 2 deletions

View File

@ -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)

View File

@ -439,7 +439,7 @@ static int included_patches[] = {
// 688,
// 687 NA
686,
// 685,
685,
// 684,
// 683 NA
682,