summaryrefslogtreecommitdiff
path: root/src/option.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-07-15 19:39:43 +0200
committerBram Moolenaar <Bram@vim.org>2017-07-15 19:39:43 +0200
commitc4da113ef98dcfd6f2a088b1693c0317dcb5bf42 (patch)
treebde8ae5c94f11e87cd89fed4e0c94416b830fedf /src/option.c
parenta92522fbf3a49d06e08caf010f7d7b0f58d2e131 (diff)
downloadvim-c4da113ef98dcfd6f2a088b1693c0317dcb5bf42.zip
patch 8.0.0716: not easy to start Vim cleanly
Problem: Not easy to start Vim cleanly without changing the viminfo file. Not possible to know whether the -i command line flag was used. Solution: Add the --clean command line argument. Add the 'viminfofile' option. Add "-u DEFAULTS".
Diffstat (limited to 'src/option.c')
-rw-r--r--src/option.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c
index 39aef6eda..8e91fae74 100644
--- a/src/option.c
+++ b/src/option.c
@@ -2986,6 +2986,15 @@ 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,
+#ifdef FEAT_VIMINFO
+ (char_u *)&p_viminfofile, PV_NONE,
+ {(char_u *)"", (char_u *)0L}
+#else
+ (char_u *)NULL, PV_NONE,
+ {(char_u *)0L, (char_u *)0L}
+#endif
+ SCRIPTID_INIT},
{"virtualedit", "ve", P_STRING|P_ONECOMMA|P_NODUP|P_VI_DEF
|P_VIM|P_CURSWANT,
#ifdef FEAT_VIRTUALEDIT