summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-06-07 19:53:10 +0200
committerBram Moolenaar <bram@vim.org>2013-06-07 19:53:10 +0200
commit9923bb6a36b9f152c486e102b2eaf20c8e1cb48f (patch)
treeebf4d5a593f6c9d41929dbb6739661c7ba9c0324
parent98255c0cebe017f59c7c37d48beeab6860b0bdbd (diff)
downloadvim-9923bb6a36b9f152c486e102b2eaf20c8e1cb48f.tar.gz
updated for version 7.3.1143v7.3.1143v7-3-1143
Problem: When mapping NUL it is displayed as an X. Solution: Check for KS_ZERO instead of K_ZERO. (Yasuhiro Matsumoto)
-rw-r--r--src/message.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/message.c b/src/message.c
index b574df63..8330ef73 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1577,7 +1577,7 @@ str2special(sp, from)
{
c = TO_SPECIAL(str[1], str[2]);
str += 2;
- if (c == K_ZERO) /* display <Nul> as ^@ */
+ if (c == KS_ZERO) /* display <Nul> as ^@ or <Nul> */
c = NUL;
}
if (IS_SPECIAL(c) || modifiers) /* special key */
diff --git a/src/version.c b/src/version.c
index b3c7be57..2d0e42fe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1143,
+/**/
1142,
/**/
1141,