# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1317510768 14400
# Node ID f625da5ccd84b817488cca4174bc02c47bcbf88f
# Parent  5245ac05d1e843381474e37398f7f0ccdcffd0ab
Moar.

diff -r 5245ac05d1e8 -r f625da5ccd84 .gitconfig
--- a/.gitconfig	Thu Sep 29 12:41:38 2011 -0400
+++ b/.gitconfig	Sat Oct 01 19:12:48 2011 -0400
@@ -8,7 +8,7 @@
     excludesfile = /Users/sjl/.gitignore
 
 [alias]
-    gl  = log -10 --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n'
+    gl  = log -16 --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n'
     gll = log     --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n'
 
     pull = pull --ff-only
diff -r 5245ac05d1e8 -r f625da5ccd84 vim/.vimrc
--- a/vim/.vimrc	Thu Sep 29 12:41:38 2011 -0400
+++ b/vim/.vimrc	Sat Oct 01 19:12:48 2011 -0400
@@ -345,8 +345,8 @@
     au FileType clojure call TurnOnClojureFolding()
     au FileType clojure compiler clojure
     au FileType clojure setlocal report=100000
-    au FileType clojure nnoremap <buffer> o A<cr>
-    au FileType clojure nnoremap <buffer> O kA<cr>
+    " au FileType clojure nnoremap <buffer> o A<cr>
+    au FileType clojure nnoremap <buffer> O I<cr><esc>kA
 
     au BufWinEnter        Slimv.REPL.clj setlocal winfixwidth
     au BufNewFile,BufRead Slimv.REPL.clj setlocal nowrap
@@ -550,6 +550,7 @@
 augroup ft_pentadactyl
     au!
     au BufNewFile,BufRead .pentadactylrc set filetype=pentadactyl
+    au BufNewFile,BufRead ~/Library/Caches/TemporaryItems/pentadactyl-*.tmp set nolist wrap linebreak columns=100 colorcolumn=0
 augroup END
 
 " }}}
diff -r 5245ac05d1e8 -r f625da5ccd84 vim/compiler/clojure.vim
--- a/vim/compiler/clojure.vim	Thu Sep 29 12:41:38 2011 -0400
+++ b/vim/compiler/clojure.vim	Sat Oct 01 19:12:48 2011 -0400
@@ -4,25 +4,17 @@
 "License:     MIT/X11
 "============================================================================
 
-if exists("current_compiler")
-  finish
-endif
+" if exists("current_compiler")
+"   finish
+" endif
 let current_compiler = "clojure"
 
 let s:cpo_save = &cpo
 set cpo-=C"endif
 
-
-setlocal makeprg=\(echo\ DIR:\ `pwd`/test/`ls\ test`/test\ &&\ cake\ test\)
+let &l:makeprg=fnameescape(globpath(&runtimepath, 'compiler/cake-test-wrapper.py'))
 
-setlocal errorformat=
-            \%-DDIR:\ %f,
-            \%E%tAIL\ in\ %m\ (%f:%l),
-            \%C%m,
-            \%Z%^%$,
-            \%-G%>Ran\ %.%#\ tests\ containing\ %.%#\ assertions.,
-            \%-G%.%#,
-
+setlocal errorformat=%f:%l:%m
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff -r 5245ac05d1e8 -r f625da5ccd84 weechat/weechat.conf
--- a/weechat/weechat.conf	Thu Sep 29 12:41:38 2011 -0400
+++ b/weechat/weechat.conf	Sat Oct 01 19:12:48 2011 -0400
@@ -188,7 +188,7 @@
 nicklist.conditions = "nicklist"
 nicklist.filling_left_right = vertical
 nicklist.filling_top_bottom = columns_vertical
-nicklist.hidden = off
+nicklist.hidden = on
 nicklist.items = "buffer_nicklist"
 nicklist.position = right
 nicklist.priority = 200