From ec4066ad83785e52910d3deb6adda34d1d4d25ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Yngve=20Lerv=C3=A5g?= <karl.yngve+git@gmail.com>
Date: Wed, 17 Sep 2014 23:10:49 +0200
Subject: [PATCH] Solved some minor issues

---
 autoload/vimwiki/base.vim | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 38788d4..e50a333 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1724,18 +1724,20 @@ endfunction " }}}
 
 " s:normalize_link_in_diary
 function! s:normalize_link_in_diary(lnk) " {{{
-
-  " Check if link already exists or is a date
-  if filereadable(a:lnk . '.wiki') || a:lnk =~# '\d\d\d\d-\d\d-\d\d'
-    let sub = vimwiki#base#normalize_link_helper(a:lnk,
-          \ g:vimwiki_rxWord, '',
-          \ g:vimwiki_WikiLinkTemplate1)
+  let link_path = fnamemodify(a:lnk . VimwikiGet('ext'), ':p')
+  if filereadable(link_path) || a:lnk =~# '\d\d\d\d-\d\d-\d\d'
+    let rxUrl = g:vimwiki_rxWord
+    let rxDesc = ''
+    let template = g:vimwiki_WikiLinkTemplate1
   else
     let depth = len(split(VimwikiGet('diary_rel_path'), '/'))
-    let sub = '[[' . repeat('../', depth) . a:lnk . '|' . a:lnk . ']]'
+    let str = repeat('../', depth) . a:lnk . '¦¦' . a:lnk
+    let rxUrl = '^.*\ze¦¦'
+    let rxDesc = '¦¦\zs.*$'
+    let template = g:vimwiki_WikiLinkTemplate2
   endif
 
-  return sub
+  return vimwiki#base#normalize_link_helper(str, rxUrl, rxDesc, template)
 endfunction " }}}
 
 " s:normalize_link_syntax_n