aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-04-30 22:18:04 +0200
committerJustin M. Keyes <justinkz@gmail.com>2017-05-01 12:30:54 +0200
commit4fbcfab1276dd9d827ccf58954e0dc5bdbd4cf53 (patch)
treee6ba229794ed9db8a044527dacf0c6cb34e36365 /runtime/doc
parent940f35f66406a475344da8994d1d8746e2500ac6 (diff)
downloadrneovim-4fbcfab1276dd9d827ccf58954e0dc5bdbd4cf53.tar.gz
rneovim-4fbcfab1276dd9d827ccf58954e0dc5bdbd4cf53.tar.bz2
rneovim-4fbcfab1276dd9d827ccf58954e0dc5bdbd4cf53.zip
vim-patch:bc2eada5424b
Updated runtime files. https://github.com/vim/vim/commit/bc2eada5424bff06f7eb77c032ecc067da52b846 NA patches: vim-patch:294740d2ac42 vim-patch:a4ce25bd987a vim-patch:7034a8374345 vim-patch:14a612fa2e57 vim-patch:aaeabfbca571
Diffstat (limited to 'runtime/doc')
-rw-r--r--runtime/doc/cmdline.txt6
-rw-r--r--runtime/doc/message.txt5
-rw-r--r--runtime/doc/options.txt2
-rw-r--r--runtime/doc/quickref.txt2
-rw-r--r--runtime/doc/usr_22.txt2
5 files changed, 11 insertions, 6 deletions
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 3e041c3b62..80b6cbbeab 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1000,10 +1000,10 @@ There are several ways to leave the command-line window:
Insert and in Normal mode.
CTRL-C Continue in Command-line mode. The command-line under the
cursor is used as the command-line. Works both in Insert and
- in Normal mode. ":close" also works. There is no redraw,
- thus the window will remain visible.
+ in Normal mode. There is no redraw, thus the window will
+ remain visible.
:quit Discard the command line and go back to Normal mode.
- ":exit", ":xit" and CTRL-\ CTRL-N also work.
+ ":close", ":exit", ":xit" and CTRL-\ CTRL-N also work.
:qall Quit Vim, unless there are changes in some buffer.
:qall! Quit Vim, discarding changes to any buffer.
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index e619cfde30..e6bd6ae506 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -124,8 +124,9 @@ closed properly. Mostly harmless.
Command too recursive
This happens when an Ex command executes an Ex command that executes an Ex
-command, etc. This is only allowed 200 times. When it's more there probably
-is an endless loop. Probably a |:execute| or |:source| command is involved.
+command, etc. The limit is 200 or the value of 'maxfuncdepth', whatever is
+larger. When it's more there probably is an endless loop. Probably a
+|:execute| or |:source| command is involved.
*E254* >
Cannot allocate color {name}
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index d3683f5135..0492ba891d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3972,6 +3972,8 @@ A jump table for the options with a short description can be found at |Q_op|.
catches endless recursion. When using a recursive function with
more depth, set 'maxfuncdepth' to a bigger number. But this will use
more memory, there is the danger of failing when memory is exhausted.
+ Increasing this limit above 200 also changes the maximum for Ex
+ command resursion, see |E169|.
See also |:function|.
*'maxmapdepth'* *'mmd'* *E223*
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 420f570c99..75a47e55ce 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1027,6 +1027,8 @@ Short explanation of each option: *option-list*
|c_<Up>| <Up>/<Down> recall older/newer command-line that starts
with current command
|c_<S-Up>| <S-Up>/<S-Down> recall older/newer command-line from history
+|c_CTRL-G| CTRL-G next match when 'incsearch' is active
+|c_CTRL-T| CTRL-T previous match when 'incsearch' is active
|:history| :his[tory] show older command-lines
Context-sensitive completion on the command-line:
diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt
index 8d11be11b2..255211f668 100644
--- a/runtime/doc/usr_22.txt
+++ b/runtime/doc/usr_22.txt
@@ -93,7 +93,7 @@ browser. This is what you get: >
o................Browsing with a Horizontal Split...........|netrw-o|
p................Use Preview Window.........................|netrw-p|
P................Edit in Previous Window....................|netrw-p|
- q................Listing Bookmarks and History..............|netrw-q|
+ q................Listing Bookmarks and History..............|netrw-qb|
r................Reversing Sorting Order....................|netrw-r|
< (etc)