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
commit0b18a746bfa4d19106e3db0526ec578abe3e49fc (patch)
tree693ab77d8544b8f9116a1017c0e51daa53499eef
parentbb7b2bb91e351d5f1f76fbe250cadecd571f8ec0 (diff)
downloadvim-0b18a746bfa4d19106e3db0526ec578abe3e49fc.tar.gz
updated for version 7.4.631v7.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 474f74fc..759c5101 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 4fb12302..03507f61 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,