aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/quickref.txt
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/doc/quickref.txt')
-rw-r--r--runtime/doc/quickref.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index c42d98ba90..1b24efc4f9 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -838,6 +838,7 @@ Short explanation of each option: *option-list*
'selection' 'sel' what type of selection to use
'selectmode' 'slm' when to use Select mode instead of Visual mode
'sessionoptions' 'ssop' options for |:mksession|
+'shada' 'sd' use .shada file upon startup and exiting
'shell' 'sh' name of shell to use for external commands
'shellcmdflag' 'shcf' flag to shell to execute one command
'shellpipe' 'sp' string to put output of ":make" in error file
@@ -911,7 +912,6 @@ Short explanation of each option: *option-list*
'verbosefile' 'vfile' file to write messages in
'viewdir' 'vdir' directory where to store files with :mkview
'viewoptions' 'vop' specifies what to save for :mkview
-'viminfo' 'vi' use .viminfo file upon startup and exiting
'virtualedit' 've' when to use virtual editing
'visualbell' 'vb' use visual bell instead of beeping
'warn' warn for shell command when buffer was changed
@@ -1131,7 +1131,7 @@ Context-sensitive completion on the command-line:
|-w| -w {scriptout} write typed chars to file {scriptout} (append)
|-W| -W {scriptout} write typed chars to file {scriptout} (overwrite)
|-u| -u {vimrc} read inits from {vimrc} instead of other inits
-|-i| -i {viminfo} read info from {viminfo} instead of other files
+|-i| -i {shada} read info from {shada} instead of other files
|---| -- end of options, other arguments are file names
|--help| --help show list of arguments and exit
|--version| --version show version info and exit
@@ -1215,12 +1215,12 @@ Context-sensitive completion on the command-line:
------------------------------------------------------------------------------
*Q_ac* Automatic Commands
-|viminfo-file| read registers, marks, history at startup, save when exiting.
+|shada-file| read registers, marks, history at startup, save when exiting.
-|:rviminfo| :rv[iminfo] [file] read info from viminfo file [file]
-|:rviminfo| :rv[iminfo]! [file] idem, overwrite existing info
-|:wviminfo| :wv[iminfo] [file] add info to viminfo file [file]
-|:wviminfo| :wv[iminfo]! [file] write info to viminfo file [file]
+|:rshada| :rsh[ada] [file] read info from ShaDa file [file]
+|:rshada| :rsh[ada]! [file] idem, overwrite existing info
+|:wshada| :wsh[ada] [file] add info to ShaDa file [file]
+|:wshada| :wsh[ada]! [file] write info to ShaDa file [file]
|modeline| Automatic option setting when editing a file