diff options
Diffstat (limited to 'runtime/doc/options.txt')
-rw-r--r-- | runtime/doc/options.txt | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 1c162f73f3..171fff8547 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -5000,9 +5000,9 @@ A jump table for the options with a short description can be found at |Q_op|. has been used since the last search command. *shada-n* n Name of the shada file. The name must immediately follow - the 'n'. Must be at the end of the option! If the "-i" - argument was given when starting Vim, that file name overrides - the one given here with 'shada'. Environment variables are + the 'n'. Must be at the end of the option! If the + 'shadafile' option is set, that file name overrides the one + given here with 'shada'. Environment variables are expanded when opening the file, not when setting the option. *shada-r* r Removable media. The argument is a string (up to the next @@ -5044,6 +5044,14 @@ A jump table for the options with a short description can be found at |Q_op|. This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. + *'shadafile'* *'sdf'* +'shadafile' 'vif' 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. + This option can be set with the |-i| command line flag. The |--clean| + command line flag sets it to "NONE". + *'shell'* *'sh'* *E91* 'shell' 'sh' string (default $SHELL or "sh", Windows: "cmd.exe") @@ -5822,7 +5830,7 @@ A jump table for the options with a short description can be found at |Q_op|. Watch out for errors in expressions. They may render Vim unusable! If you are stuck, hold down ':' or 'Q' to get a prompt, then quit and - edit your vimrc or whatever with "vim -u NONE" to get it right. + edit your vimrc or whatever with "vim --clean" to get it right. Examples: Emulate standard status line with 'ruler' set > |