# HG changeset patch # User Steve Losh # Date 1377561738 14400 # Node ID ccd32f66c9fce8a90107ae98c02c745e59d4aa58 # Parent 0083e79166242153b56a5dffc386370f55cd2235 Shit diff -r 0083e7916624 -r ccd32f66c9fc .hgsub --- a/.hgsub Wed Aug 14 12:43:34 2013 -0400 +++ b/.hgsub Mon Aug 26 20:02:18 2013 -0400 @@ -5,7 +5,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 0083e7916624 -r ccd32f66c9fc .hgsubstate --- a/.hgsubstate Wed Aug 14 12:43:34 2013 -0400 +++ b/.hgsubstate Mon Aug 26 20:02:18 2013 -0400 @@ -5,7 +5,7 @@ f183a345a0c10caed7684d07dabae33e007c7590 vim/bundle/ack 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 0083e7916624 -r ccd32f66c9fc dotcss/linkedin.com.css --- a/dotcss/linkedin.com.css Wed Aug 14 12:43:34 2013 -0400 +++ b/dotcss/linkedin.com.css Mon Aug 26 20:02:18 2013 -0400 @@ -4,7 +4,8 @@ #companiesForYou, #pymk, #today-news-wrapper, -.guided-setup +.guided-setup, +.linkedin-sponsor { display: none; } diff -r 0083e7916624 -r ccd32f66c9fc vim/after/plugin/fireplace.vim --- a/vim/after/plugin/fireplace.vim Wed Aug 14 12:43:34 2013 -0400 +++ b/vim/after/plugin/fireplace.vim Mon Aug 26 20:02:18 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 K -autocmd FileType clojure nmap M FireplaceK - -" Soft and hard require can take "r" in localleaderland -autocmd FileType clojure nunmap cpr -autocmd FileType clojure nmap r :Require -autocmd FileType clojure nmap R :Require! - -" Okay enough with the goddamn eval mappings -autocmd FileType clojure nunmap cp -autocmd FileType clojure nunmap cpp -autocmd FileType clojure nunmap cq -autocmd FileType clojure nunmap cqq -autocmd FileType clojure nunmap cqp -autocmd FileType clojure nunmap cqc -autocmd FileType clojure nunmap c! -autocmd FileType clojure nunmap c!! - -" Eval form -autocmd FileType clojure nmap ef FireplacePrintab - -" Eval top-level form -autocmd FileType clojure nmap ee mz:call PareditFindDefunBck()FireplacePrintab:normal! `z - -" QuasiREPL -autocmd FileType clojure execute 'nmap q FireplacePrompt' . &cedit . 'i' - -" Again! -autocmd FileType clojure execute 'nmap a FireplacePrompt' . &cedit . 'k' - -" Edit form in quasirepl -autocmd FileType clojure nmap Ef FireplaceEditab - -" Kill all the movement mappings except gf (I like that one) -autocmd FileType clojure nunmap [ -autocmd FileType clojure nunmap ] -autocmd FileType clojure nunmap -autocmd FileType clojure nunmap d -autocmd FileType clojure nunmap gd - -" Use normal tag movement keys instead, ctags is fucked for Clojure anyway -autocmd FileType clojure nmap FireplaceDjump -autocmd FileType clojure nmap :vsplitFireplaceDjump - diff -r 0083e7916624 -r ccd32f66c9fc vim/vimrc --- a/vim/vimrc Wed Aug 14 12:43:34 2013 -0400 +++ b/vim/vimrc Mon Aug 26 20:02:18 2013 -0400 @@ -648,6 +648,12 @@ \ \ ] +let g:clojure_highlight_extra_defs = [ + \ 'defproject', + \ + \ 'defroutes' + \ ] + augroup ft_clojure au! diff -r 0083e7916624 -r ccd32f66c9fc weechat/alias.conf --- a/weechat/alias.conf Wed Aug 14 12:43:34 2013 -0400 +++ b/weechat/alias.conf Mon Aug 26 20:02:18 2013 -0400 @@ -1,5 +1,5 @@ # -# alias.conf -- weechat v0.4.1 +# alias.conf -- WeeChat v0.3.8 # [cmd] diff -r 0083e7916624 -r ccd32f66c9fc weechat/buffers.conf --- a/weechat/buffers.conf Wed Aug 14 12:43:34 2013 -0400 +++ b/weechat/buffers.conf Mon Aug 26 20:02:18 2013 -0400 @@ -1,5 +1,5 @@ # -# buffers.conf -- weechat v0.4.1 +# buffers.conf -- WeeChat v0.3.8 # [color] diff -r 0083e7916624 -r ccd32f66c9fc weechat/charset.conf --- a/weechat/charset.conf Wed Aug 14 12:43:34 2013 -0400 +++ b/weechat/charset.conf Mon Aug 26 20:02:18 2013 -0400 @@ -1,5 +1,5 @@ # -# charset.conf -- weechat v0.4.1 +# charset.conf -- WeeChat v0.3.8 # [default] diff -r 0083e7916624 -r ccd32f66c9fc weechat/logger.conf --- a/weechat/logger.conf Wed Aug 14 12:43:34 2013 -0400 +++ b/weechat/logger.conf Mon Aug 26 20:02:18 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 0083e7916624 -r ccd32f66c9fc weechat/plugins.conf --- a/weechat/plugins.conf Wed Aug 14 12:43:34 2013 -0400 +++ b/weechat/plugins.conf Mon Aug 26 20:02:18 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 0083e7916624 -r ccd32f66c9fc weechat/relay.conf --- a/weechat/relay.conf Wed Aug 14 12:43:34 2013 -0400 +++ b/weechat/relay.conf Mon Aug 26 20:02:18 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 0083e7916624 -r ccd32f66c9fc weechat/rmodifier.conf --- a/weechat/rmodifier.conf Wed Aug 14 12:43:34 2013 -0400 +++ b/weechat/rmodifier.conf Mon Aug 26 20:02:18 2013 -0400 @@ -1,5 +1,5 @@ # -# rmodifier.conf -- weechat v0.4.1 +# rmodifier.conf -- WeeChat v0.3.8 # [look] diff -r 0083e7916624 -r ccd32f66c9fc weechat/urlgrab.conf --- a/weechat/urlgrab.conf Wed Aug 14 12:43:34 2013 -0400 +++ b/weechat/urlgrab.conf Mon Aug 26 20:02:18 2013 -0400 @@ -1,5 +1,5 @@ # -# urlgrab.conf -- weechat v0.4.1 +# urlgrab.conf -- WeeChat v0.3.8 # [color] diff -r 0083e7916624 -r ccd32f66c9fc weechat/xfer.conf --- a/weechat/xfer.conf Wed Aug 14 12:43:34 2013 -0400 +++ b/weechat/xfer.conf Mon Aug 26 20:02:18 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