From 3b96f8ffeb6610d5747e36feabcbde85ec42d78e Mon Sep 17 00:00:00 2001
From: Christian Rondeau <christian.rondeau@gmail.com>
Date: Mon, 5 Dec 2016 18:17:38 -0500
Subject: [PATCH] Prevent imap of `<CR>` if already mapped

---
 ftplugin/vimwiki.vim | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index d3c4e95..1f96ec2 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -564,13 +564,14 @@ 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>
+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
-if maparg('<S-CR>', 'i') !~? '<Esc>:VimwikiReturn'
-  inoremap <silent><buffer> <S-CR> <Esc>:VimwikiReturn 2 2<CR>
-endif
-
 
 "Table mappings
  if g:vimwiki_table_mappings