diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-01-16 15:01:41 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-01-16 15:01:41 +0000 |
| commit | fb7c90c0face9790bdfe04cdfec95681fbc7b3e0 (patch) | |
| tree | a4cd118d2875e6d6119893f927b63f628412c9d0 | |
| parent | 56da797e6d8542f22a74b1b7bb752e7a66d0be7f (diff) | |
| download | vim-git-fb7c90c0face9790bdfe04cdfec95681fbc7b3e0.tar.gz | |
updated for version 7.0-186v7.0.186
| -rw-r--r-- | src/search.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/search.c b/src/search.c index de99f2c43..f38b62642 100644 --- a/src/search.c +++ b/src/search.c @@ -812,7 +812,11 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum) #ifdef FEAT_MBYTE if (has_mbyte) { - ptr = ml_get_buf(buf, pos->lnum, FALSE); + /* 'e' offset may put us just below the last line */ + if (pos->lnum > buf->b_ml.ml_line_count) + ptr = ""; + else + ptr = ml_get_buf(buf, pos->lnum, FALSE); pos->col -= (*mb_head_off)(ptr, ptr + pos->col); } #endif diff --git a/src/version.c b/src/version.c index cb266270c..587e05dd3 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 186, +/**/ 185, /**/ 184, |