Fix empty XDG_CONFIG_HOME confusing /vim directory

rafi · May 28, 2016 · b8d6544 · b8d6544
1 parent 8c37085
commit b8d6544
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/config/init.vim b/config/init.vim
@@ -31,7 +31,7 @@ endif
 
 " }}}
 " Respect XDG specification {{{
-if isdirectory($XDG_CONFIG_HOME.'/vim')
+if ! empty($XDG_CONFIG_HOME) && isdirectory($XDG_CONFIG_HOME.'/vim')
 	let $MYVIMRC=expand('$XDG_CONFIG_HOME/vim/config/vimrc')
 	if has('nvim')
 		" For Neovim, use .config/vim instead of .config/nvim

diff --git a/config/plugins/unite.vim b/config/plugins/unite.vim
@@ -5,7 +5,7 @@
 " External Tools {{{
 "
 " The silver searcher settings
-let g:my_ag_opts = get(g:, 'g:my_ag_opts', []) + [
+let g:my_ag_opts = get(g:, 'my_ag_opts', []) + [
 	\ '--vimgrep', '--smart-case', '--skip-vcs-ignores', '--hidden',
 	\ '--ignore', '.git', '--ignore', '.idea', '--ignore', '.stversions',
 	\ '--ignore', 'bower_modules', '--ignore', 'node_modules', '--ignore', '.tmp'

diff --git a/config/vimrc b/config/vimrc
@@ -11,7 +11,7 @@ if &compatible
 endif
 
 " Respect XDG
-if isdirectory($XDG_CONFIG_HOME.'/vim')
+if ! empty($XDG_CONFIG_HOME) && isdirectory($XDG_CONFIG_HOME.'/vim')
 	let $VIMPATH=expand('$XDG_CONFIG_HOME/vim')
 	let $VARPATH=expand('$XDG_CACHE_HOME/vim')
 else

diff --git a/filetype.vim b/filetype.vim
@@ -10,6 +10,7 @@ augroup filetypedetect " {{{
 
 	autocmd BufNewFile,BufRead */inventory/*        setf ansible
 	autocmd BufNewFile,BufRead */playbooks/*/*.yml  setf ansible
+
 	autocmd BufNewFile,BufRead *.j2                 setf jinja
 	autocmd BufNewFile,BufRead Tmuxfile,tmux/config setf tmux
 

diff --git a/ftplugin/vim.vim b/ftplugin/vim.vim
@@ -18,7 +18,7 @@ setlocal formatoptions-=o
 setlocal formatoptions-=r
 
 " For gf
-let &l:path = expand('$VIMPATH').','.join(map(split(&runtimepath, ','), 'v:val."/autoload"'), ',')
+let &l:path = join(map(split(&runtimepath, ','), 'v:val."/autoload"'), ',')
 setlocal suffixesadd=.vim
 setlocal includeexpr=fnamemodify(substitute(v:fname,'#','/','g'),':h')