d7112a09d1dd
Merge.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Sat, 27 Jul 2013 14:22:28 -0400 |
parents | c0d4f70f7b26 (diff) 7824a3c6c12f (current diff) |
children | bd5cc7a9e0c8 |
branches/tags | (none) |
files | vim/vimrc |
Changes
--- a/.hgsubstate Wed Jul 24 10:51:18 2013 -0400 +++ b/.hgsubstate Sat Jul 27 14:22:28 2013 -0400 @@ -3,7 +3,7 @@ 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates 64981213be2efd939e6e6e109e2b32c24e95fd95 vim/bundle/AnsiEsc.vim f183a345a0c10caed7684d07dabae33e007c7590 vim/bundle/ack -b8e07a24e77d3bad16a89bde409f97ccc307486a vim/bundle/badwolf +db3707cbd8706f4bb054959ecc5cee82ac45687b vim/bundle/badwolf 8533fffd9fbb690dfc8e334f91a10c72e35a6dce vim/bundle/clam 949adf73ae1a82c48cd951677c055bd38a30af99 vim/bundle/clojure-static dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bin/lisp Sat Jul 27 14:22:28 2013 -0400 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -e + +rlwrap sbcl --load ~/.quicklisp/setup.lisp "$@"
--- a/vim/vimrc Wed Jul 24 10:51:18 2013 -0400 +++ b/vim/vimrc Sat Jul 27 14:22:28 2013 -0400 @@ -70,7 +70,7 @@ " iTerm2 is currently slow as ball at rendering the nice unicode lines, so for " now I'll just use ascii pipes. They're ugly but at least I won't want to kill " myself when trying to move around a file. -" set fillchars=diff:⣿,vert:│ +set fillchars=diff:⣿,vert:│ set fillchars=diff:⣿,vert:\| " Don't try to highlight lines longer than 800 characters. @@ -472,8 +472,8 @@ runtime macros/matchit.vim map <tab> % -unmap [% -unmap ]% +silent! unmap [% +silent! unmap ]% " Made D behave nnoremap D d$ @@ -692,6 +692,34 @@ augroup END " }}} +" Common Lisp {{{ + +augroup ft_commonlisp + au! + + au FileType lisp RainbowParenthesesActivate + au syntax lisp RainbowParenthesesLoadRound + au syntax lisp RainbowParenthesesLoadSquare + au syntax lisp RainbowParenthesesLoadBraces + + au FileType lisp noremap <buffer> () :<c-u>call PareditWrap("(", ")")<cr> + au FileType lisp noremap <buffer> )( :<c-u>call PareditSplice()<cr> + au FileType lisp noremap <buffer> (( :<c-u>call PareditMoveLeft()<cr> + au FileType lisp noremap <buffer> )) :<c-u>call PareditMoveRight()<cr> + au FileType lisp noremap <buffer> (j :<c-u>call PareditJoin()<cr> + au FileType lisp noremap <buffer> (s :<c-u>call PareditSplit()<cr> + au FileType lisp noremap <buffer> )j :<c-u>call PareditJoin()<cr> + au FileType lisp noremap <buffer> )s :<c-u>call PareditSplit()<cr> + au FileType lisp noremap <buffer> [[ :<c-u>call PareditSmartJumpOpening(0)<cr> + au FileType lisp noremap <buffer> ]] :<c-u>call PareditSmartJumpClosing(0)<cr> + " )) + + " Indent top-level form. + au FileType lisp nmap <buffer> <localleader>= mz99[(v%='z + " ]) +augroup END + +" }}} " Confluence {{{ augroup ft_c