aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-03-02 01:24:38 -0500
committerJustin M. Keyes <justinkz@gmail.com>2016-03-02 01:24:38 -0500
commit56bfdd79346fd71fb0b587f8183c1cc3a0ddbae1 (patch)
tree28c7be449883276c7f3121e0af9ff85e9a7e4901 /runtime
parent36cb847d09afc840f9875b93d504650332b623c3 (diff)
parent0d6cd2b8087d9ae7fdb2b70fcc40ecaf378b0af7 (diff)
downloadrneovim-56bfdd79346fd71fb0b587f8183c1cc3a0ddbae1.tar.gz
rneovim-56bfdd79346fd71fb0b587f8183c1cc3a0ddbae1.tar.bz2
rneovim-56bfdd79346fd71fb0b587f8183c1cc3a0ddbae1.zip
Merge #4265 'vim-patch:7.4.925'.
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/options.txt1
-rw-r--r--runtime/doc/repeat.txt6
2 files changed, 7 insertions, 0 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index ced303947b..44696d10bb 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5538,6 +5538,7 @@ A jump table for the options with a short description can be found at |Q_op|.
c don't give |ins-completion-menu| messages. For example,
"-- XXX completion (YYY)", "match 1 of 2", "The only match",
"Pattern not found", "Back at original", etc.
+ q use "recording" instead of "recording @a"
This gives you the opportunity to avoid that a change between buffers
requires you to hit <Enter>, but still gives as useful a message as
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 21b5eef811..b2e935eb3f 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -109,6 +109,12 @@ q{0-9a-zA-Z"} Record typed characters into register {0-9a-zA-Z"}
while executing a register, and it doesn't work inside
a mapping and |:normal|.
+ Note: If the register being used for recording is also
+ used for |y| and |p| the result is most likely not
+ what is expected, because the put will paste the
+ recorded macro and the yank will overwrite the
+ recorded macro.
+
q Stops recording.
Implementation note: The 'q' that stops recording is
not stored in the register, unless it was the result