Merge pull request #363 from smancill/buffer-local-autocommands

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

diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index 35c8a63ac5dc62412611e40159df0013627d876d..1aa3494fd9c5f8cf7426a777e61d8a562f0056f3 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('.'))
 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
         if l:url != ''
             if get(g:, 'vim_markdown_autowrite', 0)
                 write
             endif

+            let l:anchor = ''

             if get(g:, 'vim_markdown_follow_anchor', 0)
             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', '')
                 if len(l:parts) == 2
                     let [l:url, l:anchor] = parts
                     let l:anchorexpr = get(g:, 'vim_markdown_anchorexpr', '')


@@ -598,10 +598,19 @@ if !exists('*s:EditUrlUnderCursor')
                     endif
                 endif
             endif
                     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 != ''
+                let l:ext = ''
+                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
+                endif
+                let l:url = fnameescape(fnamemodify(expand('%:h').'/'.l:url.l:ext, ':.'))
+                execute 'edit' l:url

             endif
             endif

-            execute 'edit' l:url

             if l:anchor != ''
                 silent! execute '/'.l:anchor
             endif
             if l:anchor != ''
                 silent! execute '/'.l:anchor
             endif


@@ -755,10 +764,10 @@ function! s:MarkdownClearSyntaxVariables()
 endfunction
 
 augroup Mkd
 endfunction
 
 augroup Mkd

-    autocmd!
-    au BufWinEnter * call s:MarkdownRefreshSyntax(1)
-    au BufUnload * call s:MarkdownClearSyntaxVariables()
-    au BufWritePost * call s:MarkdownRefreshSyntax(0)
-    au InsertEnter,InsertLeave * call s:MarkdownRefreshSyntax(0)
-    au CursorHold,CursorHoldI * call s:MarkdownRefreshSyntax(0)
+    autocmd! * <buffer>
+    autocmd BufWinEnter <buffer> call s:MarkdownRefreshSyntax(1)
+    autocmd BufUnload <buffer> call s:MarkdownClearSyntaxVariables()
+    autocmd BufWritePost <buffer> call s:MarkdownRefreshSyntax(0)
+    autocmd InsertEnter,InsertLeave <buffer> call s:MarkdownRefreshSyntax(0)
+    autocmd CursorHold,CursorHoldI <buffer> call s:MarkdownRefreshSyntax(0)

 augroup END
 augroup END