summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2011-12-23 13:15:03 +0100
committerBram Moolenaar <bram@vim.org>2011-12-23 13:15:03 +0100
commit788edeff744e59e7b8a4bacc49c7cd0684b8af3a (patch)
treecba5f5871331d4d98d79dd0443473076b4a2b81d
parentb400c6c73fd9aca58aa3421fb27524e2008145a4 (diff)
downloadvim-788edeff744e59e7b8a4bacc49c7cd0684b8af3a.tar.gz
updated for version 7.3.384v7.3.384v7-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)
-rw-r--r--src/edit.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/edit.c b/src/edit.c
index 0c28e061..daab0fee 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 4445c65f..e57a4cf7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 384,
+/**/
383,
/**/
382,