From: codybuell Date: Wed, 17 Jan 2018 19:42:20 +0000 (-0500) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/da4f9691597928065d849fe9c0863ed3a756b52d?ds=sidebyside;hp=-c Merge remote-tracking branch 'upstream/master' --- da4f9691597928065d849fe9c0863ed3a756b52d diff --combined ftplugin/markdown.vim index 48fa89e,d7c3777..067643d --- a/ftplugin/markdown.vim +++ b/ftplugin/markdown.vim @@@ -578,28 -578,40 +578,45 @@@ endfunctio " We need a definition guard because we invoke 'edit' which will reload this " script while this function is running. We must not replace it. - if !exists("*s:EditUrlUnderCursor") - function s:EditUrlUnderCursor() - let l:url = s:Markdown_GetUrlForPosition(line('.'), col('.')) - if l:url != '' - if get(g:, 'vim_markdown_autowrite', 0) - write - endif - 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:ext = '.'.g:vim_markdown_auto_extension_ext - else - let l:ext = '.md' - endif - execute 'edit' fnameescape(fnamemodify(expand('%:~'), ':p:h').'/'.l:url.l:ext) - else - execute 'edit' fnameescape(l:url) - endif - else - echomsg 'The cursor is not on a link.' - endif - endfunction + if !exists('*s:EditUrlUnderCursor') + function s:EditUrlUnderCursor() + let l:url = s:Markdown_GetUrlForPosition(line('.'), col('.')) + 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, '#', 1) + if len(l:parts) == 2 + let [l:url, l:anchor] = parts + let l:anchorexpr = get(g:, 'vim_markdown_anchorexpr', '') + if l:anchorexpr != '' + let l:anchor = eval(substitute( + \ l:anchorexpr, 'v:anchor', + \ escape('"'.l:anchor.'"', '"'), '')) + endif + endif + endif + if l:url != '' + if get(g:, 'vim_markdown_no_extensions_in_markdown', 0) - let l:url .= '.md' ++ " 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 + if l:anchor != '' + silent! execute '/'.l:anchor + endif + else + echomsg 'The cursor is not on a link.' + endif + endfunction endif function! s:VersionAwareNetrwBrowseX(url)