summaryrefslogtreecommitdiffstats
path: root/runtime/doc/map.txt
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-29 23:05:20 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-29 23:05:20 +0200
commit14b6945e27ca175a42550a6a887874303313c19e (patch)
tree5f1d7c2d0c312149824e980142ebe698ffaee166 /runtime/doc/map.txt
parent10315b1201716a10d39477fc09e3eb89e944191f (diff)
Updated runtime files.
Diffstat (limited to 'runtime/doc/map.txt')
-rw-r--r--runtime/doc/map.txt15
1 files changed, 7 insertions, 8 deletions
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index c08ecd9512..b7abdba5fd 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt* For Vim version 7.3. Last change: 2013 Jun 12
+*map.txt* For Vim version 7.3. Last change: 2013 Jun 29
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -669,13 +669,12 @@ might want to set the 'ttimeout' option.
Buffer-local mappings (defined using |:map-<buffer>|) take precedence over
global mappings. When a buffer-local mapping is the same as a global mapping,
Vim will use the buffer-local mapping. In addition, Vim will use a complete
-buffer-local mapping immediately, even if a longer global mapping has the
-buffer-local mapping as a prefix. For example, given the following two
-mappings: >
- :map <buffer> \a :echo "Local \a"<CR>
- :map \abc :echo "Global \abc"<CR>
-The buffer-local mapping \a will be used immediately. Vim will not wait for
-more characters to see if the user might be typing \abc.
+mapping immediately if it was defined with <nowait>, even if a longer mapping
+has the same prefix. For example, given the following two mappings: >
+ :map <buffer> <nowait> \a :echo "Local \a"<CR>
+ :map \abc :echo "Global \abc"<CR>
+When typing \a the buffer-local mapping will be used immediately. Vim will
+not wait for more characters to see if the user might be typing \abc.
*map-keys-fails*
There are situations where key codes might not be recognized: