]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.193 v7.3.193
authorBram Moolenaar <Bram@vim.org>
Thu, 19 May 2011 12:50:54 +0000 (14:50 +0200)
committerBram Moolenaar <Bram@vim.org>
Thu, 19 May 2011 12:50:54 +0000 (14:50 +0200)
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)

src/ex_docmd.c
src/ex_getln.c
src/version.c

index 49aadd3581c09e2594b73190c4c435aaf524f676..1598d893e32d5fe535324968b2283e8d5571ff5c 100644 (file)
@@ -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()
index ed45f5716f7c20cfb02f39ed975a3db08fe797da..6dc5c35010e414bf94a49d5e0c2a001492ceb152 100644 (file)
@@ -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)
index 94f1a95d6f58f2228cdf74c14ef48ad9a8e0a1ce..1bd1858448119e925bfd58c453e7881eb52a88a6 100644 (file)
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    193,
 /**/
     192,
 /**/