diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-06-26 18:38:13 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-06-26 18:38:13 +0200 |
| commit | 00672e1d3f59dbff91a18d418b2984be96f89ee5 (patch) | |
| tree | 4d5102a1b35281b145fcd6f34f210e01f86e5725 /src/edit.c | |
| parent | 04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15 (diff) | |
| download | vim-git-00672e1d3f59dbff91a18d418b2984be96f89ee5.tar.gz | |
patch 7.4.1961v7.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)
Diffstat (limited to 'src/edit.c')
| -rw-r--r-- | src/edit.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/edit.c b/src/edit.c index 0ba2627ca..234e03dff 100644 --- a/src/edit.c +++ b/src/edit.c @@ -649,7 +649,11 @@ edit( if (update_Insstart_orig) Insstart_orig = Insstart; - if (stop_insert_mode) + if (stop_insert_mode +#ifdef FEAT_INS_EXPAND + && !pum_visible() +#endif + ) { /* ":stopinsert" used or 'insertmode' reset */ count = 0; |