Merge branch 'master' into homedir

This commit is contained in:
Barak Michener 2012-06-01 12:04:46 -07:00
commit 2781386e47
2 changed files with 24 additions and 17 deletions

View file

@ -8,6 +8,7 @@
ci = commit ci = commit
co = checkout co = checkout
w = whatchanged w = whatchanged
revert = checkout -f
stagediff = diff --staged stagediff = diff --staged
sdiff = diff --staged sdiff = diff --staged
graph = log --graph --oneline graph = log --graph --oneline

8
.vimrc
View file

@ -73,6 +73,12 @@ let g:NERDChristmasTree = 1
let g:NERDChristmasTree = 1 let g:NERDChristmasTree = 1
let g:NERDTreeQuitOnOpen = 1 let g:NERDTreeQuitOnOpen = 1
let g:NERDTreeWinPos = "right" let g:NERDTreeWinPos = "right"
" Tagbar plugin settings
let g:tagbar_width = 40
let g:tagbar_autofocus = 1
" Taglist plugin settings (deprecated)
let Tlist_GainFocus_On_ToggleOpen = 1 let Tlist_GainFocus_On_ToggleOpen = 1
let Tlist_Use_Right_Window = 1 let Tlist_Use_Right_Window = 1
let Tlist_Inc_Winwidth = 0 let Tlist_Inc_Winwidth = 0
@ -101,7 +107,7 @@ au BufEnter *.org call org#SetOrgFileType()
"nnoremap gn gt "nnoremap gn gt
"nnoremap gp gT "nnoremap gp gT
nmap gt :NERDTreeToggle<CR> nmap gt :NERDTreeToggle<CR>
nmap gT :TlistToggle<CR> nmap gb :TlistToggle<CR>
"nnoremap gx :Kwbd<CR> "nnoremap gx :Kwbd<CR>
nnoremap gc :bdelete<CR> nnoremap gc :bdelete<CR>
nnoremap gK :bdelete!<CR> nnoremap gK :bdelete!<CR>