mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
patch 8.1.0290: "cit" on an empty HTML tag changes the whole tag
Problem: "cit" on an empty HTML tag changes the whole tag. Solution: Only adjust the area in Visual mode. (Andy Massimino, closes #3332)
This commit is contained in:
@@ -4106,9 +4106,10 @@ again:
|
|||||||
}
|
}
|
||||||
curwin->w_cursor = end_pos;
|
curwin->w_cursor = end_pos;
|
||||||
|
|
||||||
/* If we now have the same text as before reset "do_include" and try
|
// If we are in Visual mode and now have the same text as before set
|
||||||
* again. */
|
// "do_include" and try again.
|
||||||
if (EQUAL_POS(start_pos, old_start) && EQUAL_POS(end_pos, old_end))
|
if (VIsual_active && EQUAL_POS(start_pos, old_start)
|
||||||
|
&& EQUAL_POS(end_pos, old_end))
|
||||||
{
|
{
|
||||||
do_include = TRUE;
|
do_include = TRUE;
|
||||||
curwin->w_cursor = old_start;
|
curwin->w_cursor = old_start;
|
||||||
|
@@ -121,6 +121,23 @@ func Test_string_html_objects()
|
|||||||
enew!
|
enew!
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_empty_html_tag()
|
||||||
|
new
|
||||||
|
call setline(1, '<div></div>')
|
||||||
|
normal 0citxxx
|
||||||
|
call assert_equal('<div>xxx</div>', getline(1))
|
||||||
|
|
||||||
|
call setline(1, '<div></div>')
|
||||||
|
normal 0f<cityyy
|
||||||
|
call assert_equal('<div>yyy</div>', getline(1))
|
||||||
|
|
||||||
|
call setline(1, '<div></div>')
|
||||||
|
normal 0f<vitsaaa
|
||||||
|
call assert_equal('aaa', getline(1))
|
||||||
|
|
||||||
|
bwipe!
|
||||||
|
endfunc
|
||||||
|
|
||||||
" Tests for match() and matchstr()
|
" Tests for match() and matchstr()
|
||||||
func Test_match()
|
func Test_match()
|
||||||
call assert_equal("b", matchstr("abcd", ".", 0, 2))
|
call assert_equal("b", matchstr("abcd", ".", 0, 2))
|
||||||
|
@@ -794,6 +794,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
290,
|
||||||
/**/
|
/**/
|
||||||
289,
|
289,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user