# HG changeset patch # User Steve Losh # Date 1411516735 14400 # Node ID 4e0d0927fa6bb72f52b4c0f8c829a5e625f5bb36 # Parent fc0eea69eb3574b44a49a449c1855977da09c9b0# Parent cbcb1ac55566a1309e77c9bd70e380d3d988268d Merge. diff -r cbcb1ac55566 -r 4e0d0927fa6b .hgsubstate diff -r cbcb1ac55566 -r 4e0d0927fa6b dotcss/weather.com.css --- a/dotcss/weather.com.css Thu Sep 18 12:07:16 2014 -0400 +++ b/dotcss/weather.com.css Tue Sep 23 19:58:55 2014 -0400 @@ -1,209 +0,0 @@ -// First grab Stylebot: https://chrome.google.com/webstore/detail/stylebot/oiaejidbmkiecgbjeifoejpgmdaleoha?hl=en - -#wx-breaking-now { - display: none; -} - -#wx-wrapper { - border-style: none; -} - -#wx-rail { - display: none; -} - -div.wx-inner { - display: none; -} - -div.wx-module.wx-gptADS { - display: none; -} - -div.wx-next a { - display: none; -} - -div.wx-nav-arrow.wx-k-lg-rt { - display: none; -} - -div.wx-content { - display: none; -} - -div.wx-social-share-ls-wrapper ul { - display: none; -} - -div.wx-search form input { - display: none; -} - -div.wx-searchButton { - display: none; -} - -div.wx-search { - display: none; -} - -#wx-bottom-inner { - height: 400px; -} - -dl.wx-1 { - display: none; -} - -dl.wx-2 { - display: none; -} - -dl.wx-3 { - display: none; -} - -dl.wx-4 { - display: none; -} - -ul.wx-social { - display: none; -} - -div.wx-legal { - display: none; -} - -#wx-Strip { - display: none; -} - -#wx-header-tools { - display: none; -} - -div.wx-desktop-weather-btn a { - display: none; -} - -div.wx-desktop-weather-bg { - display: none; -} - -span.wx-icon.wx-desktop-weather { - display: none; -} - -li.twc-weather-edit-location { - display: none; -} - -div.wx-grid6of6 { - height: 0; - margin-bottom: 0; - padding-bottom: 0; -} - -#wx-inner-rail { - clear: left; -} - -div.fby-tab.fby-tab-r a { - display: none; -} - -div.fby-tab.fby-tab-r { - display: none; -} - -div.wx-prev a { - display: none; -} - -div.wx-nav-arrow.wx-k-lg-lt { - display: none; -} - -div.wx-free-title h3 { - display: none; -} - -a.wx-icon.wx-cond.wx-phone { - display: none; -} - -a.wx-icon.wx-cond.wx-desktop { - display: none; -} - -a.wx-icon.wx-cond.wx-tablet { - display: none; -} - -div.wx-social-share-bar { - display: none; -} - -div.wx-lifestyles div { - display: none; -} - -#fsr_modalOverlay { - display: none; -} - -div.fsrwin { - display: none; -} - -div.wx-24hour.wx-module.wx-grid3of6.wx-weather { - margin-left: 0; - padding-left: 0; -} - -div#wx-footer { - border-top: 0; -} - -div#wx-top-wrap { - width: 660px; -} - -div#wx-main { - float: none; - margin: 0 auto; -} - -div.trc_rbox_outer { - display: none; -} - -div.trc_rbox_header.trc_rbox_border_elm { - display: none; -} - -div.trc_rbox_container div { - display: none; -} - -div.wx-map { - margin-left: 165px; -} - -div#wx-forecast-container div.wx-map { - margin-left: 0; -} - -.wx-grid6of6 { - width: auto; -} - -div.wx-corsican { - display: none; -} - -div.wx-module.wx-featured.wx-wwir-module.wx-cond-bg { - display: none; -} \ No newline at end of file diff -r cbcb1ac55566 -r 4e0d0927fa6b vim/custom-dictionary.utf-8.add --- a/vim/custom-dictionary.utf-8.add Thu Sep 18 12:07:16 2014 -0400 +++ b/vim/custom-dictionary.utf-8.add Tue Sep 23 19:58:55 2014 -0400 @@ -161,5 +161,6 @@ Reykjavík meatspace scrollback +tmux precompute fuckery diff -r cbcb1ac55566 -r 4e0d0927fa6b vim/vimrc --- a/vim/vimrc Thu Sep 18 12:07:16 2014 -0400 +++ b/vim/vimrc Tue Sep 23 19:58:55 2014 -0400 @@ -781,6 +781,10 @@ " Indent top-level form. au FileType clojure nmap = mz99[(v%='z " ]) + + " Not sure about this but we'll give it a try. + au FileType clojure nmap gi mz99[(v%='z + " ]) augroup END " }}} @@ -799,9 +803,6 @@ " }}} " Common Lisp {{{ -" function! SendToTmuxStripped(text) -" call SendToTmux(substitute(a:text, '\v\n*$', '', '')) -" endfunction function! SetLispWords() if exists("g:did_set_lisp_words") return @@ -814,6 +815,39 @@ set lispwords+=eswitch endfunction +function! SendLispForm() + let view = winsaveview() + + execute "normal! vab\" + SendSelectionToTmuxTrimmed + + call winrestview(view) +endfunction + +function! SendToplevelLispForm() + let view = winsaveview() + + " If we're on the first char of the form, calling PareditFindDefunBck will + " move us to the previous form, which we don't want. So instead we'll just + " always move a char to the right. + silent! normal! l + + call PareditFindDefunBck() + execute "normal! vab\" + SendSelectionToTmuxTrimmed + + call winrestview(view) +endfunction + +function! SendLispBuffer() + let view = winsaveview() + + execute "normal! ggVG\" + SendSelectionToTmuxTrimmed + + call winrestview(view) +endfunction + augroup ft_commonlisp au! @@ -832,13 +866,13 @@ " \c - send ctrl-l [c]lear " Send the current form to the REPL - au FileType lisp nnoremap f :let lisp_tslime_view = winsaveview()vab"ry:call SendToTmuxStripped(@r):call winrestview(lisp_tslime_view) + au FileType lisp nnoremap f :call SendLispForm() " Send the current top-level form to the REPL - au FileType lisp nnoremap e :let lisp_tslime_view = winsaveview():silent! normal! l:call PareditFindDefunBck()vab"ry:call SendToTmuxStripped(@r):call winrestview(lisp_tslime_view) - - " Send the entire buffer to the REPL - au FileType lisp nnoremap r :let lisp_tslime_view = winsaveview()ggVG"ry:call SendToTmuxStripped(@r):call winrestview(lisp_tslime_view) + au FileType lisp nnoremap e :call SendToplevelLispForm() + + " Send the entire buffer to the REPL ([r]eload) + au FileType lisp nnoremap r :call SendLispBuffer() " Clear the REPL au FileType lisp nnoremap c :call SendToTmuxRaw(" ") @@ -863,7 +897,7 @@ " )) " Indent top-level form. - au FileType lisp nmap = mz99[(v%='z + au FileType lisp nmap gi mz99[(v%='z " ]) augroup END @@ -1321,6 +1355,8 @@ au syntax timl RainbowParenthesesLoadSquare au syntax timl RainbowParenthesesLoadBraces + au FileType timl call PareditInitBuffer() + " Friendlier Paredit mappings. au FileType timl noremap () :call PareditWrap("(", ")") au FileType timl noremap )( :call PareditSplice() @@ -1332,10 +1368,8 @@ au FileType timl noremap ] :call PareditSmartJumpClosing(0) " ))) - au FileType timl call PareditInitBuffer() - " Indent top-level form. - au FileType timl nmap = mz99[(v%='z + au FileType timl nmap gi mz99[(v%='z " ]) augroup END @@ -1726,6 +1760,11 @@ let g:tslime_vars_mapping = 't' " }}} +" tslime2 {{{ + +let g:tslime2_ensure_trailing_newlines = 1 + +" }}} " YankRing {{{ function! YRRunAfterMaps()