vimwiki

commit e34e160a34a18f41b0e65ee91d3a9f37f9ccd6f7
parent 3d3586417df361f1a37b15970f9c90e1f2e59536
Author: EinfachToll <istjanichtzufassen@googlemail.com>
Date:   Wed,  4 Feb 2015 14:36:23 +0100

Merge pull request #104 from t7ko/autoload-fix

Don't source base.vim at Vim startup
Diffstat:
M
autoload/vimwiki/base.vim
 | 
25
+++----------------------
M
plugin/vimwiki.vim
 | 
19
++++++++++++++++++-

2 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
@@ -8,26 +8,8 @@ if exists("g:loaded_vimwiki_auto") || &cp
 endif
 let g:loaded_vimwiki_auto = 1
 
-" MISC helper functions {{{
-
-function! vimwiki#base#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 " }}}
-
-function! vimwiki#base#get_known_syntaxes() " {{{
+" s:vimwiki_get_known_syntaxes
+function! s:vimwiki_get_known_syntaxes() " {{{
   " Getting all syntaxes that different wikis could have
   let syntaxes = {}
   let syntaxes['default'] = 1
@@ -42,7 +24,6 @@ function! vimwiki#base#get_known_syntaxes() " {{{
   endfor
   return keys(syntaxes)
 endfunction " }}}
-" }}}
 
 " vimwiki#base#apply_wiki_options
 function! vimwiki#base#apply_wiki_options(options) " {{{ Update the current
@@ -1940,7 +1921,7 @@ endfunction " }}}
 
 " -------------------------------------------------------------------------
 " Load syntax-specific Wiki functionality
-for s:syn in vimwiki#base#get_known_syntaxes()
+for s:syn in s:vimwiki_get_known_syntaxes()
   execute 'runtime! autoload/vimwiki/'.s:syn.'_base.vim'
 endfor 
 " -------------------------------------------------------------------------
diff --git a/plugin/vimwiki.vim b/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()'