diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-04-27 17:11:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-27 17:11:34 +0200 |
| commit | 920ec8181b2bf7547688ed877252a1f2127db198 (patch) | |
| tree | 7cc6cfd90454d42b7fd9ab1f988608a6db08f371 /runtime | |
| parent | e5b53381a27861578498dab3ab9ba7b989677787 (diff) | |
| parent | 698c4f662d3a30fab1e48dbe7586617a9031a6ea (diff) | |
| download | rneovim-920ec8181b2bf7547688ed877252a1f2127db198.tar.gz rneovim-920ec8181b2bf7547688ed877252a1f2127db198.tar.bz2 rneovim-920ec8181b2bf7547688ed877252a1f2127db198.zip | |
Merge #9915 'test: clear(): args_rm param'
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/options.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/starting.txt | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index e773d27394..aa33ade39d 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -5049,7 +5049,7 @@ A jump table for the options with a short description can be found at |Q_op|. security reasons. *'shadafile'* *'sdf'* -'shadafile' 'vif' string (default: "") +'shadafile' 'sdf' string (default: "") global When non-empty, overrides the file name used for |shada| (viminfo). When equal to "NONE" no shada file will be read or written. diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 771165c361..2a230d9449 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1081,15 +1081,16 @@ even if other entries (with known name/type/etc) are merged. |shada-merging| SHADA FILE NAME *shada-file-name* -- The default name of the ShaDa file is "$XDG_DATA_HOME/nvim/shada/main.shada" - for Unix. Default for $XDG_DATA_HOME is ~/.local/share. |base-directories| -- The 'n' flag in the 'shada' option can be used to specify another ShaDa - file name |'shada'|. -- The "-i" Vim argument can be used to set another file name, |-i|. When the - file name given is "NONE" (all uppercase), no ShaDa file is ever read or - written. Also not for the commands below! -- The 'viminfofile' option can be used like the "-i" argument. In fact, the - value form the "-i" argument is stored in the 'viminfofile' option. +- Default name of the |shada| file is: + Unix: "$XDG_DATA_HOME/nvim/shada/main.shada" + Windows: "$XDG_DATA_HOME/nvim-data/shada/main.shada" + See also |base-directories|. +- To choose a different file name you can use: + - The "n" flag in the 'shada' option. + - The |-i| startup argument. "NONE" means no shada file is ever read or + written. Also not for the commands below! + - The 'shadafile' option. The value from the "-i" argument (if any) is + stored in the 'shadafile' option. - For the commands below, another file name can be given, overriding the default and the name given with 'shada' or "-i" (unless it's NONE). |