Commits

tednaleid committed dafcf6e Merge

resolved merge conflict

Comments (0)

Files changed (3)

     
 endif
 
-" colorscheme molokai
+ colorscheme molokai
 "colorscheme vividchalk
 "set background=light
 "set background=dark
 "colorscheme solarized
+<<<<<<< local
 colorscheme Tomorrow-Night-Blue
 "colorscheme Tomorrow-Night-Eighties
 "colorscheme Tomorrow-Night
 "colorscheme Tomorrow
+=======
+>>>>>>> other
 
 " resize current buffer by +/- 5 
 nnoremap <D-left> :vertical resize -5<cr>
 ack.vim
 nerdtree
 vim-repeat
+vim-easymotion
 vim-surround
 vim-pathogen
 vim-easymotion
+<<<<<<< local
 filetype off
+=======
+
+"
+
+filetyp off
+>>>>>>> other
 call pathogen#runtime_append_all_bundles()
 filetype plugin indent on
 
 inoremap jj <ESC>
 inoremap jk <ESC>
 
+vnoremap <silent> in( :<C-U>normal! f(vi(<cr> 
+onoremap <silent> in( :<C-U>normal! f(vi(<cr>
+
 "au FocusLost * :wa
 
 
 nnoremap <D-k> :cprevious<cr>
 
 
+" from http://vim.wikia.com/wiki/Indent_text_object
+" use (motion)ai to select "an indent" use (motion)ii to select "inner
+" indent", good for python
+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*$"
+    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
+
+" Open markdown in marked.app editor
+nnoremap <leader>m :silent !open -a Marked.app %:p<cr>
+
 
 " FuzzyFinder
 let g:fuzzy_ignore = "*.pyc;log/**;.svn/**;.git/**;.hg/**;pip-log.txt;*.gif;*.jpg;*.jpeg;*.png;**media/admin/**;**media/ckeditor/**;**media/filebrowser/**;**media/pages/**;**src/**;**build/**;**_build/**;**media/cache/**"