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 067643d22d551936dcd940bcb9c4592fa023d7ca..1aa3494fd9c5f8cf7426a777e61d8a562f0056f3 100644 (file)
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -599,15 +599,16 @@ if !exists('*s:EditUrlUnderCursor')
                 endif
             endif
             if l:url != ''
                 endif
             endif
             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')
                 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
+                        let l:ext = '.'.g:vim_markdown_auto_extension_ext

                     else
                     else

-                        let l:url = '.md'
+                        let l:ext = '.md'

                     endif
                 endif
                     endif
                 endif

-                let l:url = fnamemodify(expand('%:h').'/'.l:url, ':.')
+                let l:url = fnameescape(fnamemodify(expand('%:h').'/'.l:url.l:ext, ':.'))

                 execute 'edit' l:url
             endif
             if l:anchor != ''
                 execute 'edit' l:url
             endif
             if l:anchor != ''


@@ -763,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