aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/starting.txt
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/doc/starting.txt')
-rw-r--r--runtime/doc/starting.txt18
1 files changed, 5 insertions, 13 deletions
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index d002a3a4ab..bceaea0d83 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -482,14 +482,6 @@ a slash. Thus "-R" means recovery and "-/R" readonly.
":rv" or ":wv" are used. See also |viminfo-file|.
{not in Vi}
- *-x*
--x Use encryption to read/write files. Will prompt for a key,
- which is then stored in the 'key' option. All writes will
- then use this key to encrypt the text. The '-x' argument is
- not needed when reading a file, because there is a check if
- the file that is being read has been encrypted, and Vim asks
- for a key automatically. |encryption|
-
*-X*
-X Do not try connecting to the X server to get the current
window title and copy/paste using the X clipboard. This
@@ -775,7 +767,7 @@ accordingly. Vim proceeds in this order:
a. If vim was started as |evim| or |eview| or with the |-y| argument, the
script $VIMRUNTIME/evim.vim will be loaded.
*system-vimrc*
- b. For Unix, MS-DOS, MS-Windows, VMS, Macintosh, RISC-OS and Amiga
+ b. For Unix, MS-DOS, MS-Windows, VMS, Macintosh, and Amiga,
the system vimrc file is read for initializations. The path of this
file is shown with the ":version" command. Mostly it's "$VIM/vimrc".
Note that this file is ALWAYS read in 'compatible' mode, since the
@@ -1143,10 +1135,10 @@ vimrc file.
These commands will write ":map" and ":set" commands to a file, in such a way
that when these commands are executed, the current key mappings and options
will be set to the same values. The options 'columns', 'endofline',
-'fileformat', 'key', 'lines', 'modified', 'scroll', 'term', 'ttyfast' and
-'ttymouse' are not included, because these are terminal or file dependent.
-Note that the options 'binary', 'paste' and 'readonly' are included, this
-might not always be what you want.
+'fileformat', 'lines', 'modified', 'scroll', 'term', 'ttyfast' and 'ttymouse'
+are not included, because these are terminal or file dependent. Note that the
+options 'binary', 'paste' and 'readonly' are included, this might not always
+be what you want.
When special keys are used in mappings, The 'cpoptions' option will be
temporarily set to its Vim default, to avoid the mappings to be