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

patch 8.1.2314: vi' sometimes does not select anything

Browse Source 
Problem:    vi' sometimes does not select anything.
Solution:   Recognize an empty selection. (Christian Brabandt, closes #5183)
This commit is contained in:
Bram Moolenaar
2019-11-17 17:32:28 +01:00
parent eda1da0c9a
commit 7170b295b0
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/search.c
View File

@@ -4434,9 +4434,10 @@ current_quote(
return FALSE; return FALSE;
vis_bef_curs = LT_POS(VIsual, curwin->w_cursor); vis_bef_curs = LT_POS(VIsual, curwin->w_cursor);
vis_empty = EQUAL_POS(VIsual, curwin->w_cursor);
if (*p_sel == 'e') if (*p_sel == 'e')
{ {
if (!vis_bef_curs) if (!vis_bef_curs && !vis_empty)
{ {
// VIsual needs to be the start of Visual selection. // VIsual needs to be the start of Visual selection.
pos_T t = curwin->w_cursor; pos_T t = curwin->w_cursor;
@@ -4447,8 +4448,8 @@ current_quote(
restore_vis_bef = TRUE; restore_vis_bef = TRUE;
} }
dec_cursor(); dec_cursor();
vis_empty = EQUAL_POS(VIsual, curwin->w_cursor);
} }
vis_empty = EQUAL_POS(VIsual, curwin->w_cursor);
} }
if (!vis_empty) if (!vis_empty)

3
src/testdir/test_textobjects.vim
View File

@@ -47,6 +47,9 @@ func Test_quote_selection_selection_exclusive()
set selection=exclusive set selection=exclusive
exe "norm! fdvhi'y" exe "norm! fdvhi'y"
call assert_equal('bcde', @") call assert_equal('bcde', @")
let @"='dummy'
exe "norm! $gevi'y"
call assert_equal('bcde', @")
set selection&vim set selection&vim
bw! bw!
endfunc endfunc

2
src/version.c
View File

@@ -741,6 +741,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 */
/**/
2314,
/**/ /**/
2313, 2313,
/**/ /**/