summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/search.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/search.c b/src/search.c
index f38b62642..d12e4682d 100644
--- a/src/search.c
+++ b/src/search.c
@@ -814,7 +814,7 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum)
{
/* 'e' offset may put us just below the last line */
if (pos->lnum > buf->b_ml.ml_line_count)
- ptr = "";
+ ptr = (char_u *)"";
else
ptr = ml_get_buf(buf, pos->lnum, FALSE);
pos->col -= (*mb_head_off)(ptr, ptr + pos->col);
diff --git a/src/version.c b/src/version.c
index 92cd49b7a..5e84c6605 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 */
/**/
+ 188,
+/**/
187,
/**/
186,