--- a/.hgsubstate Fri Dec 09 17:22:31 2011 -0500
+++ b/.hgsubstate Tue Dec 20 17:52:02 2011 -0500
@@ -2,7 +2,7 @@
c060c94622e92e091b2c67499fdda16d91b68c01 mercurial/templates
d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
a41d5d52c39a31128e969e69acf800b198cb07f9 vim/bundle/ack
-8d99466502b40d7a5270abe6d763cf59383f4683 vim/bundle/ctrlp
+bf03741650aae253b9fbfdb5526d6a7b818a060d vim/bundle/ctrlp
cdecdc56f938840cad250aecd58c1901f04c4d1b vim/bundle/easymotion
1b7e4070f5f7b7522422f5b00a75b323cc314daf vim/bundle/fugitive
91190e67720f852c17602504d5225d4e675b6499 vim/bundle/gundo
@@ -27,5 +27,5 @@
8d06adbd56a761684701d1c60990b72c845be3d5 vim/bundle/vim-commentary
6362ba99c825afc046818807267d5c1143b5c887 vim/bundle/vim-javascript
f21fbd8759d7fa6c3cb1bbb9fe05eae90422f01a vim/bundle/vim-makegreen
-54b7bfc8170f3fa1519e5559c37a4f3e31c032c9 vim/bundle/vim-orgmode
+aa53673d435020ed209b9df030df29070bda81f4 vim/bundle/vim-orgmode
b0ee6ec2153c5f30827d67db1668f37a975a1005 vim/bundle/vim-speeddating
--- a/.pentadactylrc Fri Dec 09 17:22:31 2011 -0500
+++ b/.pentadactylrc Tue Dec 20 17:52:02 2011 -0500
@@ -13,10 +13,28 @@
set followhints=1
set showtabline=multitab
set showstatuslinks=command
+set mapleader=','
+" FASTER PLEASE
nnoremap j 3j
nnoremap k 3k
-inoremap jk <esc>
+" Switch tabs with J and K
nnoremap J :tn<CR>
nnoremap K :tp<CR>
+
+" Finally I can overwrite the stupid fucking Firebug toggling correctly.
+nnoremap <c-f> <f12>
+nnoremap <c-g> <s-f12>
+
+" Shift is hard.
+nnoremap ; :
+
+" Highlight all search matches, not just the first.
+set hlfind
+
+" Clear search highlighting and normal highlighting.
+nnoremap <Leader><space> <esc>:noh<CR>
+
+" Shut up.
+javascript dactyl.beep = function() { return false; }
--- a/vim/.vimrc Fri Dec 09 17:22:31 2011 -0500
+++ b/vim/.vimrc Tue Dec 20 17:52:02 2011 -0500
@@ -101,6 +101,7 @@
set backupdir=~/.vim/tmp/backup// " backups
set directory=~/.vim/tmp/swap// " swap files
set backup " enable backups
+set noswapfile " It's 2011, Vim.
" }}}
" Leader {{{
@@ -517,6 +518,9 @@
au FileType html,jinja,htmldjango nnoremap <buffer> π :<C-U>YRPaste 'p'<CR>
au FileType html,jinja,htmldjango nnoremap <buffer> ∏ :<C-U>YRPaste 'P'<CR>
+ " Indent tag
+ au FileType html,jinja,htmldjango nnoremap <buffer> <localleader>= Vat=
+
" Django tags
au FileType jinja,htmldjango inoremap <buffer> <c-t> {%<space><space>%}<left><left><left>
@@ -753,9 +757,6 @@
" Less chording
nnoremap ; :
-" Faster Esc
-inoremap jk <esc>
-
" Cmdheight switching
nnoremap <leader>1 :set cmdheight=1<cr>
nnoremap <leader>2 :set cmdheight=2<cr>
--- a/vim/bundle/potion/ftdetect/potion.vim Fri Dec 09 17:22:31 2011 -0500
+++ b/vim/bundle/potion/ftdetect/potion.vim Tue Dec 20 17:52:02 2011 -0500
@@ -1,4 +1,1 @@
-augroup potion_detect
- autocmd!
- autocmd BufNewFile,BufRead *.pn set filetype=potion
-augroup END
+autocmd BufNewFile,BufRead *.pn set filetype=potion
--- a/vim/plugin/autoclose.vim Fri Dec 09 17:22:31 2011 -0500
+++ b/vim/plugin/autoclose.vim Tue Dec 20 17:52:02 2011 -0500
@@ -75,7 +75,6 @@
iunmap }
iunmap <BS>
iunmap <C-h>
- iunmap <Esc>
let g:autoclose_on = 0
echo "AutoClose Off"
else
@@ -90,8 +89,6 @@
inoremap <silent> } <C-R>=<SID>CloseStackPop('}')<CR>
inoremap <silent> <BS> <C-R>=<SID>OpenCloseBackspace()<CR>
inoremap <silent> <C-h> <C-R>=<SID>OpenCloseBackspace()<CR>
- inoremap <silent> <Esc> <C-R>=<SID>CloseStackPop('')<CR><Esc>
- inoremap <silent> <C-[> <C-R>=<SID>CloseStackPop('')<CR><C-[>
"the following simply creates an ambiguous mapping so vim fully
"processes the escape sequence for terminal keys, see 'ttimeout' for a
"rough explanation, this just forces it to work
--- a/zsh/misc.zsh Fri Dec 09 17:22:31 2011 -0500
+++ b/zsh/misc.zsh Tue Dec 20 17:52:02 2011 -0500
@@ -89,3 +89,4 @@
alias collapse="sed -e 's/ */ /g'"
alias cuts="cut -d' '"
+alias clc="./get-last-commit-url.py | pbc"