# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1480206821 28800
# Node ID d566ec6cd2f7791dfd6a2e2de357b57359adcda9
# Parent  3f15dabaa9f4bfc46d5d36d26546ee484597166a# Parent  3459a2522a3bc4fa885cf71e507476c31811ea9a
Merge changes.

diff -r 3f15dabaa9f4 -r d566ec6cd2f7 autoload/gutentags.vim
--- a/autoload/gutentags.vim	Sat Nov 26 16:28:43 2016 -0800
+++ b/autoload/gutentags.vim	Sat Nov 26 16:33:41 2016 -0800
@@ -104,7 +104,7 @@
 " Finds the first directory with a project marker by walking up from the given
 " file path.
 function! gutentags#get_project_root(path) abort
-    if g:gutentags_project_root_finder
+    if g:gutentags_project_root_finder != ''
         return call(g:gutentags_project_root_finder, [a:path])
     endif
 
diff -r 3f15dabaa9f4 -r d566ec6cd2f7 plugin/gutentags.vim
--- a/plugin/gutentags.vim	Sat Nov 26 16:28:43 2016 -0800
+++ b/plugin/gutentags.vim	Sat Nov 26 16:33:41 2016 -0800
@@ -34,7 +34,8 @@
 if g:gutentags_add_default_project_roots
     let g:gutentags_project_root += ['.git', '.hg', '.svn', '.bzr', '_darcs', '_FOSSIL_', '.fslckout']
 endif
-let g:gutentags_project_root_finder = ''
+
+let g:gutentags_project_root_finder = get(g:, 'gutentags_project_root_finder', '')
 
 let g:gutentags_project_info = get(g:, 'gutentags_project_info', [])
 call add(g:gutentags_project_info, {'type': 'python', 'file': 'setup.py'})