# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1407448557 14400
# Node ID a79f766afc5a10dde2235e7c7b9a2a429d086e1c
# Parent  fcc2c5d328425b310534eb548a32bbce6405d39a# Parent  7d0ec8d47d8d6b0183a3606975490ca6a44851a7
Merge from default

diff --git a/.vim/after/syntax/perl/perl-contrib.vim b/.vim/after/syntax/perl/perl-contrib.vim
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
+
diff --git a/.vim/windows-vimfiles.bat b/.vim/windows-vimfiles.bat
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\
diff --git a/.vim/windows-vimfiles.sh b/.vim/windows-vimfiles.sh
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/*
+
diff --git a/.vimrc b/.vimrc
--- 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' ]