--- a/.hgsubstate Tue Apr 01 20:06:13 2014 -0400
+++ b/.hgsubstate Tue Sep 23 19:57:16 2014 -0400
@@ -39,7 +39,7 @@
26fbdd7d1f1aa5600d2ebf39bbdd292c38aac16e vim/bundle/strftimedammit
1a73f607f8f5477d6942df2eb6e7245c4864f4d3 vim/bundle/surround
14cb306414dda411b1809a088e18eb2796030095 vim/bundle/syntastic
-e5433ec4644f266df27202f1e0d6b4ca45bff392 vim/bundle/timl
-113b1f14a1fb92b9c026a71485c9ed402a2045f8 vim/bundle/tslime
+71420eb8c2f9580f6a9258b317f0311732a5b243 vim/bundle/timl
+d143308c5f385cce76dba5abf7b8b3737d711a4f vim/bundle/tslime
84365f56fc87c11f1f04eed487d256cf8b128f7c vim/bundle/vitality
a884f3a161fa3cd8c996eb53a3d1c68631f60c21 vim/bundle/yankring
--- a/dotcss/weather.com.css Tue Apr 01 20:06:13 2014 -0400
+++ b/dotcss/weather.com.css Tue Sep 23 19:57:16 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
--- a/vim/custom-dictionary.utf-8.add Tue Apr 01 20:06:13 2014 -0400
+++ b/vim/custom-dictionary.utf-8.add Tue Sep 23 19:57:16 2014 -0400
@@ -161,3 +161,4 @@
Reykjavík
meatspace
scrollback
+tmux
--- a/vim/vimrc Tue Apr 01 20:06:13 2014 -0400
+++ b/vim/vimrc Tue Sep 23 19:57:16 2014 -0400
@@ -797,9 +797,6 @@
" }}}
" Common Lisp {{{
-function! SendToTmuxStripped(text)
- call SendToTmux(substitute(a:text, '\v\n*$', '', ''))
-endfunction
function! SetLispWords()
if exists("g:did_set_lisp_words")
return
@@ -812,6 +809,39 @@
set lispwords+=eswitch
endfunction
+function! SendLispForm()
+ let view = winsaveview()
+
+ execute "normal! vab\<esc>"
+ 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\<esc>"
+ SendSelectionToTmuxTrimmed
+
+ call winrestview(view)
+endfunction
+
+function! SendLispBuffer()
+ let view = winsaveview()
+
+ execute "normal! ggVG\<esc>"
+ SendSelectionToTmuxTrimmed
+
+ call winrestview(view)
+endfunction
+
augroup ft_commonlisp
au!
@@ -830,13 +860,13 @@
" \c - send ctrl-l [c]lear
" Send the current form to the REPL
- au FileType lisp nnoremap <buffer> <silent> <localleader>f :let lisp_tslime_view = winsaveview()<cr>vab"ry:call SendToTmuxStripped(@r)<cr>:call winrestview(lisp_tslime_view)<cr>
+ au FileType lisp nnoremap <buffer> <silent> <localleader>f :call SendLispForm()<cr>
" Send the current top-level form to the REPL
- au FileType lisp nnoremap <buffer> <silent> <localleader>e :let lisp_tslime_view = winsaveview()<cr>:silent! normal! l<cr>:call PareditFindDefunBck()<cr>vab"ry:call SendToTmuxStripped(@r)<cr>:call winrestview(lisp_tslime_view)<cr>
-
- " Send the entire buffer to the REPL
- au FileType lisp nnoremap <buffer> <silent> <localleader>r :let lisp_tslime_view = winsaveview()<cr>ggVG"ry:call SendToTmuxStripped(@r)<cr>:call winrestview(lisp_tslime_view)<cr>
+ au FileType lisp nnoremap <buffer> <silent> <localleader>e :call SendToplevelLispForm()<cr>
+
+ " Send the entire buffer to the REPL ([r]eload)
+ au FileType lisp nnoremap <buffer> <silent> <localleader>r :call SendLispBuffer()<cr>
" Clear the REPL
au FileType lisp nnoremap <buffer> <silent> <localleader>c :call SendToTmuxRaw(" ")<cr>
@@ -861,7 +891,7 @@
" ))
" Indent top-level form.
- au FileType lisp nmap <buffer> <localleader>= mz99[(v%='z
+ au FileType lisp nmap <buffer> gi mz99[(v%='z
" ])
augroup END
@@ -1299,6 +1329,8 @@
au syntax timl RainbowParenthesesLoadSquare
au syntax timl RainbowParenthesesLoadBraces
+ au FileType timl call PareditInitBuffer()
+
" Friendlier Paredit mappings.
au FileType timl noremap <buffer> () :<c-u>call PareditWrap("(", ")")<cr>
au FileType timl noremap <buffer> )( :<c-u>call PareditSplice()<cr>
@@ -1310,10 +1342,8 @@
au FileType timl noremap <buffer> ] :<c-u>call PareditSmartJumpClosing(0)<cr>
" )))
- au FileType timl call PareditInitBuffer()
-
" Indent top-level form.
- au FileType timl nmap <buffer> <localleader>= mz99[(v%='z
+ au FileType timl nmap <buffer> gi mz99[(v%='z
" ])
augroup END
@@ -1703,6 +1733,11 @@
let g:tslime_vars_mapping = '<localleader>t'
" }}}
+" tslime2 {{{
+
+let g:tslime2_ensure_trailing_newlines = 1
+
+" }}}
" YankRing {{{
function! YRRunAfterMaps()