Thu, 07 Aug 2014 17:55:57 -0400
Merge from default
.vim/windows-vimfiles.bat | file | annotate | diff | comparison | revisions |
new file mode 100644 --- /dev/null +++ b/.vim/after/syntax/perl/perl-contrib.vim @@ -0,0 +1,8 @@ + +" I would use symlinks but cygwin likes to fumble them +runtime contrib/carp.vim +runtime contrib/highlight-all-pragmas.vim +runtime contrib/moose.vim +runtime contrib/test-more.vim +runtime contrib/try-tiny.vim +
deleted file mode 100644 --- a/.vim/windows-vimfiles.bat +++ /dev/null @@ -1,4 +0,0 @@ -@ECHO ON - -copy ..\.vimrc %USERPROFILE%\_vimrc -xcopy /s ..\.vim %USERPROFILE%\vimfiles\
new file mode 100644 --- /dev/null +++ b/.vim/windows-vimfiles.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +set -euo pipefail +IFS=$'\n\t' + +if [ ! -L ~/userprofile ]; then + echo "Please link ~/userprofile" +fi + +USERPROFILE="$(readlink ~/userprofile)" + +cd `hg root` + +cp -vu .vimrc ${USERPROFILE}/_vimrc + +if [ ! -d ${USERPROFILE}/vimfiles ]; then + mkdir ${USERPROFILE}/vimfiles +fi + +cp -vuRL -t ${USERPROFILE}/vimfiles .vim/* +
--- a/.vimrc +++ b/.vimrc @@ -55,6 +55,7 @@ end Plugin 'altercation/vim-colors-solarized' Plugin 'bling/vim-airline' + Plugin 'bling/vim-bufferline' Plugin 'Shougo/vimproc.vim' Plugin 'Shougo/unite.vim' @@ -78,6 +79,7 @@ end Plugin 'danchoi/ri.vim' Plugin 'vim-ruby/vim-ruby' Plugin 'vim-perl/vim-perl' + Plugin 'yko/mojo.vim' if installed_vundle == 1 @@ -277,6 +279,7 @@ endfunction " perl fold scanning is slow "let perl_fold = 1 let perl_include_pod = 1 +let perl_no_subprototype_error = 1 " }}} @@ -333,6 +336,9 @@ autocmd FileType vimfiler nmap <buffer> ">> Airline let g:airline#extensions#whitespace#enabled = 0 +"keep bufferline from writing into the command line +let g:bufferline_echo = 0 + ">> Signify let g:signify_disable_by_default = 1 let g:signify_vcs_list = [ 'git', 'hg' ]