summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-06-13 16:34:54 +0200
committerBram Moolenaar <Bram@vim.org>2017-06-13 16:34:54 +0200
commit83064068eaabf75a7d235b0eec561dccbcb96b31 (patch)
tree37b11df49e061e5d1258eb3c430057d344bc7fd1
parent9a48961d8bd7ffea14330b9b0181a6cdbe9288f7 (diff)
downloadvim-git-83064068eaabf75a7d235b0eec561dccbcb96b31.tar.gz
patch 8.0.0640: mismatch between help and actual messagev8.0.0640
Problem: Mismatch between help and actual message for ":syn conceal". Solution: Change the message to match the help. (Ken Takata)
-rw-r--r--src/syntax.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/syntax.c b/src/syntax.c
index 10805f4e8..225853e4e 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3436,9 +3436,9 @@ syn_cmd_conceal(exarg_T *eap UNUSED, int syncing UNUSED)
if (*arg == NUL)
{
if (curwin->w_s->b_syn_conceal)
- MSG(_("syn conceal on"));
+ MSG(_("syntax conceal on"));
else
- MSG(_("syn conceal off"));
+ MSG(_("syntax conceal off"));
}
else if (STRNICMP(arg, "on", 2) == 0 && next - arg == 2)
curwin->w_s->b_syn_conceal = TRUE;
diff --git a/src/version.c b/src/version.c
index 13dff53fa..5d935feb6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 640,
+/**/
639,
/**/
638,