aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"

Browse Source 
Problem:    Typing CTRL-W in a prompt buffer shows mode "-- --".
Solution:   Set restart_edit to 'A' and check for it.
This commit is contained in:
Bram Moolenaar
2018-06-17 16:23:34 +02:00
parent d595a1910c
commit 942b4541a2
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/edit.c
View File

@@ -1179,7 +1179,7 @@ doESCkey:
// In a prompt window CTRL-W is used for window commands. // In a prompt window CTRL-W is used for window commands.
// Use Shift-CTRL-W to delete a word. // Use Shift-CTRL-W to delete a word.
stuffcharReadbuff(Ctrl_W); stuffcharReadbuff(Ctrl_W);
restart_edit = 'i'; restart_edit = 'A';
nomove = TRUE; nomove = TRUE;
count = 0; count = 0;
goto doESCkey; goto doESCkey;

4
src/screen.c
View File

@@ -10263,7 +10263,7 @@ showmode(void)
do_mode = ((p_smd && msg_silent == 0) do_mode = ((p_smd && msg_silent == 0)
&& ((State & INSERT) && ((State & INSERT)
|| restart_edit || restart_edit != NUL
|| VIsual_active)); || VIsual_active));
if (do_mode || reg_recording != 0) if (do_mode || reg_recording != 0)
{ {
@@ -10370,7 +10370,7 @@ showmode(void)
#endif #endif
MSG_PUTS_ATTR(_(" INSERT"), attr); MSG_PUTS_ATTR(_(" INSERT"), attr);
} }
else if (restart_edit == 'I') else if (restart_edit == 'I' || restart_edit == 'A')
MSG_PUTS_ATTR(_(" (insert)"), attr); MSG_PUTS_ATTR(_(" (insert)"), attr);
else if (restart_edit == 'R') else if (restart_edit == 'R')
MSG_PUTS_ATTR(_(" (replace)"), attr); MSG_PUTS_ATTR(_(" (replace)"), attr);

2
src/version.c
View File

@@ -761,6 +761,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 */
/**/
64,
/**/ /**/
63, 63,
/**/ /**/

2
src/window.c
View File

@@ -2114,6 +2114,8 @@ leaving_window(win_T *win)
// When leaving a prompt window stop Insert mode and perhaps restart // When leaving a prompt window stop Insert mode and perhaps restart
// it when entering that window again. // it when entering that window again.
win->w_buffer->b_prompt_insert = restart_edit; win->w_buffer->b_prompt_insert = restart_edit;
if (restart_edit != 0 && mode_displayed)
clear_cmdline = TRUE; /* unshow mode later */
restart_edit = NUL; restart_edit = NUL;
// When leaving the window (or closing the window) was done from a // When leaving the window (or closing the window) was done from a