# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1374085661 14400
# Node ID 73eda22f31257361b227ad10194252d341d8f9d3
# Parent  7ae0595085159f7d11a58cdb0eef359f32fb1b51# Parent  f54eaeb2a58c1803ca5240b20ca9c2892274392f
Merge.

diff -r 7ae059508515 -r 73eda22f3125 .hgsub
diff -r 7ae059508515 -r 73eda22f3125 bin/lein
--- a/bin/lein	Wed Jul 17 14:26:40 2013 -0400
+++ b/bin/lein	Wed Jul 17 14:27:41 2013 -0400
@@ -1,17 +1,17 @@
 #!/usr/bin/env bash
 
-# Ensure this file is executable via chmod a+x lein, then place it
+# Ensure this file is executable via `chmod a+x lein`, then place it
 # somewhere on your $PATH, like ~/bin. The rest of Leiningen will be
 # installed upon first run into the ~/.lein/self-installs directory.
 
-export LEIN_VERSION="2.0.0"
+export LEIN_VERSION="2.1.2"
 
 case $LEIN_VERSION in
     *SNAPSHOT) SNAPSHOT="YES" ;;
     *) SNAPSHOT="NO" ;;
 esac
 
-if [[ "$OSTYPE" == "cygwin" ]]; then
+if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then
     delimiter=";"
 else
     delimiter=":"
@@ -21,6 +21,8 @@
     # ensure we have native paths
     if [[ "$OSTYPE" == "cygwin" && "$1"  == /* ]]; then
     echo -n "$(cygpath -wp "$1")"
+    elif [[ "$OSTYPE" == "msys" && "$1"  == /* ]]; then
+    echo -n "$(sh -c "(cd $1 2</dev/null && pwd -W) || echo $1 | sed 's/^\\/\([a-z]\)/\\1:/g'")"
     else
     echo -n "$1"
     fi
@@ -89,18 +91,21 @@
 
 BIN_DIR="$(dirname "$SCRIPT")"
 
-# Try to make the default more sane for :eval-in :classloader.lein
-grep -E -q '^\s*:eval-in\s+:classloader\s*$' project.clj 2> /dev/null &&
-LEIN_JVM_OPTS="${LEIN_JVM_OPTS:-"-Xms64m -Xmx512m"}"
+export LEIN_JVM_OPTS="${LEIN_JVM_OPTS-"-XX:+TieredCompilation -XX:TieredStopAtLevel=1"}"
+
+# When :eval-in :classloader we need more memory
+grep -E -q '^\s*:eval-in\s+:classloader\s*$' project.clj 2> /dev/null && \
+    export LEIN_JVM_OPTS="$LEIN_JVM_OPTS -Xms64m -Xmx512m"
 
 if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
     # Running from source checkout
     LEIN_DIR="$(dirname "$BIN_DIR")"
 
-    # Need to use lein 1.x to bootstrap the leiningen-core library (for aether)
-    if [ "$(ls "$LEIN_DIR"/leiningen-core/lib/*)" = "" ]; then
+    # Need to use lein release to bootstrap the leiningen-core library (for aether)
+    if [ ! -r "$LEIN_DIR/leiningen-core/.lein-bootstrap" ]; then
         echo "Leiningen is missing its dependencies."
-        echo "Please see \"Building\" in CONTRIBUTING.md."
+        echo "Please run \"lein bootstrap\" in the leiningen-core/ directory"
+        echo "with a stable release of Leiningen. See CONTRIBUTING.md for details."
         exit 1
     fi
 
@@ -113,8 +118,7 @@
         fi
     fi
 
-    # Use bin/lein to calculate its own classpath since src/ and
-    # leiningen-core/lib/*jar suffices to run the classpath task.
+    # Use bin/lein to calculate its own classpath.
     if [ ! -r "$LEIN_DIR/.lein-classpath" ] && [ "$1" != "classpath" ]; then
         echo "Recalculating Leiningen's classpath."
         ORIG_PWD="$PWD"
@@ -127,14 +131,14 @@
     fi
 
     mkdir -p "$LEIN_DIR/target/classes"
-    export LEIN_JVM_OPTS="${LEIN_JVM_OPTS:-"-Xms64m -Xmx256m"} -Dclojure.compile.path=$LEIN_DIR/target/classes"
+    export LEIN_JVM_OPTS="$LEIN_JVM_OPTS -Dclojure.compile.path=$LEIN_DIR/target/classes"
     add_path CLASSPATH "$LEIN_DIR/leiningen-core/src/" "$LEIN_DIR/leiningen-core/resources/" \
-                          "$LEIN_DIR/test:$LEIN_DIR/target/classes" "$LEIN_DIR/src" ":$LEIN_DIR/resources"
+        "$LEIN_DIR/test:$LEIN_DIR/target/classes" "$LEIN_DIR/src" ":$LEIN_DIR/resources"
 
     if [ -r "$LEIN_DIR/.lein-classpath" ]; then
         add_path CLASSPATH "$(cat "$LEIN_DIR/.lein-classpath" 2> /dev/null)"
     else
-        add_path CLASSPATH "$LEIN_DIR/leiningen-core/lib/*"
+        add_path CLASSPATH "$(cat "$LEIN_DIR/leiningen-core/.lein-bootstrap" 2> /dev/null)"
     fi
 else # Not running from a checkout
     add_path CLASSPATH "$LEIN_JAR"
@@ -165,6 +169,8 @@
     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 "It's also possible that you're behind a firewall haven't yet"
+    echo "set HTTP_PROXY and HTTPS_PROXY."
 }
 
 # TODO: explain what to do when Java is missing
@@ -182,7 +188,11 @@
 # If you're packaging this for a package manager (.deb, homebrew, etc)
 # you need to remove the self-install and upgrade functionality or see lein-pkg.
 if [ "$1" = "self-install" ]; then
-    if [ -r "$LEIN_JAR" ]; then
+    if [ -r "$BIN_DIR/../src/leiningen/version.clj" ]; then
+        echo "Running self-install from a checkout is not supported."
+        echo "See CONTRIBUTING.md for SNAPSHOT-specific build instructions."
+        exit 1
+    elif [ -r "$LEIN_JAR" ]; then
       echo "The self-install jar already exists at $LEIN_JAR."
       echo "If you wish to re-download, delete it and rerun \"$0 self-install\"."
       exit 1
@@ -197,9 +207,6 @@
     else
         rm "$LEIN_JAR.pending" 2> /dev/null
         download_failed_message "$LEIN_URL"
-        if [ $SNAPSHOT = "YES" ]; then
-            echo "See README.md for SNAPSHOT-specific build instructions."
-        fi
         exit 1
     fi
 elif [ "$1" = "upgrade" ]; then
@@ -216,8 +223,7 @@
         echo "You do not have permission to upgrade the installation in $SCRIPT"
         exit 1
     else
-        # TODO: change to stable when 2.0.0 is released
-        TARGET_VERSION="${2:-preview}"
+        TARGET_VERSION="${2:-stable}"
         echo "The script at $SCRIPT will be upgraded to the latest $TARGET_VERSION version."
         echo -n "Do you want to continue [Y/n]? "
         read RESP
@@ -262,7 +268,7 @@
 
     if ([ "$LEIN_FAST_TRAMPOLINE" != "" ] || [ -r .lein-fast-trampoline ]) &&
         [ -r project.clj ]; then
-        INPUTS="$@ $(cat project.clj) $(cat "$LEIN_HOME/profiles.clj")"
+        INPUTS="$@ $(cat project.clj) $LEIN_VERSION $(cat "$LEIN_HOME/profiles.clj")"
         INPUT_CHECKSUM=$(echo $INPUTS | shasum - | cut -f 1 -d " ")
         # Just don't change :target-path in project.clj, mkay?
         TRAMPOLINE_FILE="target/trampolines/$INPUT_CHECKSUM"
@@ -282,8 +288,7 @@
         exec sh -c "exec $(cat $TRAMPOLINE_FILE)"
     else
         export TRAMPOLINE_FILE
-        "$LEIN_JAVA_CMD" \
-            -client -XX:+TieredCompilation \
+        "$LEIN_JAVA_CMD" -client \
             "${BOOTCLASSPATH[@]}" \
             $LEIN_JVM_OPTS \
             -Dfile.encoding=UTF-8 \
diff -r 7ae059508515 -r 73eda22f3125 fish/config.fish
--- a/fish/config.fish	Wed Jul 17 14:26:40 2013 -0400
+++ b/fish/config.fish	Wed Jul 17 14:27:41 2013 -0400
@@ -248,7 +248,9 @@
 # }}}
 # Rubby {{{
 
-/usr/local/bin/rbenv rehash 2>/dev/null
+if test -s /usr/local/bin/rbenv
+    /usr/local/bin/rbenv rehash 2>/dev/null
+end
 
 # }}}
 # Z {{{
diff -r 7ae059508515 -r 73eda22f3125 vim/after/plugin/fireplace.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/after/plugin/fireplace.vim	Wed Jul 17 14:27:41 2013 -0400
@@ -0,0 +1,48 @@
+" Rebind keys in this file in the middle of nowhere because Tim Pope doesn't
+" like letting me do it in my vimrc like every other plugin in the world.
+
+" K is for "Kill", M is for "Man"
+autocmd FileType clojure nunmap <buffer> K
+autocmd FileType clojure nmap   <buffer> M <Plug>FireplaceK
+
+" Soft and hard require can take "r" in localleaderland
+autocmd FileType clojure nunmap <buffer> cpr
+autocmd FileType clojure nmap   <buffer> <localleader>r :Require<cr>
+autocmd FileType clojure nmap   <buffer> <localleader>R :Require!<cr>
+
+" Okay enough with the goddamn eval mappings
+autocmd FileType clojure nunmap <buffer> cp
+autocmd FileType clojure nunmap <buffer> cpp
+autocmd FileType clojure nunmap <buffer> cq
+autocmd FileType clojure nunmap <buffer> cqq
+autocmd FileType clojure nunmap <buffer> cqp
+autocmd FileType clojure nunmap <buffer> cqc
+autocmd FileType clojure nunmap <buffer> c!
+autocmd FileType clojure nunmap <buffer> c!!
+
+" Eval form
+autocmd FileType clojure nmap   <buffer> <localleader>ef <Plug>FireplacePrintab
+
+" Eval top-level form
+autocmd FileType clojure nmap   <buffer> <localleader>ee mz:call PareditFindDefunBck()<cr><Plug>FireplacePrintab:normal! `z<cr>
+
+" QuasiREPL
+autocmd FileType clojure execute 'nmap <buffer> <localleader>q <Plug>FireplacePrompt' . &cedit . 'i'
+
+" Again!
+autocmd FileType clojure execute 'nmap <buffer> <localleader>a <Plug>FireplacePrompt' . &cedit . 'k<cr>'
+
+" Edit form in quasirepl
+autocmd FileType clojure nmap   <buffer> <localleader>Ef <Plug>FireplaceEditab
+
+" Kill all the movement mappings except gf (I like that one)
+autocmd FileType clojure nunmap <buffer> [<c-d>
+autocmd FileType clojure nunmap <buffer> ]<c-d>
+autocmd FileType clojure nunmap <buffer> <c-w><c-d>
+autocmd FileType clojure nunmap <buffer> <c-w>d
+autocmd FileType clojure nunmap <buffer> <c-w>gd
+
+" Use normal tag movement keys instead, ctags is fucked for Clojure anyway
+autocmd FileType clojure nmap   <buffer> <c-]> <Plug>FireplaceDjump
+autocmd FileType clojure nmap   <buffer> <c-\> :vsplit<cr><Plug>FireplaceDjump
+
diff -r 7ae059508515 -r 73eda22f3125 vim/vimrc
--- a/vim/vimrc	Wed Jul 17 14:26:40 2013 -0400
+++ b/vim/vimrc	Wed Jul 17 14:27:41 2013 -0400
@@ -868,26 +868,6 @@
 augroup END
 
 " }}}
-" Lisp {{{
-
-augroup ft_lisp
-    au!
-    au FileType lisp call TurnOnLispFolding()
-    " 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
-
-    " Fix the eval mappings.
-    au FileType lisp nnoremap <buffer> <localleader>ef :call SlimvEvalExp()<cr>
-    au FileType lisp nnoremap <buffer> <localleader>ee :call SlimvEvalDefun()<cr>
-
-    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
-
-    " Indent top-level form.
-    au FileType lisp nmap <buffer> <localleader>= mz99[(v%='z
-augroup END
-
-" }}}
 " Mail {{{
 
 augroup ft_mail
@@ -1223,11 +1203,6 @@
 nnoremap <leader>L :LinediffReset<cr>
 
 " }}}
-" Lisp (built-in) {{{
-
-let g:lisp_rainbow = 1
-
-" }}}
 " Makegreen {{{
 
 nnoremap \| :call MakeGreen('')<cr>
@@ -1272,6 +1247,12 @@
 let g:org_debug = 1
 
 " }}}
+" Paredit {{{
+
+let g:paredit_smartjump = 1
+let g:paredit_shortmaps = 0
+
+" }}}
 " Powerline {{{
 
 let g:Powerline_symbols = 'fancy'