aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-04-26 21:38:12 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-04-27 09:21:35 -0400
commit278ca5f456508fe3f680b718174c4ba209e49822 (patch)
treedef10c27f18b92ecbc1fde94f6aaba20f813fdba /runtime/doc
parent4819737853fc3676b976be93bd0332a3e44ab837 (diff)
downloadrneovim-278ca5f456508fe3f680b718174c4ba209e49822.tar.gz
rneovim-278ca5f456508fe3f680b718174c4ba209e49822.tar.bz2
rneovim-278ca5f456508fe3f680b718174c4ba209e49822.zip
vim-patch:ebdf3c964a90
Update runtime files. https://github.com/vim/vim/commit/ebdf3c964a901fc00c9009689f7cfda478342c51 Omit vim9.
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/change.txt4
-rw-r--r--runtime/doc/options.txt1
-rw-r--r--runtime/doc/starting.txt9
-rw-r--r--runtime/doc/tabpage.txt2
4 files changed, 11 insertions, 5 deletions
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 9f889af6cc..0f2ffa487c 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -610,6 +610,8 @@ Directory for temporary files is created in the first suitable directory of:
|cmdline-ranges|.
See |:s_flags| for [flags].
+ The delimiter doesn't need to be /, see
+ |pattern-delimiter|.
:[range]s[ubstitute] [flags] [count]
:[range]&[&][flags] [count] *:&*
@@ -744,7 +746,7 @@ This deletes "TESTING" from all lines, but only one per line.
For compatibility with Vi these two exceptions are allowed:
"\/{string}/" and "\?{string}?" do the same as "//{string}/r".
"\&{string}&" does the same as "//{string}/".
- *E146*
+ *pattern-delimiter* *E146*
Instead of the '/' which surrounds the pattern and replacement string, you
can use any other single-byte character, but not an alphanumeric character,
'\', '"' or '|'. This is useful if you want to include a '/' in the search
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c90c31acf1..569fccc903 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1102,6 +1102,7 @@ A jump table for the options with a short description can be found at |Q_op|.
This option is used together with 'bufhidden' and 'swapfile' to
specify special kinds of buffers. See |special-buffers|.
+ Also see |win_gettype()|, which returns the type of the window.
Be careful with changing this option, it can have many side effects!
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index f604b7484b..f434519d4c 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -42,9 +42,12 @@ filename One or more file names. The first one will be the current
In most cases (except -s, -es, |--embed|, --headless) if stdin
is not a TTY then it is read as text, so "-" is implied: >
echo text | nvim file
-< The buffer will be marked modified, because it contains text
- that needs to be saved (except for readonly |-R| mode).
-
+< The buffer will be marked as modified, because it contains
+ text that needs to be saved (except for readonly |-R| mode).
+ If you don't like that, put these lines in your init.vim: >
+ " Don't set 'modified' when reading from stdin
+ au StdinReadPost * set nomodified
+<
To read stdin as Normal commands use |-s| with "-": >
echo "ifoo" | nvim -s -
< To read stdin as Ex commands use |-es| or |-e|: >
diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt
index 1407fdd968..7f91fda9f4 100644
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -129,7 +129,7 @@ something else.
:+tabclose " close the next tab page
:1tabclose " close the first tab page
:$tabclose " close the last tab page
- :tabclose -2 " close the two previous tab page
+ :tabclose -2 " close the 2nd previous tab page
:tabclose + " close the next tab page
:tabclose 3 " close the third tab page
:tabclose $ " close the last tab page