vimwiki

commit bb75ec6debffca00318bcb4753f2143a7f946694
parent 0966031234836c8807264071cccc1670d1be123d
Author: EinfachToll <istjanichtzufassen@googlemail.com>
Date:   Tue,  6 Dec 2016 08:42:28 +0100

Merge pull request #264 from christianrondeau/check-before-imap-cr

Prevent imap of `<CR>` if already mapped
Diffstat:
M
ftplugin/vimwiki.vim
 | 
13
+++++++------

1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
@@ -564,14 +564,15 @@ function! s:CR(normal, just_mrkr) "{{{
   call vimwiki#lst#kbd_cr(a:normal, a:just_mrkr)
 endfunction "}}}
 
-if maparg('<CR>', 'i') !~? '<Esc>:VimwikiReturn'
-  inoremap <silent><buffer> <CR> <Esc>:VimwikiReturn 1 5<CR>
-endif
-if maparg('<S-CR>', 'i') !~? '<Esc>:VimwikiReturn'
-  inoremap <silent><buffer> <S-CR> <Esc>:VimwikiReturn 2 2<CR>
+if !hasmapto('VimwikiReturn', 'i')
+  if maparg('<CR>', 'i') !~? '<Esc>:VimwikiReturn'
+    inoremap <silent><buffer> <CR> <Esc>:VimwikiReturn 1 5<CR>
+  endif
+  if maparg('<S-CR>', 'i') !~? '<Esc>:VimwikiReturn'
+    inoremap <silent><buffer> <S-CR> <Esc>:VimwikiReturn 2 2<CR>
+  endif
 endif
 
-
 "Table mappings
  if g:vimwiki_table_mappings
    inoremap <expr> <buffer> <Tab> vimwiki#tbl#kbd_tab()