From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 17 Feb 2015 10:11:48 +0000 (+0100)
Subject: updated for version 7.4.631
X-Git-Tag: v7.4.631
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a427106954857c6f84c0b0dc07725e302a433c6;p=thirdparty%2Fvim.git

updated for version 7.4.631
Problem:    The default conceal character is documented to be a space but it's
            initially a dash. (Christian Brabandt)
Solution:   Make the intial value a space.
---

diff --git a/src/globals.h b/src/globals.h
index 474f74fc41..759c51016e 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -1167,7 +1167,7 @@ EXTERN int	lcs_tab1 INIT(= NUL);
 EXTERN int	lcs_tab2 INIT(= NUL);
 EXTERN int	lcs_trail INIT(= NUL);
 #ifdef FEAT_CONCEAL
-EXTERN int	lcs_conceal INIT(= '-');
+EXTERN int	lcs_conceal INIT(= ' ');
 #endif
 
 #if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) \
diff --git a/src/version.c b/src/version.c
index 4fb12302cb..03507f61cd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    631,
 /**/
     630,
 /**/