Merge from default mhoward-lt

Fri, 26 Sep 2014 21:15:16 -0400

author
Meredith Howard <mhoward@roomag.org>
date
Fri, 26 Sep 2014 21:15:16 -0400
branch
mhoward-lt
changeset 147
c85924edbea7
parent 143
70f2c9771fd8 (current diff)
parent 145
a7be2cafd6d7 (diff)
child 148
9f92bbf31061

Merge from default

--- a/.vimrc
+++ b/.vimrc
@@ -84,6 +84,15 @@ end
   Plugin 'yko/mojo.vim'
 
 
+  try
+    if on_windows == 1
+      source ~/_vimrc.local-pre
+    else
+      source ~/.vimrc.local-pre
+    endif
+  catch
+  endtry
+
   if installed_vundle == 1
     echo "Installing Plugins, please ignore key map error messages"
     echo ""
@@ -394,6 +403,8 @@ if has('gui_running')
   set number
   set background=dark
 
+  set guicursor+=a:blinkwait1000-blinkon1200-blinkoff250
+
   if on_windows == 1
     " generally have a tiling wm on linux
     set columns=120 lines=40

mercurial