mhoward/dotfiles: comparison .vimrc

-:a771fe75a85c
+:d76f82e65929
 " vim: et sts=2 sw=2
 " vim: fdm=marker
 set nocompatible
-let on_windows=0
+" on windows and not cygwin
-if has('win32') || has('win64')
+let s:on_windows=(has('win32') || has('win64'))
-" vim in cygwin has win32 = 0 and win32unix = 1
+let s:filename=expand('<sfile>')
-let on_windows=1
-endif
 " Set up Vundle and plugins  {{{
-let installed_vundle=0
+let s:installed_vundle=0
-if on_windows == 0
+let s:vundle_readme=expand(s:on_windows
-let vundle_readme=expand('~/.vim/bundle/vundle/README.md')
+\ ? '~/vimfiles/bundle/vundle/README.md'
-else
+\ : '~/.vim/bundle/vundle/README.md')
-let vundle_readme=expand('~/vimfiles/bundle/vundle/README.md')
-endif
+if !filereadable(s:vundle_readme)
-if !filereadable(vundle_readme)
 if !executable('git')
 echo "You probably want git installed and in PATH."
-if on_windows == 1
-echo " http://chocolatey.org "
-endif
 quit
 endif
-let installed_vundle=1
+echo "Installing Vundle and Plugins...\n"
-if on_windows == 0
+if s:on_windows == 0
-echo "Installing Vundle..."
-echo ""
 silent !mkdir -p ~/.vim/bundle
 silent !git clone https://github.com/gmarik/vundle ~/.vim/bundle/vundle
 else
-echo "Installing Vundle and Plugins..."
-" This happens in a series of minimized cmd windows rather than the cool
-" progress display we normally get.
-" Also windows is weird about args and quoting:
 silent execute '!mkdir "'. $HOME .'\vimfiles\bundle"'
 silent execute '!git clone https://github.com/gmarik/vundle "'. $HOME .'\vimfiles\bundle\vundle"'
 endif
-endif
+let s:installed_vundle=1
+endif
-if on_windows == 0
+if s:on_windows == 0
 set rtp+=~/.vim/bundle/vundle/
 call vundle#rc()
 else
 set rtp+=~/vimfiles/bundle/vundle/
 call vundle#rc('~/vimfiles/bundle')
 let g:no_viewdoc_maps = 1
 Plugin 'powerman/vim-plugin-viewdoc'
 Plugin 'powerman/vim-plugin-AnsiEsc'
 try
-if on_windows == 1
+execute 'source ' . s:filename . '.local-pre'
-source ~/_vimrc.local-pre
-else
-source ~/.vimrc.local-pre
-endif
 catch
 endtry
-if installed_vundle == 1
+if s:installed_vundle == 1
-echo "Installing Plugins, please ignore key map error messages"
+echo "Installing Plugins, please ignore key map error messages\n"
-echo ""
+call PluginInstall
-:PluginInstall
-if on_windows == 1
-" Windows build just isn't there with exec $0, so we already have some
-" odd errors and get a weird UI at the end.
-echo "Please restart vim to continue with plugins installed."
-quit
-endif
 endif
 " }}}
 " Key maps {{{
 nmap <silent> <F5> :GundoToggle<CR>
 nmap <silent> <F8> :TagbarToggle<CR>
 " This is supposed to get a CtrlP workalike with fuzzy match but i need to fix
 " ignores and always chdir to a good place
-if on_windows == 1
+if s:on_windows == 1
 nmap <silent> <S-F2> :Unite -start-insert file_rec:!<CR>
 else
 nmap <silent> <S-F2> :Unite -start-insert file_rec/async:!<CR>
 endif
 nnoremap <silent> <leader><leader>k :call UncolorAllWords()<CR>
 nnoremap <silent> <leader>gt :SignifyToggle<CR>
 " K: doc, gK: Doc w/o using syntax hints, gKK: doc current filename
-nmap K   :call ViewDoc('doc', '<cword>')<CR>
+nmap K   :call ViewDoc('doc', expand('<cword>'))<CR>
-nmap gK  :call ViewDoc('doc', expand('<cword>'))<CR>
 nmap gKK :call ViewDoc('doc', expand('%'))<CR>
 " Tabular shortcuts
 map <leader>ta :Tabularize first_arrow<CR>
 map <leader>te :Tabularize first_eq<CR>
 set tags+=.tags
 " Ignore compiled files and repositories
 set wildignore=*.o,*~,*.pyc
-if on_windows == 1
+if s:on_windows == 1
 set wildignore+=*/.git/*,*/.hg/*,*/.svn/*,*/.DS_Store
 else
 set wildignore+=.git\*,.hg\*,.svn\*
 endif
 " Superseded by vim-airline
 "set statusline=%f%m%r%h%w\ %y\ %=%l,%c\ %p%%\ %L
 set laststatus=2
-if on_windows == 1
+if s:on_windows == 1
 let $MYVIM=$HOME.'/vimfiles'
 if !filewritable( $MYVIM . '/var' )
 silent execute '!mkdir "'.$HOME.'\vimfiles\var"'
 endif
 silent execute '!mkdir "'.$MYVIM.'/var/undo"'
 endif
 endif
-if on_windows == 1
+if s:on_windows == 1
 set guifont=DejaVu_Sans_Mono:h10:cDEFAULT
 set linespace=0
 elseif has('osx')
 set guifont=DejaVu\ Sans\ Mono:h11
 else
 endfunction
 augroup vimrc
 autocmd!
-autocmd VimEnter * call AutoSessionConfig()
+" set and load a session based on servername
+autocmd VimEnter  * call AutoSessionConfig()
+" complement to autowriteall
 autocmd FocusLost * silent! wa
-" preload templates into new buffers by file extension
-"autocmd BufNewFile * silent! 0r $MYVIM/templates/%:e.template
-" double-click to edit
-autocmd FileType vimfiler nmap <buffer> <2-LeftMouse> <Plug>(vimfiler_edit_file)
 " Jump to last known pos
 autocmd BufReadPost *
 \ if &filetype != 'mail' && line("'\"") >= 1 && line("'\"") <= line("$") |
 \   exe "normal! g`\"" |
 \ endif
+" double-click to edit in vimfiler
+autocmd FileType vimfiler nmap <buffer> <2-LeftMouse> <Plug>(vimfiler_edit_file)
 augroup END
+" Make paths when writing, as necessary
 function! s:MkNonExDir(file, buf)
 if empty(getbufvar(a:buf, '&buftype')) && a:file!~#'\v^\w+\:\/'
 let dir=fnamemodify(a:file, ':h')
 if !isdirectory(dir)
 call mkdir(dir, 'p')
 let g:viewdoc_perldoc_format = 'ansi'
 let g:viewdoc_winwidth_max = 100
 ">> Gundo
 " I prefer python3 on windows if I have to use it. Needs a dll in path.
-if on_windows == 1
+if s:on_windows == 1
 let g:gundo_prefer_python3=1
 endif
 ">> Tagbar
-if on_windows == 1
+if s:on_windows == 1
 if executable('ctags') == 0
 " if i haven't installed from chocolatey...
 let g:tagbar_ctags_bin = 'C:\Users\mhoward\bin\ctags.exe'
 endif
 endif
 endif
 " }}}
 " Local stuff, finish up
 try
-if on_windows == 1
+execute 'source ' . s:filename . '.local'
-source ~/_vimrc.local
-else
-source ~/.vimrc.local
-endif
 catch
 endtry
 if g:airline_powerline_fonts == 0 && $LANG =~ 'UTF-8'
 let g:airline_left_sep  = '▒'
 set number
 set background=dark
 set guicursor+=a:blinkwait1000-blinkon1200-blinkoff250
-if on_windows == 1
+if s:on_windows == 1
 set columns=120 lines=40
 endif
 colorscheme jellybeans
 else

Mercurial > hg > mhoward > dotfiles / file comparison

comparison: .vimrc

.vimrc