Merge #10173 from janlazo/vim-8.0.1756

vim-patch:8.0.1756,8.1.1509
This commit is contained in:
Justin M. Keyes 2019-06-09 22:52:03 +02:00 committed by GitHub
commit 7612dd3f8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2503,18 +2503,24 @@ int prompt_for_number(int *mouse_used)
cmdline_row = 0;
save_State = State;
State = ASKMORE; // prevents a screen update when using a timer
// May show different mouse shape.
setmouse();
i = get_number(TRUE, mouse_used);
if (KeyTyped) {
/* don't call wait_return() now */
/* msg_putchar('\n'); */
cmdline_row = msg_row - 1;
need_wait_return = FALSE;
msg_didany = FALSE;
msg_didout = FALSE;
} else
// don't call wait_return() now
if (msg_row > 0) {
cmdline_row = msg_row - 1;
}
need_wait_return = false;
msg_didany = false;
msg_didout = false;
} else {
cmdline_row = save_cmdline_row;
}
State = save_State;
// May need to restore mouse shape.
setmouse();
return i;
}