# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1497306055 14400
# Node ID ae87c045d04b0e657232e2915f1739a8a93baf6c
# Parent  2f9ceb002f749b99e3c3d30c2c909c4532c106df
Simplify directory setup

diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -4,6 +4,7 @@ set nocompatible
 
 " on windows and not cygwin
 let g:on_windows = (has('win32') || has('win64'))
+let g:myvim      = $HOME . (g:on_windows ? '/vimfiles' : '/.vim')
 let s:filename   = expand('<sfile>')
 
 " Set up Vundle and plugins  {{{
@@ -195,35 +196,19 @@ set sessionoptions=buffers,curdir,localo
 " Enable enhanced % matching in ruby
 runtime macros/matchit.vim
 
-if g:on_windows
-  let $MYVIM=$HOME.'/vimfiles'
-
-  if !filewritable( $MYVIM . '/var' )
-    silent execute '!mkdir "'.$HOME.'\vimfiles\var"'
-  endif
-  if !filewritable( $MYVIM. '/var/backup' )
-    silent execute '!mkdir "'.$HOME.'\vimfiles\var\backup"'
-  endif
-  if !filewritable( $MYVIM . '/var/tmp' )
-    silent execute '!mkdir "'.$HOME.'\vimfiles\var\tmp"'
-  endif
-  if !filewritable( $MYVIM . '/var/undo' )
-    silent execute '!mkdir "'.$HOME.'\vimfiles\var\undo"'
+for subdir in ['backup', 'tmp', 'undo']
+  if !filewritable(g:myvim . '/var/' . subdir)
+    call mkdir(g:myvim . '/var/' . subdir, 'p', 0700)
   endif
-
-else
-  let $MYVIM=$HOME.'/.vim'
+endfor
 
-  if !filewritable( $MYVIM . '/var/backup' )
-    silent execute '!mkdir -p "'.$MYVIM.'/var/backup"'
-  endif
-  if !filewritable( $MYVIM . '/var/tmp' )
-    silent execute '!mkdir "'.$MYVIM.'/var/tmp"'
-  endif
-  if !filewritable( $MYVIM . '/var/undo' )
-    silent execute '!mkdir "'.$MYVIM.'/var/undo"'
-  endif
+set backup
+let &backupdir = g:myvim . '/var/backup//,.'
+let &directory = g:myvim . '/var/tmp//,.'
 
+if has('persistent_undo')
+  set undofile
+  let &undodir = g:myvim . '/var/undo//,.'
 endif
 
 if g:on_windows
@@ -239,16 +224,6 @@ set guioptions-=T "no toolbar, menu, tea
 set guioptions-=m
 set guioptions-=t
 
-set backupdir=$MYVIM/var/backup//,.
-set directory=$MYVIM/var/tmp//,.
-
-set backup
-set autowriteall
-
-if has('persistent_undo')
-  set undofile
-  set undodir=$MYVIM/var/undo//,.
-endif
 " }}}
 
 
@@ -365,7 +340,7 @@ let g:tagbar_type_perl = {
         \ 'l:aliases',
         \ 'd:pod:1:0',
     \ ],
-    \ 'deffile' : '$MYVIM/ctags/perl.cnf'
+    \ 'deffile' : g:myvim . '/ctags/perl.cnf'
 \ }
 
 let g:tagbar_type_elixir = {