Move vim settings out of plugins to ensure they all get correctly loaded after everything else [Fix #373]

2013-10-21 16:10:40 -05:00
parent 65a3ec3219
commit 46946c9b8b
55 changed files with 15 additions and 8 deletions
--- a/vim/settings.vim
+++ b/vim/settings.vim
@@ -0,0 +1,4 @@
+
+for fpath in split(globpath('~/.vim/settings', '*.vim'), '\n')
+  exe 'source' fpath
+endfor
--- a/vim/plugin/settings/NERDtree-tabs.vim
+++ b/vim/plugin/settings/NERDtree-tabs.vim
--- a/vim/plugin/settings/NERDtree.vim
+++ b/vim/plugin/settings/NERDtree.vim
--- a/vim/plugin/settings/README.md
+++ b/vim/plugin/settings/README.md
--- a/vim/plugin/settings/abbr.vim
+++ b/vim/plugin/settings/abbr.vim
--- a/vim/plugin/settings/airline.vim
+++ b/vim/plugin/settings/airline.vim
--- a/vim/plugin/settings/autotag.vim
+++ b/vim/plugin/settings/autotag.vim
--- a/vim/plugin/settings/camelcasemotion.vim
+++ b/vim/plugin/settings/camelcasemotion.vim
--- a/vim/plugin/settings/conqueterm.vim
+++ b/vim/plugin/settings/conqueterm.vim
--- a/vim/plugin/settings/ctrlp.vim
+++ b/vim/plugin/settings/ctrlp.vim
--- a/vim/plugin/settings/easymotion.vim
+++ b/vim/plugin/settings/easymotion.vim
--- a/vim/plugin/settings/fugitive.vim
+++ b/vim/plugin/settings/fugitive.vim
--- a/vim/plugin/settings/gh-markdown.vim
+++ b/vim/plugin/settings/gh-markdown.vim
--- a/vim/plugin/settings/git-grep.vim
+++ b/vim/plugin/settings/git-grep.vim
--- a/vim/plugin/settings/gotofile.vim
+++ b/vim/plugin/settings/gotofile.vim
--- a/vim/plugin/settings/grep.vim
+++ b/vim/plugin/settings/grep.vim
--- a/vim/plugin/settings/gundo.vim
+++ b/vim/plugin/settings/gundo.vim
--- a/vim/plugin/settings/jquery.vim
+++ b/vim/plugin/settings/jquery.vim
--- a/vim/plugin/settings/lusty-juggler.vim
+++ b/vim/plugin/settings/lusty-juggler.vim
--- a/vim/plugin/settings/neocomplcache.vim
+++ b/vim/plugin/settings/neocomplcache.vim
--- a/vim/plugin/settings/next-textobject.vim
+++ b/vim/plugin/settings/next-textobject.vim
--- a/vim/plugin/settings/open-changed-files.vim
+++ b/vim/plugin/settings/open-changed-files.vim
--- a/vim/plugin/settings/outerblock.vim
+++ b/vim/plugin/settings/outerblock.vim
--- a/vim/plugin/settings/persistent-undo.vim
+++ b/vim/plugin/settings/persistent-undo.vim
--- a/vim/plugin/settings/powerline.vim
+++ b/vim/plugin/settings/powerline.vim
--- a/vim/plugin/settings/quickfix-search.vim
+++ b/vim/plugin/settings/quickfix-search.vim
--- a/vim/plugin/settings/rails.vim
+++ b/vim/plugin/settings/rails.vim
--- a/vim/plugin/settings/rspec.vim
+++ b/vim/plugin/settings/rspec.vim
--- a/vim/plugin/settings/showmarks.vim
+++ b/vim/plugin/settings/showmarks.vim
--- a/vim/plugin/settings/smart_jump_to_tag.vim
+++ b/vim/plugin/settings/smart_jump_to_tag.vim
--- a/vim/plugin/settings/solarized.vim
+++ b/vim/plugin/settings/solarized.vim
@@ -64,6 +64,5 @@ hi! Visual ctermbg=233
 hi! Type gui=bold
 hi! EasyMotionTarget guifg=#4CE660 gui=bold

-
-" Enforce the colors set here
-au VimEnter * so ~/.vim/plugin/settings/solarized.vim
+" Make sure this file loads itself on top of any other color settings
+au VimEnter * so ~/.vim/settings/solarized.vim
--- a/vim/plugin/settings/stop-visual-paste-insanity.vim
+++ b/vim/plugin/settings/stop-visual-paste-insanity.vim
--- a/vim/plugin/settings/surround.vim
+++ b/vim/plugin/settings/surround.vim
--- a/vim/plugin/settings/syntastic.vim
+++ b/vim/plugin/settings/syntastic.vim
--- a/vim/plugin/settings/tComment.vim
+++ b/vim/plugin/settings/tComment.vim
--- a/vim/plugin/settings/tagbar.vim
+++ b/vim/plugin/settings/tagbar.vim
--- a/vim/plugin/settings/tidy.vim
+++ b/vim/plugin/settings/tidy.vim
--- a/vim/plugin/settings/unimpaired.vim
+++ b/vim/plugin/settings/unimpaired.vim
--- a/vim/plugin/settings/vim-fugitive.vim
+++ b/vim/plugin/settings/vim-fugitive.vim
--- a/vim/plugin/settings/vim-indent-guides.vim
+++ b/vim/plugin/settings/vim-indent-guides.vim
--- a/vim/plugin/settings/vim-multiple-cursors.vim
+++ b/vim/plugin/settings/vim-multiple-cursors.vim
--- a/vim/plugin/settings/vim-ruby-conque.vim
+++ b/vim/plugin/settings/vim-ruby-conque.vim
--- a/vim/plugin/settings/vim-ruby-debugger.vim
+++ b/vim/plugin/settings/vim-ruby-debugger.vim
--- a/vim/plugin/settings/yadr-appearance.vim
+++ b/vim/plugin/settings/yadr-appearance.vim
--- a/vim/plugin/settings/yadr-append-semicolon.vim
+++ b/vim/plugin/settings/yadr-append-semicolon.vim
--- a/vim/plugin/settings/yadr-guioptions.vim
+++ b/vim/plugin/settings/yadr-guioptions.vim
--- a/vim/plugin/settings/yadr-keymap.vim
+++ b/vim/plugin/settings/yadr-keymap.vim
--- a/vim/plugin/settings/yadr-search.vim
+++ b/vim/plugin/settings/yadr-search.vim
--- a/vim/plugin/settings/yadr-sudo-write.vim
+++ b/vim/plugin/settings/yadr-sudo-write.vim
--- a/vim/plugin/settings/yadr-whitespace-killer.vim
+++ b/vim/plugin/settings/yadr-whitespace-killer.vim
--- a/vim/plugin/settings/yadr-window-killer.vim
+++ b/vim/plugin/settings/yadr-window-killer.vim
--- a/vim/plugin/settings/yadr-wrapping.vim
+++ b/vim/plugin/settings/yadr-wrapping.vim
--- a/vim/plugin/settings/yankring.vim
+++ b/vim/plugin/settings/yankring.vim