Restoring some of my old settings.
This commit is contained in:
parent
ad18664ded
commit
c2c2eb4c12
1 changed files with 43 additions and 52 deletions
95
vimrc
95
vimrc
|
@ -3,55 +3,46 @@ execute pathogen#infect()
|
||||||
syntax on
|
syntax on
|
||||||
filetype plugin indent on
|
filetype plugin indent on
|
||||||
|
|
||||||
"filetype plugin indent on
|
" Window settings
|
||||||
"
|
set winminwidth=20
|
||||||
"" Tabbing
|
set winwidth=100
|
||||||
"function! SetupTabbing()
|
set winheight=20
|
||||||
" set tabstop=2
|
|
||||||
" set expandtab
|
" Wrapping
|
||||||
" set shiftwidth=2
|
set nowrap
|
||||||
" set softtabstop=2
|
set linebreak " wrap nicer
|
||||||
" set sw=2
|
|
||||||
" set autoindent
|
" Keeps lines below the cursor
|
||||||
" set smartindent
|
set scrolloff=2
|
||||||
" set smarttab
|
|
||||||
"endfunction
|
" Tabbing
|
||||||
"command! -bar SetupTabbing call SetupTabbing()
|
" I added this monster because Python doesn't play nice with my usual
|
||||||
"SetupTabbing
|
" settings, or some such nonsense. Anyway, it appears to work.
|
||||||
"
|
function! SetupTabbing()
|
||||||
"" Window settings
|
set tabstop=2
|
||||||
"set winminwidth=20
|
set expandtab
|
||||||
"set winwidth=100
|
set shiftwidth=2
|
||||||
"set winheight=20
|
set softtabstop=2
|
||||||
"
|
set sw=2
|
||||||
"" Syntax highlighting
|
set autoindent
|
||||||
"syntax on
|
set smartindent
|
||||||
"
|
set smarttab
|
||||||
"" Wrapping settings
|
endfunction
|
||||||
"set nowrap " nowrap makes the lines not wrap
|
command! -bar SetupTabbing call SetupTabbing()
|
||||||
"" set wrap " wrap makes the lines wrap
|
SetupTabbing
|
||||||
"set linebreak
|
|
||||||
"
|
" makes LaTeX use spell checking, word wrapping
|
||||||
"" keeps lines below the cursor
|
autocmd FileType tex set wrap spell
|
||||||
"set scrolloff=2
|
autocmd FileType make set noexpandtab
|
||||||
"
|
autocmd FileType python SetupTabbing
|
||||||
"" makes LaTeX use spell checking, word wrapping
|
|
||||||
"autocmd FileType tex set wrap spell
|
let java_allow_cpp_keywords=1
|
||||||
"autocmd FileType make set noexpandtab
|
|
||||||
"autocmd FileType *gitconfig set noexpandtab
|
set ruler
|
||||||
"autocmd FileType python SetupTabbing
|
set number
|
||||||
"
|
set backspace=indent,eol,start
|
||||||
"" set term=xterm
|
set hlsearch
|
||||||
"
|
|
||||||
"let java_allow_cpp_keywords = 1
|
"" I think this is some command for OS X compatibility? I don't know. Leaving
|
||||||
"
|
"" it here so that I can find it later if I need it.
|
||||||
"set ruler
|
"set term=xterm
|
||||||
"set number
|
|
||||||
"set backspace=indent,eol,start
|
|
||||||
"set hlsearch
|
|
||||||
"
|
|
||||||
"augroup HiglightTODO
|
|
||||||
" autocmd!
|
|
||||||
" autocmd WinEnter,VimEnter * :silent! call matchadd('Todo', 'TODO', -1)
|
|
||||||
"augroup END
|
|
||||||
"
|
|
||||||
|
|
Loading…
Reference in a new issue