30b080bdd80d
Merge.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Thu, 01 Nov 2012 16:54:16 -0400 |
| parents | 6ed2c7b06e73 (current diff) 1b487daa9aab (diff) |
| children | f4c88441426f e96c194bd3f7 |
| branches/tags | (none) |
| files | vim/vimrc |
Changes
--- a/bin/lein Wed Oct 31 16:04:36 2012 -0400 +++ b/bin/lein Thu Nov 01 16:54:16 2012 -0400 @@ -148,7 +148,7 @@ echo "out-of-date version of libssl. Either upgrade it or set HTTP_CLIENT" echo "to turn off certificate checks:" echo " export HTTP_CLIENT=\"wget --no-check-certificate -O\" # or" - echo " export HTTP_CLIENT=\"curl --insecure -f -L -o" + echo " export HTTP_CLIENT=\"curl --insecure -f -L -o\"" } # TODO: explain what to do when Java is missing @@ -177,7 +177,7 @@ mv -f "$LEIN_JAR.pending" "$LEIN_JAR" else rm "$LEIN_JAR.pending" 2> /dev/null - downoad_failed_message "$LEIN_URL" + download_failed_message "$LEIN_URL" if [ $SNAPSHOT = "YES" ]; then echo "See README.md for SNAPSHOT-specific build instructions." fi
--- a/vim/vimrc Wed Oct 31 16:04:36 2012 -0400 +++ b/vim/vimrc Thu Nov 01 16:54:16 2012 -0400 @@ -814,7 +814,7 @@ " au FileType lisp nnoremap <buffer> <localleader>ee mz99[(va("ry:call Send_to_Tmux(@r)<cr> au FileType lisp nnoremap <buffer> <localleader>ee mz99[(:call SlimvEvalExp()<cr>`z - au FileType lisp nnoremap <buffer> <localleader>tt mz99[(vab"ry:call Send_to_Tmux(@r)<cr>`z + au FileType lisp nnoremap <buffer> <localleader>tt mz0l99[(vab"ry:call Send_to_Tmux(@r)<cr>`z au FileType lisp nnoremap <buffer> <localleader>tb mzggVG"ry:call Send_to_Tmux(@r)<cr>`z augroup END