# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1378484653 14400
# Node ID 8bcaac8a526e0c32b477226a9e394153178e60ca
# Parent  640ad19595491ffd8c2a734c53debaa7a131ef28# Parent  fb9ef461ca17394c0445235426dd9864db51f81f
Merge.

diff -r 640ad1959549 -r 8bcaac8a526e .hgsub
--- a/.hgsub	Fri Sep 06 12:21:38 2013 -0400
+++ b/.hgsub	Fri Sep 06 12:24:13 2013 -0400
@@ -8,7 +8,7 @@
 vim/bundle/ack                   = [git]git://github.com/mileszs/ack.vim.git
 vim/bundle/badwolf               = [hg]https://bitbucket.org/sjl/badwolf/
 vim/bundle/clam                  = [hg]https://bitbucket.org/sjl/clam.vim/
-vim/bundle/clojure-static        = [git]git://github.com/guns/vim-clojure-static.git
+vim/bundle/clojure-static        = [git]git://github.com/sjl/vim-clojure-static.git
 vim/bundle/commentary            = [git]git://github.com/tpope/vim-commentary.git
 vim/bundle/ctrlp                 = [git]git://github.com/kien/ctrlp.vim.git
 vim/bundle/dispatch              = [git]git://github.com/tpope/vim-dispatch.git
diff -r 640ad1959549 -r 8bcaac8a526e .hgsubstate
--- a/.hgsubstate	Fri Sep 06 12:21:38 2013 -0400
+++ b/.hgsubstate	Fri Sep 06 12:24:13 2013 -0400
@@ -8,7 +8,7 @@
 6c4663589e73e21e77a9ea8403dcf2bf6cf9c11c vim/bundle/argumentative
 db3707cbd8706f4bb054959ecc5cee82ac45687b vim/bundle/badwolf
 8533fffd9fbb690dfc8e334f91a10c72e35a6dce vim/bundle/clam
-949adf73ae1a82c48cd951677c055bd38a30af99 vim/bundle/clojure-static
+5201a3860dbc32814f44eaf9386245caa70a65e6 vim/bundle/clojure-static
 dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary
 c1646e3c28d75bcc834af4836f4c6e12296ba891 vim/bundle/ctrlp
 ffbd5eb50c9daf67657b87fd767d1801ac9a15a7 vim/bundle/dispatch
diff -r 640ad1959549 -r 8bcaac8a526e dotcss/linkedin.com.css
--- a/dotcss/linkedin.com.css	Fri Sep 06 12:21:38 2013 -0400
+++ b/dotcss/linkedin.com.css	Fri Sep 06 12:24:13 2013 -0400
@@ -4,7 +4,8 @@
 #companiesForYou,
 #pymk,
 #today-news-wrapper,
-.guided-setup
+.guided-setup,
+.linkedin-sponsor
 {
     display: none;
 }
diff -r 640ad1959549 -r 8bcaac8a526e vim/after/plugin/fireplace.vim
--- a/vim/after/plugin/fireplace.vim	Fri Sep 06 12:21:38 2013 -0400
+++ b/vim/after/plugin/fireplace.vim	Fri Sep 06 12:24:13 2013 -0400
@@ -1,48 +1,1 @@
-" 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 640ad1959549 -r 8bcaac8a526e vim/vimrc
--- a/vim/vimrc	Fri Sep 06 12:21:38 2013 -0400
+++ b/vim/vimrc	Fri Sep 06 12:24:13 2013 -0400
@@ -648,6 +648,12 @@
             \
             \ ]
 
+let g:clojure_highlight_extra_defs = [
+            \ 'defproject',
+            \
+            \ 'defroutes'
+            \ ]
+
 augroup ft_clojure
     au!
 
diff -r 640ad1959549 -r 8bcaac8a526e weechat/alias.conf
--- a/weechat/alias.conf	Fri Sep 06 12:21:38 2013 -0400
+++ b/weechat/alias.conf	Fri Sep 06 12:24:13 2013 -0400
@@ -1,5 +1,5 @@
 #
-# alias.conf -- weechat v0.4.1
+# alias.conf -- WeeChat v0.3.8
 #
 
 [cmd]
diff -r 640ad1959549 -r 8bcaac8a526e weechat/buffers.conf
--- a/weechat/buffers.conf	Fri Sep 06 12:21:38 2013 -0400
+++ b/weechat/buffers.conf	Fri Sep 06 12:24:13 2013 -0400
@@ -1,5 +1,5 @@
 #
-# buffers.conf -- weechat v0.4.1
+# buffers.conf -- WeeChat v0.3.8
 #
 
 [color]
diff -r 640ad1959549 -r 8bcaac8a526e weechat/charset.conf
--- a/weechat/charset.conf	Fri Sep 06 12:21:38 2013 -0400
+++ b/weechat/charset.conf	Fri Sep 06 12:24:13 2013 -0400
@@ -1,5 +1,5 @@
 #
-# charset.conf -- weechat v0.4.1
+# charset.conf -- WeeChat v0.3.8
 #
 
 [default]
diff -r 640ad1959549 -r 8bcaac8a526e weechat/logger.conf
--- a/weechat/logger.conf	Fri Sep 06 12:21:38 2013 -0400
+++ b/weechat/logger.conf	Fri Sep 06 12:24:13 2013 -0400
@@ -1,5 +1,5 @@
 #
-# logger.conf -- weechat v0.4.1
+# logger.conf -- WeeChat v0.3.8
 #
 
 [look]
@@ -15,8 +15,6 @@
 info_lines = off
 mask = "$plugin.$name.weechatlog"
 name_lower_case = on
-nick_prefix = ""
-nick_suffix = ""
 path = "%h/logs/"
 replacement_char = "_"
 time_format = "%Y-%m-%d %H:%M:%S"
diff -r 640ad1959549 -r 8bcaac8a526e weechat/plugins.conf
--- a/weechat/plugins.conf	Fri Sep 06 12:21:38 2013 -0400
+++ b/weechat/plugins.conf	Fri Sep 06 12:24:13 2013 -0400
@@ -1,10 +1,9 @@
 #
-# plugins.conf -- weechat v0.4.1
+# plugins.conf -- WeeChat v0.3.8
 #
 
 [var]
 fifo.fifo = "on"
-lua.check_license = "off"
 perl.buffers.color_current = "black,green"
 perl.buffers.color_default = "default"
 perl.buffers.color_hotlist_highlight = "lightmagenta"
diff -r 640ad1959549 -r 8bcaac8a526e weechat/relay.conf
--- a/weechat/relay.conf	Fri Sep 06 12:21:38 2013 -0400
+++ b/weechat/relay.conf	Fri Sep 06 12:24:13 2013 -0400
@@ -1,5 +1,5 @@
 #
-# relay.conf -- weechat v0.4.1
+# relay.conf -- WeeChat v0.3.8
 #
 
 [look]
@@ -7,7 +7,6 @@
 raw_messages = 256
 
 [color]
-client = cyan
 status_active = lightblue
 status_auth_failed = lightred
 status_connecting = yellow
@@ -21,17 +20,7 @@
 allowed_ips = ""
 bind_address = ""
 compression_level = 6
-ipv6 = on
 max_clients = 5
 password = ""
-ssl_cert_key = "%h/ssl/relay.pem"
-websocket_allowed_origins = ""
-
-[irc]
-backlog_max_minutes = 1440
-backlog_max_number = 256
-backlog_since_last_disconnect = on
-backlog_tags = "irc_privmsg"
-backlog_time_format = "[%H:%M] "
 
 [port]
diff -r 640ad1959549 -r 8bcaac8a526e weechat/rmodifier.conf
--- a/weechat/rmodifier.conf	Fri Sep 06 12:21:38 2013 -0400
+++ b/weechat/rmodifier.conf	Fri Sep 06 12:24:13 2013 -0400
@@ -1,5 +1,5 @@
 #
-# rmodifier.conf -- weechat v0.4.1
+# rmodifier.conf -- WeeChat v0.3.8
 #
 
 [look]
diff -r 640ad1959549 -r 8bcaac8a526e weechat/urlgrab.conf
--- a/weechat/urlgrab.conf	Fri Sep 06 12:21:38 2013 -0400
+++ b/weechat/urlgrab.conf	Fri Sep 06 12:24:13 2013 -0400
@@ -1,5 +1,5 @@
 #
-# urlgrab.conf -- weechat v0.4.1
+# urlgrab.conf -- WeeChat v0.3.8
 #
 
 [color]
diff -r 640ad1959549 -r 8bcaac8a526e weechat/xfer.conf
--- a/weechat/xfer.conf	Fri Sep 06 12:21:38 2013 -0400
+++ b/weechat/xfer.conf	Fri Sep 06 12:24:13 2013 -0400
@@ -1,5 +1,5 @@
 #
-# xfer.conf -- weechat v0.4.1
+# xfer.conf -- WeeChat v0.3.8
 #
 
 [look]
@@ -28,7 +28,6 @@
 [file]
 auto_accept_chats = off
 auto_accept_files = off
-auto_accept_nicks = ""
 auto_rename = on
 auto_resume = on
 convert_spaces = on