aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-06 21:53:38 -04:00
Code

patch 9.0.2133: Cannot detect overstrike mode in Cmdline mode

Browse Source 
Problem:  Cannot detect overstrike mode in Cmdline mode
Solution: Make mode() return "cr" for overstrike

closes: #13569

Signed-off-by: Sam-programs <None>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Sam-programs 2023-11-27 22:22:51 +01:00 committed by Christian Brabandt
parent 5c23343770
commit d1c3ef1f47
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
7 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/builtin.txt
View File

@ -6413,7 +6413,9 @@ mode([expr]) Return a string that indicates the current mode.
Rvx Virtual Replace mode |i_CTRL-X| completion
c Command-line editing
ct Command-line editing via Terminal-Job mode
cr Command-line while in overstrike mode |c_<Insert>|
cv Vim Ex mode |gQ|
cvr Vim Ex while in overstrike mode |c_<Insert>|
ce Normal Ex mode |Q|
r Hit-enter prompt
rm The -- more -- prompt

7
src/ex_getln.c
View File

@ -2050,6 +2050,9 @@ getcmdline_int(
#ifdef CURSOR_SHAPE
ui_cursor_shape(); // may show different cursor shape
#endif
may_trigger_modechanged();
status_redraw_curbuf();
redraw_statuslines();
goto cmdline_not_changed;
case Ctrl_HAT:
@ -3169,8 +3172,6 @@ redraw:
return (char_u *)line_ga.ga_data;
}
# if defined(MCH_CURSOR_SHAPE) || defined(FEAT_GUI) \
|| defined(FEAT_MOUSESHAPE) || defined(PROTO)
/*
* Return TRUE if ccline.overstrike is on.
*/
@ -3180,6 +3181,8 @@ cmdline_overstrike(void)
return ccline.overstrike;
}
# if defined(MCH_CURSOR_SHAPE) || defined(FEAT_GUI) \
|| defined(FEAT_MOUSESHAPE) || defined(PROTO)
/*
* Return TRUE if the cursor is at the end of the cmdline.
*/

2
src/misc1.c
View File

@ -720,6 +720,8 @@ get_mode(char_u *buf)
buf[i++] = 'v';
else if (exmode_active == EXMODE_NORMAL)
buf[i++] = 'e';
if ((State & MODE_CMDLINE) && cmdline_overstrike())
buf[i++] = 'r';
}
else
{

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

@ -0,0 +1,12 @@
| +0&#ffffff0@74
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|c+3#0000000&| @73
|:+0&&> @73

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

@ -0,0 +1,12 @@
| +0&#ffffff0@74
|~+0#4040ff13&| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|~| @73
|c+3#0000000&|r| @72
|:+0&&> @73

16
src/testdir/test_functions.vim
View File

@ -916,8 +916,12 @@ func Test_mode()
call feedkeys(":echo \<C-R>=Save_mode()\<C-U>\<CR>", 'xt')
call assert_equal('c-c', g:current_modes)
call feedkeys(":\<insert>\<C-r>=Save_mode()\<CR>",'xt')
call assert_equal("c-cr", g:current_modes)
call feedkeys("gQecho \<C-R>=Save_mode()\<CR>\<CR>vi\<CR>", 'xt')
call assert_equal('c-cv', g:current_modes)
call feedkeys("gQ\<insert>\<C-r>=Save_mode()\<CR>",'xt')
call assert_equal("c-cvr", g:current_modes)
call feedkeys("Qcall Save_mode()\<CR>vi\<CR>", 'xt')
call assert_equal('c-ce', g:current_modes)
" How to test Ex mode?
@ -935,6 +939,18 @@ func Test_mode()
call assert_equal('n-niR', g:current_modes)
execute "normal! gR\<C-o>g@l\<Esc>"
call assert_equal('n-niV', g:current_modes)
" Test statusline updates for overstike mode
if CanRunVimInTerminal()
let buf = RunVimInTerminal('', {'rows': 12})
call term_sendkeys(buf, ":set laststatus=2 statusline=%!mode(1)\<CR>")
call term_sendkeys(buf, ":")
call TermWait(buf)
call VerifyScreenDump(buf, 'Test_mode_1', {})
call term_sendkeys(buf, "\<insert>")
call TermWait(buf)
call VerifyScreenDump(buf, 'Test_mode_2', {})
call StopVimInTerminal(buf)
endif
if has('terminal')
term

2
src/version.c
View File

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