mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-04 00:46:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #4140 'vim-patch:7.4.771'.

Browse Source
This commit is contained in:
Justin M. Keyes
2016-02-15 01:48:30 -05:00
parent e0ca30553b 69234f4a76
commit 1e995ea2fd
4 changed files with 45 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/nvim/search.c
View File

@@ -497,6 +497,7 @@ int searchit(
pos_T start_pos;
int at_first_line;
int extra_col;
int start_char_len;
int match_ok;
long nmatched;
int submatch = 0;
@@ -519,16 +520,21 @@ int searchit(
// When not accepting a match at the start position set "extra_col" to a
// non-zero value. Don't do that when starting at MAXCOL, since MAXCOL + 1
// is zero.
if ((options & SEARCH_START) || pos->col == MAXCOL) {
extra_col = 0;
} else if (dir != BACKWARD && has_mbyte
&& pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count
&& pos->col < MAXCOL - 2) {
if (pos->col == MAXCOL) {
start_char_len = 0;
} else if (has_mbyte
&& pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count
&& pos->col < MAXCOL - 2) {
// Watch out for the "col" being MAXCOL - 2, used in a closed fold.
ptr = ml_get_buf(buf, pos->lnum, FALSE) + pos->col;
extra_col = *ptr == NUL ? 1 : (*mb_ptr2len)(ptr);
ptr = ml_get_buf(buf, pos->lnum, false) + pos->col;
start_char_len = *ptr == NUL ? 1 : (*mb_ptr2len)(ptr);
} else {
extra_col = 1;
start_char_len = 1;
}
if (dir == FORWARD) {
extra_col = (options & SEARCH_START) ? 0 : start_char_len;
} else {
extra_col = (options & SEARCH_START) ? start_char_len : 0;
}
start_pos = *pos; /* remember start pos for detecting no match */
@@ -679,16 +685,14 @@ int searchit(
|| (lnum + regmatch.endpos[0].lnum
== start_pos.lnum
&& (int)regmatch.endpos[0].col - 1
+ extra_col
<= (int)start_pos.col))
< (int)start_pos.col + extra_col))
: (lnum + regmatch.startpos[0].lnum
< start_pos.lnum
|| (lnum + regmatch.startpos[0].lnum
== start_pos.lnum
&& (int)regmatch.startpos[0].col
+ extra_col
<= (int)start_pos.col)))) {
match_ok = TRUE;
< (int)start_pos.col + extra_col)))) {
match_ok = true;
matchpos = regmatch.startpos[0];
endpos = regmatch.endpos[0];
submatch = first_submatch(&regmatch);

2
src/nvim/version.c
View File

@@ -517,7 +517,7 @@ static int included_patches[] = {
774,
773,
// 772 NA
// 771,
771,
// 770 NA
769,
768,