aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-06-09 22:52:03 +0200
committerGitHub <noreply@github.com>2019-06-09 22:52:03 +0200
commit7612dd3f8a47e25d421ce7605a165f504e5fa5a4 (patch)
tree536232341311af5853df7b42482deec3b57c1d79 /src
parent6c96c3b3f523bc6f65747d8ea45dc955d7fcef5a (diff)
parent84ba37fbcbb420b27c9e3fcd8db79d4857037a82 (diff)
downloadrneovim-7612dd3f8a47e25d421ce7605a165f504e5fa5a4.tar.gz
rneovim-7612dd3f8a47e25d421ce7605a165f504e5fa5a4.tar.bz2
rneovim-7612dd3f8a47e25d421ce7605a165f504e5fa5a4.zip
Merge #10173 from janlazo/vim-8.0.1756
vim-patch:8.0.1756,8.1.1509
Diffstat (limited to 'src')
-rw-r--r--src/nvim/misc1.c20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
index 45e03681eb..4e47311dda 100644
--- a/src/nvim/misc1.c
+++ b/src/nvim/misc1.c
@@ -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;
}