X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=vim%2Fvimrc;h=fc97f823fa763d2603ed56d5c92bb8571f554072;hb=fa4719922ca4877858157963f406303ce5feda10;hp=f9aa421b2e4b5a3a99b9cdeb2464a147dd46932b;hpb=023f6ced31b85b3b1ccdf6b9cf02b2fd578a3da6;p=dotfiles.git

diff --git a/vim/vimrc b/vim/vimrc
index f9aa421..fc97f82 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -93,7 +93,7 @@ if has("gui_running")
 	set macmeta  "" Macvim only
 	colorscheme molokai
 	set guioptions+=c
-	set guifont=Sauce\ Code\ Powerline\ Light:h11
+	set guifont=Source\ Code\ Pro\ Light:h11
 	highlight Cursor guifg=white guibg=green
 	set guicursor=a:blinkon0
 	set guioptions=eac
@@ -376,8 +376,9 @@ endfunction
 "endif
 " }}}
 " NerdTree ---------------------------------------------------------------- {{{
-" TODO check if this is already using in plugins
-"nmap <Leader>n	:NERDTreeToggle<CR>
+" Fix keymapping conflict
+nmap <unique> <Leader>, <Plug>MarkClear
+nmap <Leader>n	:NERDTreeToggle<CR>
 nmap <Leader>N	:NERDTreeFind<CR>
 " }}}
 " AutoClose --------------------------------------------------------------- {{{