thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.1-258

Browse Source
This commit is contained in:
Bram Moolenaar
2008-02-20 12:43:01 +00:00
parent c7486c858d
commit 5bcbd537b4
1 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/search.c
View File

@@ -624,7 +624,7 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm)
#ifdef FEAT_EVAL #ifdef FEAT_EVAL
submatch = first_submatch(&regmatch); submatch = first_submatch(&regmatch);
#endif #endif
/* Line me be past end of buffer for "\n\zs". */ /* "lnum" may be past end of buffer for "\n\zs". */
if (lnum + matchpos.lnum > buf->b_ml.ml_line_count) if (lnum + matchpos.lnum > buf->b_ml.ml_line_count)
ptr = (char_u *)""; ptr = (char_u *)"";
else else
@@ -833,21 +833,38 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm)
continue; continue;
} }
if (options & SEARCH_END && !(options & SEARCH_NOOF)) /* With the SEARCH_END option move to the last character
* of the match. Don't do it for an empty match, end
* should be same as start then. */
if (options & SEARCH_END && !(options & SEARCH_NOOF)
&& !(matchpos.lnum == endpos.lnum
&& matchpos.col == endpos.col))
{ {
/* For a match in the first column, set the position
* on the NUL in the previous line. */
pos->lnum = lnum + endpos.lnum; pos->lnum = lnum + endpos.lnum;
pos->col = endpos.col - 1; pos->col = endpos.col;
#ifdef FEAT_MBYTE if (endpos.col == 0)
if (has_mbyte)
{ {
/* 'e' offset may put us just below the last line */ if (pos->lnum > 1) /* just in case */
if (pos->lnum > buf->b_ml.ml_line_count) {
ptr = (char_u *)""; --pos->lnum;
else pos->col = (colnr_T)STRLEN(ml_get_buf(buf,
ptr = ml_get_buf(buf, pos->lnum, FALSE); pos->lnum, FALSE));
pos->col -= (*mb_head_off)(ptr, ptr + pos->col); }
} }
else
{
--pos->col;
#ifdef FEAT_MBYTE
if (has_mbyte
&& pos->lnum <= buf->b_ml.ml_line_count)
{
ptr = ml_get_buf(buf, pos->lnum, FALSE);
pos->col -= (*mb_head_off)(ptr, ptr + pos->col);
}
#endif #endif
}
} }
else else
{ {