aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--autoload/xolox/easytags.vim44
1 files changed, 21 insertions, 23 deletions
diff --git a/autoload/xolox/easytags.vim b/autoload/xolox/easytags.vim
index c528533..23f6288 100644
--- a/autoload/xolox/easytags.vim
+++ b/autoload/xolox/easytags.vim
@@ -1,9 +1,9 @@
" Vim script
" Author: Peter Odding <peter@peterodding.com>
-" Last Change: August 8, 2014
+" Last Change: September 14, 2014
" URL: http://peterodding.com/code/vim/easytags/
-let g:xolox#easytags#version = '3.6.6'
+let g:xolox#easytags#version = '3.6.7'
let g:xolox#easytags#default_pattern_prefix = '\C\<'
let g:xolox#easytags#default_pattern_suffix = '\>'
@@ -192,9 +192,7 @@ function! xolox#easytags#update(silent, filter_tags, filenames) " {{{2
if async
call xolox#misc#async#call({'function': 'xolox#easytags#update#with_vim', 'arguments': [params], 'callback': 'xolox#easytags#async_callback'})
else
- if !(exists('g:easytags_suppress_report') && g:easytags_suppress_report)
- call s:report_results(xolox#easytags#update#with_vim(params), 0)
- endif
+ call s:report_results(xolox#easytags#update#with_vim(params), 0)
" When :UpdateTags was executed manually we'll refresh the dynamic
" syntax highlighting so that new tags are immediately visible.
if !a:silent && xolox#misc#option#get('easytags_auto_highlight', 1)
@@ -502,12 +500,10 @@ function! xolox#easytags#syntax_groups_to_ignore() " {{{2
endfunction
function! xolox#easytags#async_callback(response) " {{{2
- if !(exists('g:easytags_suppress_report') && g:easytags_suppress_report)
- if has_key(a:response, 'result')
- call s:report_results(a:response['result'], 1)
- else
- call xolox#misc#msg#warn("easytags.vim %s: Asynchronous tags file update failed! (%s at %s)", g:xolox#easytags#version, a:response['exception'], a:response['throwpoint'])
- endif
+ if has_key(a:response, 'result')
+ call s:report_results(a:response['result'], 1)
+ else
+ call xolox#misc#msg#warn("easytags.vim %s: Asynchronous tags file update failed! (%s at %s)", g:xolox#easytags#version, a:response['exception'], a:response['throwpoint'])
endif
endfunction
@@ -556,18 +552,20 @@ endfunction
" Miscellaneous script-local functions. {{{1
function! s:report_results(response, async) " {{{2
- let actions = []
- if a:response['num_updated'] > 0
- call add(actions, printf('updated %i tags', a:response['num_updated']))
- endif
- if a:response['num_filtered'] > 0
- call add(actions, printf('filtered %i invalid tags', a:response['num_filtered']))
- endif
- if !empty(actions)
- let function = a:async ? 'xolox#misc#msg#debug' : 'xolox#misc#msg#info'
- let actions_string = xolox#misc#str#ucfirst(join(actions, ' and '))
- let command_type = a:async ? 'asynchronously' : 'synchronously'
- call call(function, ["easytags.vim %s: %s in %s (%s).", g:xolox#easytags#version, actions_string, a:response['elapsed_time'], command_type])
+ if !xolox#misc#option#get('easytags_suppress_report', 0)
+ let actions = []
+ if a:response['num_updated'] > 0
+ call add(actions, printf('updated %i tags', a:response['num_updated']))
+ endif
+ if a:response['num_filtered'] > 0
+ call add(actions, printf('filtered %i invalid tags', a:response['num_filtered']))
+ endif
+ if !empty(actions)
+ let function = a:async ? 'xolox#misc#msg#debug' : 'xolox#misc#msg#info'
+ let actions_string = xolox#misc#str#ucfirst(join(actions, ' and '))
+ let command_type = a:async ? 'asynchronously' : 'synchronously'
+ call call(function, ["easytags.vim %s: %s in %s (%s).", g:xolox#easytags#version, actions_string, a:response['elapsed_time'], command_type])
+ endif
endif
endfunction