summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-18 21:09:02 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-18 21:09:02 +0200
commit86ec6d7e1e037e839879a5c05c2ee77db27fb557 (patch)
treeb7a1b280a1d6ffd110a11b6741b5062b1959f0cc
parent137c14bb4f18198ed38659dcfbdfd749115c7ab5 (diff)
downloadvim-git-8.1.1185.tar.gz
patch 8.1.1185: mapping for CTRL-X is inconsistentv8.1.1185
Problem: Mapping for CTRL-X is inconsistent. Solution: Map CTRL-X to "*d also for the MS-Windows console. (Ken Takata, closes #4265)
-rw-r--r--src/getchar.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/getchar.c b/src/getchar.c
index 4011db148..b8c7b3f3a 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -5269,7 +5269,7 @@ static struct initmap
{(char_u *)"\316\325 \"*y", VIS_SEL}, /* CTRL-Insert is "*y */
{(char_u *)"\316\327 \"*d", VIS_SEL}, /* SHIFT-Del is "*d */
{(char_u *)"\316\330 \"*d", VIS_SEL}, /* CTRL-Del is "*d */
- {(char_u *)"\030 \"-d", VIS_SEL}, /* CTRL-X is "-d */
+ {(char_u *)"\030 \"*d", VIS_SEL}, /* CTRL-X is "*d */
# else
{(char_u *)"\316\324 P", NORMAL}, /* SHIFT-Insert is P */
{(char_u *)"\316\324 \"-dP", VIS_SEL}, /* SHIFT-Insert is "-dP */
diff --git a/src/version.c b/src/version.c
index 308beed57..b08b22c10 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1185,
+/**/
1184,
/**/
1183,