summaryrefslogtreecommitdiff
path: root/src/eval.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-29 13:58:31 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-29 13:58:31 +0200
commit72179e1bd0bbb1d1c3083c85bd9fb0a8d6928f7f (patch)
tree8c591c38ab393b0c2967bf9037054b7420a7ddf5 /src/eval.c
parentb751546636c71f206733af1bc30415aaab9a0b42 (diff)
downloadvim-git-72179e1bd0bbb1d1c3083c85bd9fb0a8d6928f7f.tar.gz
updated for version 7.3.1261v7.3.1261
Problem: A buffer-local language mapping from a keymap stops a global insert mode mapping from working. (Ron Aaron) Solution: Do not wait for more characters to be typed only when the mapping was defined with <nowait>.
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c
index 19b4479b6..5cac7b4ad 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -13735,6 +13735,7 @@ get_maparg(argvars, rettv, exact)
dict_add_nr_str(dict, "silent", mp->m_silent ? 1L : 0L, NULL);
dict_add_nr_str(dict, "sid", (long)mp->m_script_ID, NULL);
dict_add_nr_str(dict, "buffer", (long)buffer_local, NULL);
+ dict_add_nr_str(dict, "nowait", mp->m_nowait ? 1L : 0L, NULL);
dict_add_nr_str(dict, "mode", 0L, mapmode);
vim_free(lhs);