Fixed taggatron_enabled issue highlighted by @perrin4869

joonty · Feb 23, 2014 · 571678f · 571678f
1 parent 02f12f1
commit 571678f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/autoload/taggatron.vim b/autoload/taggatron.vim
@@ -4,15 +4,6 @@ if exists("g:loaded_taggatron") || &cp
 endif
 let g:loaded_taggatron= 1
 
-" Initialise script default values
-let s:taggatron_enabled = 1
-let s:tagcommands = {}
-let s:tagcommands_entry = {
-            \ "cmd": "ctags-exuberant",
-            \ "args": "",
-            \ "filesappend": "**"
-            \ }
-
 ""
 " Check command options and initialise tag creation.
 "
@@ -77,13 +68,13 @@ endfunction
 function! taggatron#CreateTags(cmdset, forceCreate)
     call taggatron#debug('Creating tags for file type ' . &filetype)
     call taggatron#debug('Argument: ' . string(a:cmdset))
-    call taggatron#debug('Default: ' . string(s:tagcommands_entry))
+    call taggatron#debug('Default: ' . string(taggatron#get('tagcommand_defaults')))
 
     " Initialise local support variables
     let l:cmdset = {}
 
     " Build up a set of command line options
-    call extend(l:cmdset, s:tagcommands_entry)
+    call extend(l:cmdset, taggatron#get('tagcommand_defaults'))
     call extend(l:cmdset, a:cmdset)
 
     " Updated tag file and exit early

diff --git a/plugin/taggatron.vim b/plugin/taggatron.vim
@@ -1,6 +1,13 @@
 " Initialise script default values
+let s:taggatron_enabled = 1
 let s:taggatron_verbose = 0
 let s:tagdefaults = ''
+let s:tagcommands = {}
+let s:tagcommand_defaults = {
+            \ "cmd": "ctags-exuberant",
+            \ "args": "",
+            \ "filesappend": "**"
+            \ }
 
 " Function Declarations
 " =====================
@@ -74,8 +81,8 @@ endfunction
 "
 function! taggatron#get(option, ...)
     for l:scope in ['b', 'g', 'l', 's']
-        if exists(l:scope . ':'. a:option)
-            return eval(l:scope . ':'. a:option)
+        if exists(l:scope . ':' . a:option)
+            return eval(l:scope . ':' . a:option)
         endif
     endfor
 
@@ -119,7 +126,7 @@ endfunction
 " ===============
 
 " Initialise taggatron auto-commands
-autocmd! BufNew,BufRead * call taggatron#SetTags(taggatron#get('tagdefaults', []))
+autocmd! BufNew,BufRead * call taggatron#SetTags(taggatron#get('tagdefaults'))
 autocmd! BufWritePost * call taggatron#CheckCommandList(0)
 
 " Initialise taggatron commands