updated for version 7.1-005
diff --git a/src/search.c b/src/search.c
index d73f3b9..ff9eb6a 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3600,13 +3600,16 @@
{
oap->start = start_pos;
oap->motion_type = MCHAR;
+ oap->inclusive = FALSE;
if (sol)
- {
incl(&curwin->w_cursor);
- oap->inclusive = FALSE;
- }
- else
+ else if (lt(start_pos, curwin->w_cursor))
+ /* Include the character under the cursor. */
oap->inclusive = TRUE;
+ else
+ /* End is before the start (no text in between <>, [], etc.): don't
+ * operate on any text. */
+ curwin->w_cursor = start_pos;
}
return OK;
@@ -3734,7 +3737,7 @@
if (in_html_tag(FALSE))
{
- /* cursor on start tag, move to just after it */
+ /* cursor on start tag, move to its '>' */
while (*ml_get_cursor() != '>')
if (inc_cursor() < 0)
break;
@@ -3838,7 +3841,7 @@
/* Exclude the start tag. */
curwin->w_cursor = start_pos;
while (inc_cursor() >= 0)
- if (*ml_get_cursor() == '>' && lt(curwin->w_cursor, end_pos))
+ if (*ml_get_cursor() == '>')
{
inc_cursor();
start_pos = curwin->w_cursor;
@@ -3860,7 +3863,11 @@
#ifdef FEAT_VISUAL
if (VIsual_active)
{
- if (*p_sel == 'e')
+ /* If the end is before the start there is no text between tags, select
+ * the char under the cursor. */
+ if (lt(end_pos, start_pos))
+ curwin->w_cursor = start_pos;
+ else if (*p_sel == 'e')
++curwin->w_cursor.col;
VIsual = start_pos;
VIsual_mode = 'v';
@@ -3872,7 +3879,15 @@
{
oap->start = start_pos;
oap->motion_type = MCHAR;
- oap->inclusive = TRUE;
+ if (lt(end_pos, start_pos))
+ {
+ /* End is before the start: there is no text between tags; operate
+ * on an empty area. */
+ curwin->w_cursor = start_pos;
+ oap->inclusive = FALSE;
+ }
+ else
+ oap->inclusive = TRUE;
}
retval = OK;
diff --git a/src/version.c b/src/version.c
index f11baf2..8338450 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5,
+/**/
4,
/**/
3,