Merge from default mhoward-lt

Wed, 20 Aug 2014 22:56:07 -0400

author
Meredith Howard <mhoward@roomag.org>
date
Wed, 20 Aug 2014 22:56:07 -0400
branch
mhoward-lt
changeset 140
29b215bf23e0
parent 137
e34eb9b7a8a3 (current diff)
parent 139
2464de2899b3 (diff)
child 143
70f2c9771fd8

Merge from default

--- a/.vimrc
+++ b/.vimrc
@@ -22,7 +22,9 @@ end
   if !filereadable(vundle_readme)
     if !executable('git')
       echo "You probably want git installed and in PATH."
-      echo " http://chocolatey.org "
+      if on_windows == 1
+        echo " http://chocolatey.org "
+      endif
       quit
     endif
 
@@ -279,18 +281,21 @@ endfunction
 " perl fold scanning is slow
 "let perl_fold = 1           
 let perl_include_pod = 1
+" workaround for experimental signatures
 let perl_no_subprototype_error = 1
 
 " }}}
 
 
 " Plugin settings  {{{
+
 ">> Gundo
-" I prefer python3 on windows if I have to use it.
+" I prefer python3 on windows if I have to use it. Needs a dll in path.
 if on_windows == 1
   let g:gundo_prefer_python3=1
 endif
 
+
 ">> Tagbar
 if on_windows == 1
   if executable('ctags') == 0
@@ -329,16 +334,20 @@ if executable('ag')
   let g:unite_source_grep_recursive_opt = ''
 endif
 
+
 ">> vimfiler
 let g:vimfiler_as_default_explorer = 1
+" double-click to edit
 autocmd FileType vimfiler nmap <buffer> <2-LeftMouse> <Plug>(vimfiler_edit_file)
 
+
 ">> 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' ]
@@ -347,6 +356,7 @@ let g:signify_mapping_next_hunk = '<lead
 let g:signify_mapping_prev_hunk = '<leader>gk'
 let g:signify_mapping_toggle = '<leader>gt'
 
+
 ">> neocomplcache
 " Disable AutoComplPop.
 let g:acp_enableAtStartup = 0
--- a/.zshrc
+++ b/.zshrc
@@ -4,6 +4,9 @@ export ZSH=$HOME/.oh-my-zsh
 ZSH_THEME="mhoward"
 ZSH_CUSTOM=~/.oh-my-zsh.cust
 
+# trust in github?
+DISABLE_UPDATE_PROMPT="true"
+
 plugins=( common-aliases gitfast )
 
 if [ -f ~/.zshrc.local-pre ]; then

mercurial