# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1306878337 14400
# Node ID 9029e016e2b89336fd2526f28b1c9d6c52913bfa
# Parent  7db6f9777534f1a2f39fa874aba739bee4dec1ee
vim: orgmode stuff

diff -r 7db6f9777534 -r 9029e016e2b8 .hgsub
--- a/.hgsub	Tue May 31 15:51:32 2011 -0400
+++ b/.hgsub	Tue May 31 17:45:37 2011 -0400
@@ -15,4 +15,4 @@
 vim/bundle/pydoc = [git]git://github.com/fs111/pydoc.vim.git
 vim/bundle/tasklist = [git]git://github.com/vim-scripts/TaskList.vim.git
 vim/bundle/command-t = [git]git://github.com/vim-scripts/Command-T.git
-vim/bundle/vim-orgmode = [git]git://github.com/jceb/vim-orgmode.git
+vim/bundle/vim-orgmode = [git]git://github.com/sjl/vim-orgmode.git
diff -r 7db6f9777534 -r 9029e016e2b8 .hgsubstate
--- a/.hgsubstate	Tue May 31 15:51:32 2011 -0400
+++ b/.hgsubstate	Tue May 31 17:45:37 2011 -0400
@@ -15,4 +15,4 @@
 8e2dfdcc6e13d8afab5b3f620ee06ebb29b786f9 vim/bundle/tasklist
 b9b4407a19acc4eb344cca0cc5beea75e9ff5491 vim/bundle/vim-coffee-script
 c2df2e430d7d5fe645aa40e36079ab51f082e06b vim/bundle/vim-javascript
-983f469bdd1fce75a602385f2761e8bf954629f5 vim/bundle/vim-orgmode
+3d1692f635579e718b85dd8f24ac7fbd52a444f6 vim/bundle/vim-orgmode
diff -r 7db6f9777534 -r 9029e016e2b8 vim/.vimrc
--- a/vim/.vimrc	Tue May 31 15:51:32 2011 -0400
+++ b/vim/.vimrc	Tue May 31 17:45:37 2011 -0400
@@ -609,6 +609,18 @@
 nnoremap <silent> <leader><tab> :ScratchToggle<cr>
 
 " }}}
+" OrgMode {{{
+let g:org_plugins = ['ShowHide', '|', 'Navigator', 'EditStructure', '|', 'Todo', 'Misc']
+
+let g:org_todo_keywords = ['TODO', 'HOLD', '|', 'DONE']
+let g:org_debug = 1
+" }}}
+" DirDiff {{{
+map <unique> <Leader>Dg <Plug>DirDiffGet
+map <unique> <Leader>Dp <Plug>DirDiffPut
+map <unique> <Leader>Dj <Plug>DirDiffNext
+map <unique> <Leader>Dk <Plug>DirDiffPrev
+" }}}
 
 " }}}
 " Synstack -------------------------------------------------------------------- {{{