vimrc.before/after

Author: vitaly

Changelog

@@ -1,3 +1,8 @@
+* 2012-01-24
+  - .vimrc.before and .vimrc.after support
+  - removed .vim_local and .local.vim support
+	- reprecated .local-before and .local-after
+
 * 2012-12-25
   - 'switch' plugin
 

README.markdown

@@ -121,32 +121,31 @@ Check out the 'plugins.vim' and 'after/plugin/bindings.vim' files for more...
 
 For easy upgrades its preferable not to change the dotvim configuration files.
 Instead you can add your own local configuration into one of the local override
-files. There are several override files supported by dotvim:
+files. There are several override files supported by dotvim.
 
-Files loaded **before** the plugins:
+They are loaded in the following order:
 
-* `~/.vim_local` - deprecated
-* `~/.vim-before.vim`
+* base dotvim configuration (global, plugin configurations, bindings, macros)
+* `~/.local-before.vim` _[deprecated]_
+* `~/.vimrc.before`
+
+  Loaded **before** the plugins
 
   This is where you should pre-set various plugin flags, enable/disable options
-  etc. This is for things you would normally put into yoru vimrc file.
+  etc. This is for things you would normally put into your vimrc file.
 
-Files loaded **after** the plugins:
+* `~/.gvimrc.before` _[when GUI running]_
+* vim plugins
+* dotvim bindings and overrides (loaded from `~/.vim/after.vim`)
+* `.local-after.vim` _[deprecated]_
+* `.vimrc.after`
 
-* `~/.local.vim` - deprecated
-* `~/.local-after.vim`
+  Loaded **after** the plugins
 
   This is where you can override settings set by plugins that have no
-  customization options etc.
-
-Configuration files are loaded in the following order:
+  customization options.
 
-* dotvim configuration
-* .local-before.vim
-* plugins
-* dotvim bindings and overrides
-* .local.vim
-* .local-after.vim
+* `.gvimrc.after` _[when GUI running]_
 
 <a name=backups>
 #### Backups

after.vim

@@ -4,22 +4,22 @@
 source ~/.vim/bindings.vim
 source ~/.vim/plugins-override.vim
 
-if filereadable(expand("~/.vim_local"))
-  echo "~/.vim_local is deprecated, please move it to ~/.local.vim"
-  source ~/.vim_local
-endif
-
-if filereadable(expand("~/.local.vim"))
-  echo "~/.local.vim is deprecated, please move it to ~/.local-after.vim or ~/.local-before.vim depending on the content.\nSee 'Local Configuration' section in the README.\n\n"
-  source ~/.local.vim
-endif
-
 if filereadable(expand("~/.local-after.vim"))
+  echo "~/.local-after.vim is deprecated, please move it to ~/.vimrc.after"
   source ~/.local-after.vim
 endif
 
+if filereadable(expand("~/.vimrc.after"))
+  source ~/.vimrc.after
+endif
+
 if has('gui_running')
   if filereadable(expand("~/.local-gui.vim"))
+    echo "~/.local-gui.vim is deprecated, please move it to ~/.gvimrc.after"
     source ~/.local-gui.vim
   endif
+
+  if filereadable(expand("~/.gvimrc.after"))
+    source ~/.gvimrc.after
+  endif
 end

before.vim

@@ -1,4 +1,15 @@
 " this file is loaded BEFORE plugins
 if filereadable(expand("~/.local-before.vim"))
+  echo "~/.local-before.vim is deprecated, please move it to ~/.vimrc.before"
   source ~/.local-before.vim
 endif
+
+if filereadable(expand("~/.vimrc.before"))
+  source ~/.vimrc.before
+endif
+
+if has('gui_running')
+  if filereadable(expand("~/.gvimrc.before"))
+    source ~/.gvimrc.before
+  endif
+endif