aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-02 05:04:20 -04:00
Code Activity

patch 8.1.1001: Visual area not correct when using 'cursorline'

Browse Source 
Problem:    Visual area not correct when using 'cursorline'.
Solution:   Update w_last_cursorline also in Visual mode. (Hirohito Higashi,
            closes #4086)
This commit is contained in:
Bram Moolenaar
2019-03-09 11:46:15 +01:00
parent fd731b0e31
commit 8156ed3755
4 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/screen.c
View File

@@ -3704,14 +3704,16 @@ win_line(
#endif
#ifdef FEAT_SYN_HL
/* Cursor line highlighting for 'cursorline' in the current window. Not
* when Visual mode is active, because it's not clear what is selected
* then. */
if (wp->w_p_cul && lnum == wp->w_cursor.lnum
&& !(wp == curwin && VIsual_active))
// Cursor line highlighting for 'cursorline' in the current window.
if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
{
line_attr = HL_ATTR(HLF_CUL);
area_highlighting = TRUE;
// Do not show the cursor line when Visual mode is active, because it's
// not clear what is selected then. Do update w_last_cursorline.
if (!(wp == curwin && VIsual_active))
{
line_attr = HL_ATTR(HLF_CUL);
area_highlighting = TRUE;
}
wp->w_last_cursorline = wp->w_cursor.lnum;
}
#endif

12
src/testdir/dumps/Test_cursorline_with_visualmode_01.dump Normal file
View File

@@ -0,0 +1,12 @@
|a+0&#e0e0e08|b|c| | +0&#ffffff0@70
|a+0&#e0e0e08|b|c| | +0&#ffffff0@70
|a+0&#e0e0e08|b|c| | +0&#ffffff0@70
|a+0&#e0e0e08|b|c| | +0&#ffffff0@70
|a+0&#e0e0e08|b|c| | +0&#ffffff0@70
>a|b+0&#e0e0e08|c| | +0&#ffffff0@70
|a|b|c| @71
|a|b|c| @71
|a|b|c| @71
|a|b|c| @71
|a|b|c| @71
|-+2&&@1| |V|I|S|U|A|L| |L|I|N|E| |-@1| +0&&@29|1|2| @7|1|2|,|1| @9|1|5|%|

20
src/testdir/test_highlight.vim
View File

@@ -552,3 +552,23 @@ func Test_cursorline_after_yank()
call StopVimInTerminal(buf)
call delete('Xtest_cursorline_yank')
endfunc
func Test_cursorline_with_visualmode()
if !CanRunVimInTerminal()
return
endif
call writefile([
\ 'set cul',
\ 'call setline(1, repeat(["abc"], 50))',
\ ], 'Xtest_cursorline_with_visualmode')
let buf = RunVimInTerminal('-S Xtest_cursorline_with_visualmode', {'rows': 12})
call term_wait(buf)
call term_sendkeys(buf, "V\<C-f>kkkjk")
call VerifyScreenDump(buf, 'Test_cursorline_with_visualmode_01', {})
" clean up
call StopVimInTerminal(buf)
call delete('Xtest_cursorline_with_visualmode')
endfunc

2
src/version.c
View File

@@ -779,6 +779,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1001,
/**/
1000,
/**/