# HG changeset patch # User Meredith Howard # Date 1405759294 14400 # Node ID 10e0152bacce84c77b2f4aef1eeda305c21b6d2f # Parent 6fb9403f0c8002037adb08465a1a09aefed085a4# Parent 5941d66ecc4b1f53c380546f069efe7123a70c3b Merge from default diff --git a/.Xdefaults b/.Xdefaults --- a/.Xdefaults +++ b/.Xdefaults @@ -1,5 +1,5 @@ -URxvt.foreground: white +URxvt.foreground: #DFDFDF URxvt.background: #070707 URxvt.font: xft:monospace-10 diff --git a/.vimrc b/.vimrc --- a/.vimrc +++ b/.vimrc @@ -21,7 +21,8 @@ end if !filereadable(vundle_readme) if !executable('git') - echo "You probably want git installed and in PATH" + echo "You probably want git installed and in PATH." + echo " http://chocolatey.org " quit endif @@ -68,6 +69,7 @@ end Plugin 'Shougo/neocomplcache.vim' Plugin 'c9s/perlomni.vim' + Plugin 'rking/ag.vim' Plugin 'tpope/vim-fugitive' Plugin 'ludovicchabant/vim-lawrencium' @@ -77,6 +79,7 @@ end Plugin 'vim-ruby/vim-ruby' Plugin 'vim-perl/vim-perl' + if installed_vundle == 1 echo "Installing Plugins, please ignore key map error messages" echo "" @@ -165,6 +168,9 @@ else set wildignore+=.git\*,.hg\*,.svn\* endif +" Enable enhanced % matching in ruby +runtime macros/matchit.vim + " Don't assume to scan includes when autocompleting set cpt-=i @@ -279,7 +285,10 @@ endif ">> Tagbar if on_windows == 1 - let g:tagbar_ctags_bin = 'C:\Users\mhoward\bin\ctags.exe' + if executable('ctags') == 0 + " if i haven't installed from chocolatey... + let g:tagbar_ctags_bin = 'C:\Users\mhoward\bin\ctags.exe' + endif endif let g:tagbar_autoclose = 1