diff options
| author | Florian Walch <florian@fwalch.com> | 2014-12-23 11:20:55 +0100 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2014-12-23 16:13:30 +0100 |
| commit | 2b9f11ac64a04aa10b4bd2619dbd4dab8b9abbf9 (patch) | |
| tree | 7997bc2496efe15064159206546405bda27edb16 | |
| parent | 2fefb5e7d343f21cfc64f299b032a679fbd27ef9 (diff) | |
| download | rneovim-2b9f11ac64a04aa10b4bd2619dbd4dab8b9abbf9.tar.gz rneovim-2b9f11ac64a04aa10b4bd2619dbd4dab8b9abbf9.tar.bz2 rneovim-2b9f11ac64a04aa10b4bd2619dbd4dab8b9abbf9.zip | |
vim-patch:7.4.441
Problem: Endless loop and other problems when 'cedit' is set to CTRL-C.
Solution: Do not call ex_window() when ex_normal_busy or got_int was set.
(Yasuhiro Matsumoto)
https://code.google.com/p/vim/source/detail?r=v7-4-441
| -rw-r--r-- | src/nvim/ex_getln.c | 12 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index a19cb36d12..3ce8263457 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -627,11 +627,13 @@ getcmdline ( } if (c == cedit_key || c == K_CMDWIN) { - /* - * Open a window to edit the command line (and history). - */ - c = ex_window(); - some_key_typed = TRUE; + if (ex_normal_busy == 0 && got_int == FALSE) { + /* + * Open a window to edit the command line (and history). + */ + c = ex_window(); + some_key_typed = TRUE; + } } else c = do_digraph(c); diff --git a/src/nvim/version.c b/src/nvim/version.c index 030e1ba514..e75139eab1 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -296,7 +296,7 @@ static int included_patches[] = { 444, //443, 442, - //441, + 441, 440, 439, //438, |