diff options
| author | Felipe Morales <hel.sheep@gmail.com> | 2015-06-20 16:23:38 -0300 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-06-21 02:06:23 -0400 |
| commit | 721ffd6b65db1094b81e89aaa30ff57d10030829 (patch) | |
| tree | 1937164e121596013ea555835b56bb3a40376558 | |
| parent | 896328553061ce2f39d138747ee4b977bbc31298 (diff) | |
| download | rneovim-721ffd6b65db1094b81e89aaa30ff57d10030829.tar.gz rneovim-721ffd6b65db1094b81e89aaa30ff57d10030829.tar.bz2 rneovim-721ffd6b65db1094b81e89aaa30ff57d10030829.zip | |
defaults: prefix "!" to 'viminfo' by default #2870
Re: https://github.com/neovim/neovim/issues/2676
| -rw-r--r-- | runtime/doc/options.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 1 | ||||
| -rw-r--r-- | src/nvim/option.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 0808278657..388848ac4e 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -6897,8 +6897,8 @@ A jump table for the options with a short description can be found at |Q_op|. *'viminfo'* *'vi'* *E526* *E527* *E528* 'viminfo' 'vi' string (Vim default for - Win32: '100,<50,s10,h,rA:,rB: - others: '100,<50,s10,h + Win32: '!,100,<50,s10,h,rA:,rB: + others: '!,100,<50,s10,h Vi default: "") global {not available when compiled without the |+viminfo| diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 5ca6e128e6..80d687a2a1 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -45,6 +45,7 @@ these differences. - 'tabpagemax' defaults to 50 - 'tags' defaults to "./tags;,tags" - 'ttyfast' is always set +- 'viminfo' includes "!" - 'wildmenu' is set by default - 'wildmode' defaults to "list:longest,full" diff --git a/src/nvim/option.c b/src/nvim/option.c index 06995eede5..ab97b18cd6 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1587,7 +1587,7 @@ static vimoption_T SCRIPTID_INIT}, {"viminfo", "vi", P_STRING|P_COMMA|P_NODUP|P_SECURE, (char_u *)&p_viminfo, PV_NONE, - {(char_u *)"", (char_u *)"'100,<50,s10,h"} + {(char_u *)"", (char_u *)"!,'100,<50,s10,h"} SCRIPTID_INIT}, {"virtualedit", "ve", P_STRING|P_COMMA|P_NODUP|P_VI_DEF|P_VIM|P_CURSWANT, (char_u *)&p_ve, PV_NONE, |