aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.1.2108: cannot close the cmdline window from CmdWinEnter

Browse Source 
Problem:    Cannot close the cmdline window from CmdWinEnter. (George Brown)
Solution:   Reset cmdwin_result earlier. (Christian Brabandt, closes #4980)
This commit is contained in:
Bram Moolenaar
2019-10-01 17:39:04 +02:00
parent 8617348e21
commit 23324a0b35
3 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ex_getln.c
View File

@@ -136,11 +136,11 @@ restore_viewstate(viewstate_T *vs)
// Struct to store the state of 'incsearch' highlighting.
typedef struct {
pos_T search_start; // where 'incsearch' starts searching
pos_T save_cursor;
pos_T save_cursor;
viewstate_T init_viewstate;
viewstate_T old_viewstate;
pos_T match_start;
pos_T match_end;
pos_T match_start;
pos_T match_end;
int did_incsearch;
int incsearch_postponed;
int magic_save;
@@ -4152,12 +4152,15 @@ open_cmdwin(void)
invalidate_botline();
redraw_later(SOME_VALID);
/* No Ex mode here! */
// No Ex mode here!
exmode_active = 0;
State = NORMAL;
setmouse();
// Reset here so it can be set by a CmdWinEnter autocommand.
cmdwin_result = 0;
// Trigger CmdwinEnter autocommands.
trigger_cmd_autocmd(cmdwin_type, EVENT_CMDWINENTER);
if (restart_edit != 0) // autocmd with ":startinsert"
@@ -4169,7 +4172,6 @@ open_cmdwin(void)
/*
* Call the main loop until <CR> or CTRL-C is typed.
*/
cmdwin_result = 0;
main_loop(TRUE, FALSE);
RedrawingDisabled = i;