thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.655

Browse Source 
Problem:    Text deleted by "dit" depends on indent of closing tag.
            (Jan Parthey)
Solution:   Do not adjust oap->end in do_pending_operator(). (Christian
            Brabandt)
This commit is contained in:
Bram Moolenaar
2015-03-05 19:57:49 +01:00
parent a245bc79b4
commit b6c2735c56
5 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/search.c
View File

@@ -1063,7 +1063,7 @@ first_submatch(rp)
* Careful: If spats[0].off.line == TRUE and spats[0].off.off == 0 this
* makes the movement linewise without moving the match position.
*
* return 0 for failure, 1 for found, 2 for found and line offset added
* Return 0 for failure, 1 for found, 2 for found and line offset added.
*/
int
do_search(oap, dirc, pat, count, options, tm)
@@ -3781,6 +3781,7 @@ current_tagblock(oap, count_arg, include)
int do_include = include;
int save_p_ws = p_ws;
int retval = FAIL;
int is_inclusive = TRUE;
p_ws = FALSE;
@@ -3895,8 +3896,15 @@ again:
}
else
{
/* Exclude the '<' of the end tag. */
if (*ml_get_cursor() == '<')
char_u *c = ml_get_cursor();
/* Exclude the '<' of the end tag.
* If the closing tag is on new line, do not decrement cursor, but
* make operation exclusive, so that the linefeed will be selected */
if (*c == '<' && !VIsual_active && curwin->w_cursor.col == 0)
/* do not decrement cursor */
is_inclusive = FALSE;
else if (*c == '<')
dec_cursor();
}
end_pos = curwin->w_cursor;
@@ -3950,7 +3958,7 @@ again:
oap->inclusive = FALSE;
}
else
oap->inclusive = TRUE;
oap->inclusive = is_inclusive;
}
retval = OK;