summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-02-17 11:11:48 +0100
committerBram Moolenaar <Bram@vim.org>2015-02-17 11:11:48 +0100
commit4a427106954857c6f84c0b0dc07725e302a433c6 (patch)
treef592ca27476c4723ffa42d2b92cbdb97605641ce
parentc51b02d7d9c75c241eb6435d410422d0fa9147a1 (diff)
downloadvim-git-4a427106954857c6f84c0b0dc07725e302a433c6.tar.gz
updated for version 7.4.631v7.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.
-rw-r--r--src/globals.h2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/globals.h b/src/globals.h
index 474f74fc4..759c51016 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 4fb12302c..03507f61c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 631,
+/**/
630,
/**/
629,