Merge pull request #104 from t7ko/autoload-fix

Don't source base.vim at Vim startup

plugin/vimwiki.vim

@@ -357,6 +357,23 @@ function! VimwikiClear(option, ...) "{{{
 endfunction "}}}
 " }}}
 
+function! s:vimwiki_get_known_extensions() " {{{
+  " Getting all extensions that different wikis could have
+  let extensions = {}
+  for wiki in g:vimwiki_list
+    if has_key(wiki, 'ext')
+      let extensions[wiki.ext] = 1
+    else
+      let extensions['.wiki'] = 1
+    endif
+  endfor
+  " append map g:vimwiki_ext2syntax
+  for ext in keys(g:vimwiki_ext2syntax)
+    let extensions[ext] = 1
+  endfor
+  return keys(extensions)
+endfunction " }}}
+
 " }}}
 
 " CALLBACK functions "{{{
@@ -486,7 +503,7 @@ augroup end
 
 augroup vimwiki
   autocmd!
-  for s:ext in vimwiki#base#get_known_extensions()
+  for s:ext in s:vimwiki_get_known_extensions()
     exe 'autocmd BufEnter *'.s:ext.' call s:setup_buffer_reenter()'
     exe 'autocmd BufWinEnter *'.s:ext.' call s:setup_buffer_enter()'
     exe 'autocmd BufLeave,BufHidden *'.s:ext.' call s:setup_buffer_leave()'