summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-07-08 21:46:56 +0200
committerBram Moolenaar <Bram@vim.org>2018-07-08 21:46:56 +0200
commitc229e54a69468722ca2449e807e90445b7479659 (patch)
treeb456c037af986e4e663c009ac48a836b31ebcdbf /src
parent875cf8789426cc258d85358ea2c86744a5a87b16 (diff)
patch 8.1.0172: 'viminfofile' option does not behave like a file namev8.1.0172
Problem: 'viminfofile' option does not behave like a file name. Solution: Add the P_EXPAND flag. (closes #3178)
Diffstat (limited to 'src')
-rw-r--r--src/option.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c
index 0cfc39c613..6d861837c4 100644
--- a/src/option.c
+++ b/src/option.c
@@ -2997,7 +2997,8 @@ static struct vimoption options[] =
{(char_u *)0L, (char_u *)0L}
#endif
SCRIPTID_INIT},
- {"viminfofile", "vif", P_STRING|P_ONECOMMA|P_NODUP|P_SECURE|P_VI_DEF,
+ {"viminfofile", "vif", P_STRING|P_EXPAND|P_ONECOMMA|P_NODUP
+ |P_SECURE|P_VI_DEF,
#ifdef FEAT_VIMINFO
(char_u *)&p_viminfofile, PV_NONE,
{(char_u *)"", (char_u *)0L}
diff --git a/src/version.c b/src/version.c
index 2821a1b966..40f3b46d02 100644
--- a/src/version.c
+++ b/src/version.c
@@ -790,6 +790,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 172,
+/**/
171,
/**/
170,