diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/deprecated.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 16 | ||||
| -rw-r--r-- | runtime/doc/starting.txt | 26 |
3 files changed, 30 insertions, 13 deletions
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt index 505ee2d7ba..9e74efabe0 100644 --- a/runtime/doc/deprecated.txt +++ b/runtime/doc/deprecated.txt @@ -62,6 +62,7 @@ Options ~ *'langnoremap'* Deprecated alias to 'nolangremap'. *'vi'* *'viminfo'* Deprecated alias to 'shada' option. +*'viminfofile'* Deprecated alias to 'shadafile' option. UI extensions~ *ui-wildmenu* Use `ext_cmdline` and `ext_popupmenu` instead. 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 > diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index fd6eeccb4a..a8ba64fda8 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -86,6 +86,11 @@ argument. |:version| command. See |info-message| about capturing the text. + *--clean* +--clean Equivalent to "-u NONE -i NONE": + - Skips initializations from files and environment variables. + - No 'shada' file is read or written. + *--noplugin* --noplugin Skip loading plugins. Resets the 'loadplugins' option. Note that the |-u| argument may also disable loading plugins: @@ -295,19 +300,21 @@ argument. *-u* *E282* -u {vimrc} The file {vimrc} is read for initializations. Most other - initializations are skipped; see |initialization|. This can - be used to start Vim in a special mode, with special + initializations are skipped; see |initialization|. + + This can be used to start Vim in a special mode, with special mappings and settings. A shell alias can be used to make this easy to use. For example: > alias vimc vim -u ~/.config/nvim/c_init.vim !* < Also consider using autocommands; see |autocommand|. - When {vimrc} is equal to "NONE" (all uppercase), all - initializations from files and environment variables are - skipped, including reading the |ginit.vim| file when the GUI - starts. Plugins and syntax highlighting are also skipped. - When {vimrc} is equal to "NORC" (all uppercase), this has the - same effect as "NONE", but plugins and syntax highlighting are - not skipped. + + When {vimrc} is "NONE" (all uppercase), all initializations + from files and environment variables are skipped. Plugins and + syntax highlighting are also skipped. + + When {vimrc} is "NORC" (all uppercase), this has the same + effect as "NONE", but plugins and syntax highlighting are not + skipped. *-i* -i {shada} The file {shada} is used instead of the default ShaDa @@ -482,6 +489,7 @@ accordingly. Vim proceeds in this order: Loading plugins won't be done when: - The 'loadplugins' option was reset in a vimrc file. - The |--noplugin| command line argument is used. + - The |--clean| command line argument is used. - The "-u NONE" command line argument is used |-u|. - When Vim was compiled without the |+eval| feature. Note that using "-c 'set noloadplugins'" doesn't work, because the |