From 675506815236e22b02b7528ff91bd19df730c50d Mon Sep 17 00:00:00 2001
From: Rane Brown <rane.brown@gmail.com>
Date: Thu, 23 May 2019 21:22:29 -0600
Subject: [PATCH] Fix #415, expand iabbrev entries on <CR>.

---
 doc/vimwiki.txt      | 1 +
 ftplugin/vimwiki.vim | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index a4f0712..577f9ef 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -3520,6 +3520,7 @@ Removed:~
       point.
 
 Fixed:~
+    * Issue #415: Expand iabbrev entries on <CR>.
     * Issue #619: allow escaped characters in markdown links.
     * Issue #240: Fix regex pattern for markdown '[]()' links
     * Issue #685: Error message for invalid user options fixed.
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 619e762..2ae77e1 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -438,8 +438,14 @@ nnoremap <silent><buffer> <Plug>VimwikiListo
     \ :<C-U>call vimwiki#lst#kbd_o()<CR>
 nnoremap <silent><buffer> <Plug>VimwikiListO
     \ :<C-U>call vimwiki#lst#kbd_O()<CR>
-inoremap <silent><buffer> <Plug>VimwikiReturn15
+if has('patch-7.3.489')
+  " expand iabbrev on enter
+  inoremap <silent><buffer> <Plug>VimwikiReturn15
+      \ <C-]><Esc>:VimwikiReturn 1 5<CR>
+else
+  inoremap <silent><buffer> <Plug>VimwikiReturn15
     \ <Esc>:VimwikiReturn 1 5<CR>
+endif
 inoremap <silent><buffer> <Plug>VimwikiReturn22
     \ <Esc>:VimwikiReturn 2 2<CR>