aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-06-10 15:10:59 +0200
committerGitHub <noreply@github.com>2018-06-10 15:10:59 +0200
commitb8363283faac5e02cd9961119da7accb3d35d420 (patch)
tree7c7007656dd04dcc8b950c5fb00d98c2c060b39f /runtime
parent23d172a948e77c4e1d03db3b06efac6e9edd3695 (diff)
parentd8c7ff13352d7182826b5716ff3b6a66df241231 (diff)
downloadrneovim-b8363283faac5e02cd9961119da7accb3d35d420.tar.gz
rneovim-b8363283faac5e02cd9961119da7accb3d35d420.tar.bz2
rneovim-b8363283faac5e02cd9961119da7accb3d35d420.zip
Merge #7679 'startup: treat stdin as text instead of commands'
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/starting.txt11
-rw-r--r--runtime/doc/vim_diff.txt4
2 files changed, 5 insertions, 10 deletions
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index db3eb757c0..5ff9e0b5dc 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -22,8 +22,7 @@ More generally, Vim is started with:
Option arguments and file name arguments can be mixed, and any number of them
can be given. However, watch out for options that take an argument.
-Exactly one out of the following five items may be used to choose how to
-start editing:
+The following items may be used to choose how to start editing:
*-file* *---*
filename One or more file names. The first one will be the current
@@ -34,7 +33,6 @@ filename One or more file names. The first one will be the current
nvim -- -filename
< All arguments after the "--" will be interpreted as file names,
no other options or "+command" argument can follow.
- For behavior of quotes on MS-Windows, see |win32-quotes|.
*--*
- This argument can mean two things, depending on whether Ex
@@ -104,13 +102,6 @@ argument.
(Only available when compiled with the |+startuptime|
feature).
- *--literal*
---literal Take file names literally, don't expand wildcards. Not needed
- for Unix, because Vim always takes file names literally (the
- shell expands wildcards).
- Applies to all the names, also the ones that come before this
- argument.
-
*-+*
+[num] The cursor will be positioned on line "num" for the first
file being edited. If "num" is missing, the cursor will be
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 04d78da45a..ceae8eba8c 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -440,6 +440,10 @@ Other compile-time features:
Emacs tags support
X11 integration (see |x11-selection|)
+Startup:
+ --literal (file args are always literal; to expand wildcards on Windows, use
+ |:n| e.g. `nvim +"n *"`)
+
Nvim does not have a built-in GUI and hence the following aliases have been
removed: gvim, gex, gview, rgvim, rgview