" File type specific settings.
if has("autocmd")
+ autocmd BufNewFile,BufRead /run/shm/* set nobackup nowritebackup noundofile
+ \ noswapfile viminfo="" noshelltemp history=0 nomodeline secure
autocmd filetype make setlocal sts=0 sw=8 noexpandtab tw=80 fo-=t fo+=j
autocmd filetype sh,ld setlocal sts=4 sw=4 tw=80 fo-=t fo+=j
autocmd filetype python setlocal sts=4 sw=4 tw=79 fo-=t fo+=j
nnoremap <silent> <leader>gd :Gdiff<CR>
nnoremap <silent> <leader>gc :Gcommit<CR>
nnoremap <silent> <leader>gb :Gblame<CR>
-nnoremap <silent> <leader>gl :Glog<CR>
+nnoremap <silent> <leader>gl :Git log<CR>
nnoremap <silent> <leader>gp :Git push<CR>
nnoremap <silent> <leader>gr :Gread<CR>
nnoremap <silent> <leader>gw :Gwrite<CR>
" mkbuild tools
nnoremap <silent> <leader>e :call mkbuild#DmenuOpen('e')<CR>
-nnoremap <silent> <leader>x :call mkbuild#SelectXrefs()<CR>
+nnoremap <leader>x :<C-u>Unite -buffer-name=xrefs xrefs<cr>
" Turn on doxygen syntax highlighting for C, C++, C# and IDL files.
let g:load_doxygen_syntax=1
nnoremap <leader>uy :<C-u>Unite -no-split -buffer-name=yank history/yank<cr>
nnoremap <leader>ub :<C-u>Unite -no-split -start-insert -buffer-name=buffer buffer<cr>
nnoremap <leader>uo :<C-u>Unite -no-split -start-insert -buffer-name=outline outline<cr>
+nnoremap <leader>ul :<C-u>Unite -no-split -start-insert -buffer-name=lines line<cr>
+nnoremap <leader>: :<C-u>Unite -start-insert -direction=dynamicbottom -buffer-name=command history/command<cr>
+nnoremap <leader>/ :<C-u>Unite -start-insert -direction=dynamicbottom -buffer-name=search history/search<cr>
" Custom mappings for the unite buffer
autocmd FileType unite call s:unite_settings()