Allow overwriting insert mode maps (#1030)
According to `:h hasmapto()` if we don't pass the mode as an argument then only normal, visual and operator-pending modes are checked. Lets pass the mode explicitly to allow overwriting insert mode mappings.
This commit is contained in:
committed by
GitHub
parent
ea4a5e3bb2
commit
527ca1b7a1
@@ -212,7 +212,7 @@ endfunc
|
|||||||
function! vimwiki#u#map_key(mode, key, plug, ...) abort
|
function! vimwiki#u#map_key(mode, key, plug, ...) abort
|
||||||
if a:0 && a:1 == 2
|
if a:0 && a:1 == 2
|
||||||
" global mappings
|
" global mappings
|
||||||
if !hasmapto(a:plug) && maparg(a:key, a:mode) ==# ''
|
if !hasmapto(a:plug, a:mode) && maparg(a:key, a:mode) ==# ''
|
||||||
exe a:mode . 'map ' . a:key . ' ' . a:plug
|
exe a:mode . 'map ' . a:key . ' ' . a:plug
|
||||||
endif
|
endif
|
||||||
elseif a:0 && a:1 == 1
|
elseif a:0 && a:1 == 1
|
||||||
@@ -220,7 +220,7 @@ function! vimwiki#u#map_key(mode, key, plug, ...) abort
|
|||||||
exe a:mode . 'map <buffer> ' . a:key . ' ' . a:plug
|
exe a:mode . 'map <buffer> ' . a:key . ' ' . a:plug
|
||||||
else
|
else
|
||||||
" vimwiki buffer mappings
|
" vimwiki buffer mappings
|
||||||
if !hasmapto(a:plug)
|
if !hasmapto(a:plug, a:mode)
|
||||||
exe a:mode . 'map <buffer> ' . a:key . ' ' . a:plug
|
exe a:mode . 'map <buffer> ' . a:key . ' ' . a:plug
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -3900,6 +3900,7 @@ Fixed:~
|
|||||||
* PR #919: Fix duplicate helptag
|
* PR #919: Fix duplicate helptag
|
||||||
* PR #959: Fix :VimwikiNextTask
|
* PR #959: Fix :VimwikiNextTask
|
||||||
* PR #986: Fix typo in help file
|
* PR #986: Fix typo in help file
|
||||||
|
* PR #1030: Allow overwriting insert mode mappings
|
||||||
|
|
||||||
|
|
||||||
2.5 (2020-05-26)~
|
2.5 (2020-05-26)~
|
||||||
|
|||||||
Reference in New Issue
Block a user