comparison plugin/gutentags.vim @ 147:d566ec6cd2f7

Merge changes.
author Ludovic Chabant <ludovic@chabant.com>
date Sat, 26 Nov 2016 16:33:41 -0800
parents 7bc4df0225d1 3459a2522a3b
children f915393ff68d
comparison
equal deleted inserted replaced
145:3f15dabaa9f4 147:d566ec6cd2f7
32 let g:gutentags_add_default_project_roots = get(g:, 'gutentags_add_default_project_roots', 1) 32 let g:gutentags_add_default_project_roots = get(g:, 'gutentags_add_default_project_roots', 1)
33 let g:gutentags_project_root = get(g:, 'gutentags_project_root', []) 33 let g:gutentags_project_root = get(g:, 'gutentags_project_root', [])
34 if g:gutentags_add_default_project_roots 34 if g:gutentags_add_default_project_roots
35 let g:gutentags_project_root += ['.git', '.hg', '.svn', '.bzr', '_darcs', '_FOSSIL_', '.fslckout'] 35 let g:gutentags_project_root += ['.git', '.hg', '.svn', '.bzr', '_darcs', '_FOSSIL_', '.fslckout']
36 endif 36 endif
37 let g:gutentags_project_root_finder = '' 37
38 let g:gutentags_project_root_finder = get(g:, 'gutentags_project_root_finder', '')
38 39
39 let g:gutentags_project_info = get(g:, 'gutentags_project_info', []) 40 let g:gutentags_project_info = get(g:, 'gutentags_project_info', [])
40 call add(g:gutentags_project_info, {'type': 'python', 'file': 'setup.py'}) 41 call add(g:gutentags_project_info, {'type': 'python', 'file': 'setup.py'})
41 call add(g:gutentags_project_info, {'type': 'ruby', 'file': 'Gemfile'}) 42 call add(g:gutentags_project_info, {'type': 'ruby', 'file': 'Gemfile'})
42 43