IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4078 from jbradaric/vim-7.4.685

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/regexp.c
View File

@ -4186,7 +4186,7 @@ regmatch (
/* When only a composing char is given match at any /* When only a composing char is given match at any
* position where that composing char appears. */ * position where that composing char appears. */
status = RA_NOMATCH; 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); inpc = mb_ptr2char(reginput + i);
if (!utf_iscomposing(inpc)) { if (!utf_iscomposing(inpc)) {
if (i > 0) if (i > 0)

2
src/nvim/version.c
View File

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