# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1518196668 0
# Node ID 43b11c2a574653c788c4fe7d866450c31547e46b
# Parent  51ec87e1d1312862f57c5c920fb8a98ba83f2754# Parent  665fffea183b1b22f502026c47fd9c2e226411b1
Merge.

diff -r 665fffea183b -r 43b11c2a5746 .hgsubstate
diff -r 665fffea183b -r 43b11c2a5746 bin/scratch
--- a/bin/scratch	Fri Feb 09 12:16:59 2018 -0500
+++ b/bin/scratch	Fri Feb 09 17:17:48 2018 +0000
@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
 
-set -e
-nvim ~/Dropbox/scratch
+set -euo pipefail
+
+mkdir -p "$HOME/Desktop/scratch"
+cd "$HOME/Desktop/scratch"
+$EDITOR "$HOME/Desktop/scratch/scratch.$1"
diff -r 665fffea183b -r 43b11c2a5746 vim/vimrc
--- a/vim/vimrc	Fri Feb 09 12:16:59 2018 -0500
+++ b/vim/vimrc	Fri Feb 09 17:17:48 2018 +0000
@@ -6,24 +6,7 @@
 " a few minutes to kill.
 
 " Preamble ---------------------------------------------------------------- {{{
-
-" Dear /bin/bash: fuck you and your bullshit, arcane command-line behaviour.
 "
-" Basically, I want to set this to a non-login, non-interactive bash shell.
-" Using a login/interactive bash as Vim's 'shell' breaks subtle things, like
-" ack.vim's command-line argument parsing.  However, I *do* want bash to load
-" ~/.bash_profile so my aliases get loaded and such.
-"
-" You might think you could do this with the --init-file command line option,
-" which is used to specify an init file.  Or with --rcfile.  But no, those only
-" get loaded for interactive/login shells.
-"
-" So how do we tell bash to source a goddamned file when it loads?  With an
-" *environment variable*.  Jesus, you have multiple command line options for
-" specifying files to load and none of them work?
-"
-" Computers are bullshit.
-" let $BASH_ENV = "~/.bash_profile"
 set shell=/bin/bash\ --login
 
 filetype off
@@ -2767,7 +2750,7 @@
 
     " Settings
     au FileType vlime_sldb setlocal nowrap
-    au FileType vlime_repl setlocal nowrap
+    au FileType vlime_repl setlocal nowrap winfixheight
 
     " Keys for Lisp files
     au FileType lisp nnoremap <buffer> <localleader>e :call vlime#plugin#Compile(vlime#ui#CurTopExpr(v:true))<cr>