# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1497365103 -7200
# Node ID 7c42cf66d5bed4712e0dde37588c7ad78dc1fc2d
# Parent  f38a60ea8c052c68bb4b58ab007a1e3568b87d81
patch 8.0.0640: mismatch between help and actual message

commit https://github.com/vim/vim/commit/83064068eaabf75a7d235b0eec561dccbcb96b31
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Jun 13 16:34:54 2017 +0200

    patch 8.0.0640: mismatch between help and actual message

    Problem:    Mismatch between help and actual message for ":syn conceal".
    Solution:   Change the message to match the help. (Ken Takata)

diff --git a/src/syntax.c b/src/syntax.c
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3436,9 +3436,9 @@ syn_cmd_conceal(exarg_T *eap UNUSED, int
     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
--- 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,