changeset 2839:e1c5f69de95b v7.3.193

updated for version 7.3.193 Problem: In the command line window ":close" doesn't work properly. (Tony Mechelynck) Solution: Use Ctrl_C instead of K_IGNORE for cmdwin_result. (Jean-Rene David)
author Bram Moolenaar <bram@vim.org>
date Thu, 19 May 2011 14:50:54 +0200
parents 649348be4bc7
children 59a62e01469a
files src/ex_docmd.c src/ex_getln.c src/version.c
diffstat 3 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -6472,7 +6472,7 @@ ex_close(eap)
 {
 # ifdef FEAT_CMDWIN
     if (cmdwin_type != 0)
-	cmdwin_result = K_IGNORE;
+	cmdwin_result = Ctrl_C;
     else
 # endif
 	if (!text_locked()
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -6324,6 +6324,12 @@ ex_window()
 	    ccline.cmdbuff = vim_strsave((char_u *)"qa");
 	    cmdwin_result = CAR;
 	}
+	else if (cmdwin_result == Ctrl_C)
+	{
+	    /* :q or :close, don't execute any command
+	     * and don't modify the cmd window. */
+	    ccline.cmdbuff = NULL;
+	}
 	else
 	    ccline.cmdbuff = vim_strsave(ml_get_curline());
 	if (ccline.cmdbuff == NULL)
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    193,
+/**/
     192,
 /**/
     191,