aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/edit.c
diff options
context:
space:
mode:
authorJurica Bradaric <jbradaric@gmail.com>2016-08-27 21:24:46 +0200
committerJurica Bradaric <jbradaric@gmail.com>2016-09-25 21:29:12 +0200
commite74c2334f2bf7dccee337df20817b3351dbff3ec (patch)
tree544077ff8a32c1b43590a1fd39f6144d70a4c57d /src/nvim/edit.c
parent68bcb32ec43e2fab30dc05439fc77cf28793922c (diff)
downloadrneovim-e74c2334f2bf7dccee337df20817b3351dbff3ec.tar.gz
rneovim-e74c2334f2bf7dccee337df20817b3351dbff3ec.tar.bz2
rneovim-e74c2334f2bf7dccee337df20817b3351dbff3ec.zip
vim-patch:7.4.1961
Problem: When 'insertmode' is reset while doing completion the popup menu remains even though Vim is in Normal mode. Solution: Ignore stop_insert_mode when the popup menu is visible. Don't set stop_insert_mode when 'insertmode' was already off. (Christian Brabandt) https://github.com/vim/vim/commit/00672e1d3f59dbff91a18d418b2984be96f89ee5
Diffstat (limited to 'src/nvim/edit.c')
-rw-r--r--src/nvim/edit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 18d5ea533d..ca5b6f02ce 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -502,7 +502,7 @@ static int insert_check(VimState *state)
Insstart_orig = Insstart;
}
- if (stop_insert_mode) {
+ if (stop_insert_mode && !pum_visible()) {
// ":stopinsert" used or 'insertmode' reset
s->count = 0;
return 0; // exit insert mode