aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2016-11-16 06:52:19 -0500
committerGitHub <noreply@github.com>2016-11-16 06:52:19 -0500
commit108d54bbd455635fc29541eb4bae4b9f3318aafb (patch)
treed5d829f41de3c7d151f62910f00c81bad873e47b /runtime
parentc66ca17ca1a2f396252bc554198f9e73c7073385 (diff)
parent34317846d6fa9c2d3b23742abc455eafca0e92e4 (diff)
downloadrneovim-108d54bbd455635fc29541eb4bae4b9f3318aafb.tar.gz
rneovim-108d54bbd455635fc29541eb4bae4b9f3318aafb.tar.bz2
rneovim-108d54bbd455635fc29541eb4bae4b9f3318aafb.zip
Merge pull request #5600 from jamessan/vim-7.4.1640
vim-patch:7.4.1640,7.4.1647,7.4.1650,7.4.1664
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/eval.txt2
-rw-r--r--runtime/doc/options.txt2
-rw-r--r--runtime/doc/quickfix.txt4
3 files changed, 6 insertions, 2 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index eecf12c44e..64f58c5599 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -5069,7 +5069,7 @@ msgpackdump({list}) {Nvim} *msgpackdump()*
(dictionary with zero items is represented by 0x80 byte in
messagepack).
- Limitations: *E951* *E952* *E953*
+ Limitations: *E5004* *E5005*
1. |Funcref|s cannot be dumped.
2. Containers that reference themselves cannot be dumped.
3. Dictionary keys are always dumped as STR strings.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 1789f73aa9..9d8d1f84c8 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6512,7 +6512,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'ttyfast'* *'tf'* *'nottyfast'* *'notf'*
'ttyfast' 'tf' Removed. |vim-differences| {Nvim}
- *'undodir'* *'udir'* *E926*
+ *'undodir'* *'udir'* *E5003*
'undodir' 'udir' string (default "$XDG_DATA_HOME/nvim/undo")
global
{only when compiled with the |+persistent_undo| feature}
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 44d68c7b38..7c1fc30eba 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -53,6 +53,10 @@ command with 'l'.
If the current window was closed by an |autocommand| while processing a
location list command, it will be aborted.
+ *E925* *E926*
+If the current quickfix or location list was changed by an |autocommand| while
+processing a quickfix or location list command, it will be aborted.
+
*:cc*
:cc[!] [nr] Display error [nr]. If [nr] is omitted, the same
error is displayed again. Without [!] this doesn't