# HG changeset patch # User zegervdv # Date 1409038650 -7200 # Node ID 9eeaecd192f50486f15d7452d661ff754a981309 # Parent 1f0d12295ba5887da085cf085cc8ad13c7f056eb Add targets plugin diff -r 1f0d12295ba5 -r 9eeaecd192f5 .hgsub --- a/.hgsub Mon Aug 25 11:43:33 2014 +0200 +++ b/.hgsub Tue Aug 26 09:37:30 2014 +0200 @@ -59,3 +59,4 @@ vim/bundle/unite-outline = [git]https://github.com/Shougo/unite-outline.git vim/bundle/unite-tag = [git]https://github.com/tsukkee/unite-tag.git vim/bundle/unite-build = [git]https://github.com/Shougo/unite-build.git +vim/bundle/targets = [git]https://github.com/wellle/targets.vim.git diff -r 1f0d12295ba5 -r 9eeaecd192f5 .hgsubstate --- a/.hgsubstate Mon Aug 25 11:43:33 2014 +0200 +++ b/.hgsubstate Tue Aug 26 09:37:30 2014 +0200 @@ -45,6 +45,7 @@ e62fe0e6ede2917e96a6b8b834468028924ecc64 vim/bundle/syntastic 60f25648814f0695eeb6c1040d97adca93c4e0bb vim/bundle/tabular 59c9b7ce1cc70ac2c7bd3c858e80c89f17b42cc9 vim/bundle/tagbar +15f8bd83eaa08254a1ff15530fb3c62cfaa66f6f vim/bundle/targets 053cb377ebf11b92581eb4d2e606955d522ac4c3 vim/bundle/tcomment f9ba6df8838be0fcf8fb763459bfac35c5df2e78 vim/bundle/textmanip b82f8804c4987b2534a5411d492d15d6010e98d2 vim/bundle/tlib diff -r 1f0d12295ba5 -r 9eeaecd192f5 vimrc --- a/vimrc Mon Aug 25 11:43:33 2014 +0200 +++ b/vimrc Tue Aug 26 09:37:30 2014 +0200 @@ -162,8 +162,8 @@ vnoremap % " Move between tabs -map w :tabprevious -map n :tabnext +map w :tabprevious +map n :tabnext " Move between splits map j @@ -258,146 +258,7 @@ endfunction " }}} set foldtext=MyFoldText() -" Next and Last {{{ -" -" Motion for "next/last object". "Last" here means "previous", not "final". -" Unfortunately the "p" motion was already taken for paragraphs. -" -" Next acts on the next object of the given type, last acts on the previous -" object of the given type. These don't necessarily have to be in the current -" line. -" -" Currently works for (, [, {, and their shortcuts b, r, B. -" -" Next kind of works for ' and " as long as there are no escaped versions of -" them in the string (TODO: fix that). Last is currently broken for quotes -" (TODO: fix that). -" -" Some examples (C marks cursor positions, V means visually selected): -" -" din' -> delete in next single quotes foo = bar('spam') -" C -" foo = bar('') -" C -" -" canb -> change around next parens foo = bar('spam') -" C -" foo = bar -" C -" -" vin" -> select inside next double quotes print "hello ", name -" C -" print "hello ", name -" VVVVVV - -onoremap an :call NextTextObject('a', '/') -xnoremap an :call NextTextObject('a', '/') -onoremap in :call NextTextObject('i', '/') -xnoremap in :call NextTextObject('i', '/') - -onoremap al :call NextTextObject('a', '?') -xnoremap al :call NextTextObject('a', '?') -onoremap il :call NextTextObject('i', '?') -xnoremap il :call NextTextObject('i', '?') - - -function! s:NextTextObject(motion, dir) - let c = nr2char(getchar()) - let d = '' - - if c ==# "b" || c ==# "(" || c ==# ")" - let c = "(" - elseif c ==# "B" || c ==# "{" || c ==# "}" - let c = "{" - elseif c ==# "r" || c ==# "[" || c ==# "]" - let c = "[" - elseif c ==# "'" - let c = "'" - elseif c ==# '"' - let c = '"' - else - return - endif - - " Find the next opening-whatever. - execute "normal! " . a:dir . c . "\" - - if a:motion ==# 'a' - " If we're doing an 'around' method, we just need to select around it - " and we can bail out to Vim. - execute "normal! va" . c - else - " Otherwise we're looking at an 'inside' motion. Unfortunately these - " get tricky when you're dealing with an empty set of delimiters because - " Vim does the wrong thing when you say vi(. - - let open = '' - let close = '' - - if c ==# "(" - let open = "(" - let close = ")" - elseif c ==# "{" - let open = "{" - let close = "}" - elseif c ==# "[" - let open = "\\[" - let close = "\\]" - elseif c ==# "'" - let open = "'" - let close = "'" - elseif c ==# '"' - let open = '"' - let close = '"' - endif - - " We'll start at the current delimiter. - let start_pos = getpos('.') - let start_l = start_pos[1] - let start_c = start_pos[2] - - " Then we'll find it's matching end delimiter. - if c ==# "'" || c ==# '"' - " searchpairpos() doesn't work for quotes, because fuck me. - let end_pos = searchpos(open) - else - let end_pos = searchpairpos(open, '', close) - endif - - let end_l = end_pos[0] - let end_c = end_pos[1] - - call setpos('.', start_pos) - - if start_l == end_l && start_c == (end_c - 1) - " We're in an empty set of delimiters. We'll append an "x" - " character and select that so most Vim commands will do something - " sane. v is gonna be weird, and so is y. Oh well. - execute "normal! ax\\" - execute "normal! vi" . c - elseif start_l == end_l && start_c == (end_c - 2) - " We're on a set of delimiters that contain a single, non-newline - " character. We can just select that and we're done. - execute "normal! vi" . c - else - " Otherwise these delimiters contain something. But we're still not - " sure Vim's gonna work, because if they contain nothing but - " newlines Vim still does the wrong thing. So we'll manually select - " the guts ourselves. - let whichwrap = &whichwrap - set whichwrap+=h,l - - execute "normal! va" . c . "hol" - - let &whichwrap = whichwrap - endif - endif -endfunction " }}} -" }}} - -" VHDL ctags -let g:tlist_vhdl_settings = 'vhdl;d:package declarations;b:package bodies;e:entities;a:architecture specifications;t:type declarations;p:processes;f:functions;r:procedures' " Latex {{{ " Compile using rubber nnoremap m :w:VimProcBang rubber --pdf --warn all %