diff options
| author | Bram Moolenaar <Bram@vim.org> | 2005-08-10 21:07:57 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2005-08-10 21:07:57 +0000 |
| commit | 0fa313a71870ccc2ba63da25a7abea850f5b3d02 (patch) | |
| tree | fc949b566e1d78f6eea570aab55c52b7d6a6b052 /src/search.c | |
| parent | c388fbf9d99a8950c8c9a01466cfb8baa104ee8c (diff) | |
| download | vim-git-0fa313a71870ccc2ba63da25a7abea850f5b3d02.tar.gz | |
updated for version 7.0127v7.0127
Diffstat (limited to 'src/search.c')
| -rw-r--r-- | src/search.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/search.c b/src/search.c index a0c46ffbd..bc5da67bb 100644 --- a/src/search.c +++ b/src/search.c @@ -259,7 +259,7 @@ reverse_text(s) { int mb_len; - mb_len = (*mb_ptr2len_check)(s + s_i); + mb_len = (*mb_ptr2len)(s + s_i); rev_i -= mb_len; mch_memmove(rev + rev_i, s + s_i, mb_len); s_i += mb_len - 1; @@ -372,7 +372,7 @@ ignorecase(pat) #ifdef FEAT_MBYTE int l; - if (has_mbyte && (l = (*mb_ptr2len_check)(p)) > 1) + if (has_mbyte && (l = (*mb_ptr2len)(p)) > 1) { if (enc_utf8 && utf_isupper(utf_ptr2char(p))) { @@ -544,7 +544,7 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use) /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */ else if (has_mbyte && pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count && pos->col < MAXCOL - 2) - extra_col = (*mb_ptr2len_check)(ml_get_buf(buf, pos->lnum, FALSE) + extra_col = (*mb_ptr2len)(ml_get_buf(buf, pos->lnum, FALSE) + pos->col); #endif else @@ -647,7 +647,7 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use) #ifdef FEAT_MBYTE if (has_mbyte) matchcol += - (*mb_ptr2len_check)(ptr + matchcol); + (*mb_ptr2len)(ptr + matchcol); else #endif ++matchcol; @@ -660,7 +660,7 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use) { #ifdef FEAT_MBYTE if (has_mbyte) - matchcol += (*mb_ptr2len_check)(ptr + matchcol += (*mb_ptr2len)(ptr + matchcol); else #endif @@ -750,7 +750,7 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use) #ifdef FEAT_MBYTE if (has_mbyte) matchcol += - (*mb_ptr2len_check)(ptr + matchcol); + (*mb_ptr2len)(ptr + matchcol); else #endif ++matchcol; @@ -767,7 +767,7 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use) #ifdef FEAT_MBYTE if (has_mbyte) matchcol += - (*mb_ptr2len_check)(ptr + matchcol); + (*mb_ptr2len)(ptr + matchcol); else #endif ++matchcol; @@ -1447,7 +1447,7 @@ searchc(cap, t_cmd) { if (dir > 0) { - col += (*mb_ptr2len_check)(p + col); + col += (*mb_ptr2len)(p + col); if (col >= len) return FAIL; } @@ -1747,7 +1747,7 @@ findmatchlimit(oap, initc, flags, maxtravel) break; #ifdef FEAT_MBYTE if (has_mbyte) - pos.col += (*mb_ptr2len_check)(linep + pos.col); + pos.col += (*mb_ptr2len)(linep + pos.col); else #endif ++pos.col; @@ -1950,7 +1950,7 @@ findmatchlimit(oap, initc, flags, maxtravel) { #ifdef FEAT_MBYTE if (has_mbyte) - pos.col += (*mb_ptr2len_check)(linep + pos.col); + pos.col += (*mb_ptr2len)(linep + pos.col); else #endif ++pos.col; @@ -4030,7 +4030,7 @@ find_next_quote(line, col, quotechar, escape) break; #ifdef FEAT_MBYTE if (has_mbyte) - col += (*mb_ptr2len_check)(line + col); + col += (*mb_ptr2len)(line + col); else #endif ++col; |