diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-04 21:53:10 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-04 21:53:10 -0400 |
| commit | 4ac5a0a924190484d7dcde34090f1d8e5bc46607 (patch) | |
| tree | fb18b56b5f12afc990209ec7d41076483015bb1a /src | |
| parent | a62cc5f807a6dc730c871c1fd53f29805a9cdc6e (diff) | |
| parent | fd3088b425b8c1f4f41eb715201e429ddd37af32 (diff) | |
| download | rneovim-4ac5a0a924190484d7dcde34090f1d8e5bc46607.tar.gz rneovim-4ac5a0a924190484d7dcde34090f1d8e5bc46607.tar.bz2 rneovim-4ac5a0a924190484d7dcde34090f1d8e5bc46607.zip | |
Merge pull request #4644 from KillTheMule/vim-7.4.882
vim-patch:7.4.882
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/edit.c | 6 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 2c240a0f59..e131da8fe0 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -3306,6 +3306,12 @@ static bool ins_compl_prep(int c) showmode(); } + // Avoid the popup menu remains displayed when leaving the + // command line window. + if (c == Ctrl_C && cmdwin_type != 0) { + update_screen(0); + } + /* * Indent now if a key was typed that is in 'cinkeys'. */ diff --git a/src/nvim/version.c b/src/nvim/version.c index fbc9854dc1..6f422b3223 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -796,7 +796,7 @@ static int included_patches[] = { 885, // 884 NA 883, - // 882, + 882, 881, // 880 NA 879, |