summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-01-26 20:15:46 +0000
committerBram Moolenaar <Bram@vim.org>2008-01-26 20:15:46 +0000
commit2a6f21144cc7c03300e7aa538e4d7f3822a68ae0 (patch)
tree200957b458f50cd094f38903c237636cdb163a87 /src
parentd4e20a781320576a77c44865599c8d77e61d1fc0 (diff)
updated for version 7.1-242v7.1.242
Diffstat (limited to 'src')
-rw-r--r--src/search.c6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/search.c b/src/search.c
index 4bbd3c33b3..1ad1df31f3 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3637,7 +3637,7 @@ current_block(oap, count, include, what, other)
oap->inclusive = FALSE;
if (sol)
incl(&curwin->w_cursor);
- else if (lt(start_pos, curwin->w_cursor))
+ else if (ltoreq(start_pos, curwin->w_cursor))
/* Include the character under the cursor. */
oap->inclusive = TRUE;
else
@@ -3754,6 +3754,10 @@ current_tagblock(oap, count_arg, include)
old_pos = curwin->w_cursor;
old_end = curwin->w_cursor; /* remember where we started */
old_start = old_end;
+#ifdef FEAT_VISUAL
+ if (!VIsual_active || *p_sel == 'e')
+#endif
+ decl(&old_end); /* old_end is inclusive */
/*
* If we start on "<aaa>" select that block.
diff --git a/src/version.c b/src/version.c
index b8e6a04a8c..7d703482ae 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 */
/**/
+ 242,
+/**/
241,
/**/
240,