diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-09-09 18:45:49 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-09-09 18:45:49 +0200 |
| commit | 58da707d2412f60eb5c0e158ade48dd8a13c96ed (patch) | |
| tree | 1caf35a481fc7427ca8cf78c8cdc3c9b5906db9a /src | |
| parent | 834def3872425b04aa0f52f868d056e60e614516 (diff) | |
| download | vim-git-58da707d2412f60eb5c0e158ade48dd8a13c96ed.tar.gz | |
updated for version 7.4.441v7.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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_getln.c | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 6ca707e43..8ebcc889c 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -759,11 +759,14 @@ getcmdline(firstc, count, indent) #ifdef FEAT_CMDWIN 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; + } } # ifdef FEAT_DIGRAPHS else diff --git a/src/version.c b/src/version.c index 2a86184d9..5d512a3cd 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 441, +/**/ 440, /**/ 439, |