From 58da707d2412f60eb5c0e158ade48dd8a13c96ed Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 9 Sep 2014 18:45:49 +0200 Subject: updated for version 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) --- src/ex_getln.c | 13 ++++++++----- src/version.c | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src') 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 @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 441, /**/ 440, /**/ -- cgit v1.2.3