From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 23 Dec 2011 12:15:03 +0000 (+0100)
Subject: updated for version 7.3.384
X-Git-Tag: v7.3.384
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbd9fd7353187ab888d5cd222b11662fa3d26de0;p=thirdparty%2Fvim.git

updated for version 7.3.384
Problem:    Mapping CTRL-K in Insert mode breaks CTRL-X CTRL-K for dictionary
            completion.
Solution:   Add CTRL-K to the list of recognized keys. (James McCoy)
---

diff --git a/src/edit.c b/src/edit.c
index 0c28e0619a..daab0fee7f 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -2183,7 +2183,7 @@ vim_is_ctrl_x_key(c)
 		    || c == Ctrl_I || c == Ctrl_D || c == Ctrl_P
 		    || c == Ctrl_N || c == Ctrl_T || c == Ctrl_V
 		    || c == Ctrl_Q || c == Ctrl_U || c == Ctrl_O
-		    || c == Ctrl_S || c == 's');
+		    || c == Ctrl_S || c == Ctrl_K || c == 's');
 	case CTRL_X_SCROLL:
 	    return (c == Ctrl_Y || c == Ctrl_E);
 	case CTRL_X_WHOLE_LINE:
diff --git a/src/version.c b/src/version.c
index 4445c65fee..e57a4cf766 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    384,
 /**/
     383,
 /**/