Cleaning up some loose ends and adding indent-level selection

1 files changed, 47 insertions, 9 deletions

diff --git a/.vimrc b/.vimrc
index 84b0162..03efd05 100644
--- a/.vimrc
+++ b/.vimrc
@@ -74,6 +74,11 @@ autocmd BufNewFile,BufRead,BufReadPost *.tmpl
 autocmd BufNewFile,BufRead *.py
     \ setlocal foldmarker=#{,#}
 
+autocmd Filetype html,xml,xsl
+    \ source ~/.vim/scripts/closetag.vim
+
+autocmd BufNewFile,BufRead *.py
+    \ setlocal omnifunc=pythoncomplete#Complete
 " }}}
 " General Settings {{{
 set backspace=indent,eol,start
@@ -87,6 +92,7 @@ set nojoinspaces
 set backup
 set directory=~/.vim/tmp,~/.tmp,~/tmp,/var/tmp,/tmp
 set backupdir=~/.vim/tmp,~/.tmp,~/tmp,/var/tmp,/tmp
+set viminfo='100,<50,s10,h,n$HOME/.vim/tmp/viminfo
 "set list
 set listchars=tab:>-,eol:$,trail:.
 "set listchars=tab:▸\ ,eol:¬
@@ -159,6 +165,9 @@ let g:explVertical=1
 " Set closing tag style for closetag.vim
 let g:closetag_html=1
 
+" Do all python highlighting
+let python_highlight_all=1
+
 " Some sane defaults for the explorer
 let g:explHideFiles='^\.,.*\.sw[po]$,.*\.pyc$'
 let g:explDetailedHelp=0
@@ -175,11 +184,43 @@ set foldenable
 set foldcolumn=3
 set foldmethod=marker
 " }}}
-" Striving for Python Zen {{{
-let python_highlight_all=1
+" {{{ Select By Indent Level
+onoremap <silent>ai :<C-u>cal IndTxtObj(0)<CR>
+onoremap <silent>ii :<C-u>cal IndTxtObj(1)<CR>
+vnoremap <silent>ai :<C-u>cal IndTxtObj(0)<CR><Esc>gv
+vnoremap <silent>ii :<C-u>cal IndTxtObj(1)<CR><Esc>gv
+
+function! IndTxtObj(inner)
+    let curline = line(".")
+    let lastline = line("$")
+    let i = indent(line(".")) - &shiftwidth * (v:count1 - 1)
+    let i = i < 0 ? 0 : i
+
+    if getline(".") !~ "^\\s*$"
+        let p = line(".") - 1
+        let nextblank = getline(p) =~ "^\\s*$"
 
-autocmd FileType python
-    \ set omnifunc=pythoncomplete#Complete
+        while p > 0 && ((i == 0 && !nextblank) || (i > 0 && ((indent(p) >= i && !(nextblank && a:inner)) || (nextblank && !a:inner))))
+            -
+            let p = line(".") - 1
+            let nextblank = getline(p) =~ "^\\s*$"
+        endwhile
+
+        normal! 0V
+        call cursor(curline, 0)
+
+        let p = line(".") + 1
+        let nextblank = getline(p) =~ "^\\s*$"
+
+        while p <= lastline && ((i == 0 && !nextblank) || (i > 0 && ((indent(p) >= i && !(nextblank && a:inner)) || (nextblank && !a:inner))))
+            +
+            let p = line(".") + 1
+            let nextblank = getline(p) =~ "^\\s*$"
+        endwhile
+
+        normal! $
+    endif
+endfunction
 " }}}
 " Line and Column Highlighting {{{
 "autocmd BufEnter * call SetColumnHighlighting(1)
@@ -263,10 +304,7 @@ vnoremap <leader>dc :s/\v\C(([a-z]+)([A-Z]))/\2_\l\3/g<CR>
 nnoremap <leader>p :!python %:p<CR>
 " }}}
 " {{{ Workarounds For Broken Shit
-" Without this fix you can't write a Mac OS X crontab file
-if $VIM_CRONTAB == "true"
-    set nobackup
-    set nowritebackup
-endif
+au BufWrite /private/tmp/crontab.* set nowritebackup
+au BufWrite /private/etc/pw.* set nowritebackup
 " }}}
 " vim:foldenable:foldmethod=marker: