Commit c392db54 authored by Murukesh Mohanan's avatar Murukesh Mohanan

Merge branch 'temp'

parents 6ad46eb8 8b903aca
Subproject commit e5ad9c566c7e8410f9631db63a8b380ed8f19c7d
Subproject commit e1692107da0b678001127e9cdcacf028f5c246a8
Subproject commit bcf3de4fdffae45fc7c85b6b84a01b37177924aa
Subproject commit 8c7534bc9e1d0c2f18bf94c1440c4ae6b102b5d6
Subproject commit 1be907716e4940d2387545e3e42b6411c9c58a6c
Subproject commit 8164240f6f0aaed2055dae45fc0e5c6f6ec30b3d
Subproject commit b319b694539017dcd789dc2c42f784a30d7b28b8
Subproject commit b7b23001def8d2ae816ff6dd772cd50976189e0e
......@@ -89,10 +89,9 @@ nnoremap <Up> gk
execute pathogen#infect()
colorscheme molokai
if !empty($MAN_PN)
autocmd StdinReadPost * set ft=man | file $MAN_PN
endif
highlight Normal ctermbg=none
highlight NonText ctermbg=none
highlight Visual ctermbg=black
" From http://vi.stackexchange.com/questions/258/
autocmd BufWritePre *.sh if !filereadable(expand('%')) | let b:is_new = 1 | endif
......@@ -103,6 +102,7 @@ let g:SuperTabDefaultCompletionType = "context"
let g:SuperTabClosePreviewOnPopupClose = 1
set omnifunc=syntaxcomplete#Complete
set foldmethod=syntax
set foldlevelstart=99
let g:syntastic_cpp_compiler_options = ' -std=c++11'
let g:syntastic_python_python_exec = '/usr/bin/python3'
let g:airline#extensions#tabline#enabled = 1
......@@ -136,9 +136,11 @@ let g:DiffUpdate=1
" command -nargs=0 Cscope cs add $VIMSRC/src/cscope.out $VIMSRC/src
" endif
if !empty($MAN_PN)
autocmd StdinReadPost * set ft=man | file $MAN_PN
elseif @% == "" && getcwd() == "/tmp"
" From http://vi.stackexchange.com/questions/239/
" with exception for reading manpages
if empty($MAN_PN) && @% == "" && getcwd() == "/tmp"
silent find test.*
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment