Merge remote-tracking branch 'upstream/master'

[etc/vim.git] / ftplugin / markdown.vim

diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index 35c8a63ac5dc62412611e40159df0013627d876d..067643d22d551936dcd940bcb9c4592fa023d7ca 100644 (file)
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -581,13 +581,13 @@ endfunction
 if !exists('*s:EditUrlUnderCursor')
     function s:EditUrlUnderCursor()
         let l:url = s:Markdown_GetUrlForPosition(line('.'), col('.'))
-        let l:anchor = ''
         if l:url != ''
             if get(g:, 'vim_markdown_autowrite', 0)
                 write
             endif
+            let l:anchor = ''
             if get(g:, 'vim_markdown_follow_anchor', 0)
-                let l:parts = split(l:url, '#')
+                let l:parts = split(l:url, '#', 1)
                 if len(l:parts) == 2
                     let [l:url, l:anchor] = parts
                     let l:anchorexpr = get(g:, 'vim_markdown_anchorexpr', '')
@@ -598,10 +598,18 @@ if !exists('*s:EditUrlUnderCursor')
                     endif
                 endif
             endif
-            if get(g:, 'vim_markdown_no_extensions_in_markdown', 0)
-                let l:url = fnamemodify(expand('%:~'), ':p:h').'/'.l:url.'.md'
+            if l:url != ''
+                if get(g:, 'vim_markdown_no_extensions_in_markdown', 0)
+                    " use another file extension if preferred
+                    if exists('g:vim_markdown_auto_extension_ext')
+                        let l:url = '.'.g:vim_markdown_auto_extension_ext
+                    else
+                        let l:url = '.md'
+                    endif
+                endif
+                let l:url = fnamemodify(expand('%:h').'/'.l:url, ':.')
+                execute 'edit' l:url
             endif
-            execute 'edit' l:url
             if l:anchor != ''
                 silent! execute '/'.l:anchor
             endif