Skip to content

Commit

Permalink
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Browse files Browse the repository at this point in the history
Problem:    Typing CTRL-W in a prompt buffer shows mode "-- --".
Solution:   Set restart_edit to 'A' and check for it.
  • Loading branch information
brammool committed Jun 17, 2018
1 parent d595a19 commit 942b454
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/edit.c
Expand Up @@ -1179,7 +1179,7 @@ edit(
// In a prompt window CTRL-W is used for window commands.
// Use Shift-CTRL-W to delete a word.
stuffcharReadbuff(Ctrl_W);
restart_edit = 'i';
restart_edit = 'A';
nomove = TRUE;
count = 0;
goto doESCkey;
Expand Down
4 changes: 2 additions & 2 deletions src/screen.c
Expand Up @@ -10263,7 +10263,7 @@ showmode(void)

do_mode = ((p_smd && msg_silent == 0)
&& ((State & INSERT)
|| restart_edit
|| restart_edit != NUL
|| VIsual_active));
if (do_mode || reg_recording != 0)
{
Expand Down Expand Up @@ -10370,7 +10370,7 @@ showmode(void)
#endif
MSG_PUTS_ATTR(_(" INSERT"), attr);
}
else if (restart_edit == 'I')
else if (restart_edit == 'I' || restart_edit == 'A')
MSG_PUTS_ATTR(_(" (insert)"), attr);
else if (restart_edit == 'R')
MSG_PUTS_ATTR(_(" (replace)"), attr);
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -761,6 +761,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
64,
/**/
63,
/**/
Expand Down
2 changes: 2 additions & 0 deletions src/window.c
Expand Up @@ -2114,6 +2114,8 @@ leaving_window(win_T *win)
// When leaving a prompt window stop Insert mode and perhaps restart
// it when entering that window again.
win->w_buffer->b_prompt_insert = restart_edit;
if (restart_edit != 0 && mode_displayed)
clear_cmdline = TRUE; /* unshow mode later */
restart_edit = NUL;

// When leaving the window (or closing the window) was done from a
Expand Down

0 comments on commit 942b454

Please sign in to comment.