Restoring some of my old settings.

This commit is contained in:
Nicole Tietz-Sokolskaya 2016-02-03 22:51:15 -05:00
parent ad18664ded
commit c2c2eb4c12

95
vimrc
View file

@ -3,55 +3,46 @@ execute pathogen#infect()
syntax on
filetype plugin indent on
"filetype plugin indent on
"
"" Tabbing
"function! SetupTabbing()
" set tabstop=2
" set expandtab
" set shiftwidth=2
" set softtabstop=2
" set sw=2
" set autoindent
" set smartindent
" set smarttab
"endfunction
"command! -bar SetupTabbing call SetupTabbing()
"SetupTabbing
"
"" Window settings
"set winminwidth=20
"set winwidth=100
"set winheight=20
"
"" Syntax highlighting
"syntax on
"
"" Wrapping settings
"set nowrap " nowrap makes the lines not wrap
"" set wrap " wrap makes the lines wrap
"set linebreak
"
"" keeps lines below the cursor
"set scrolloff=2
"
"" makes LaTeX use spell checking, word wrapping
"autocmd FileType tex set wrap spell
"autocmd FileType make set noexpandtab
"autocmd FileType *gitconfig set noexpandtab
"autocmd FileType python SetupTabbing
"
"" set term=xterm
"
"let java_allow_cpp_keywords = 1
"
"set ruler
"set number
"set backspace=indent,eol,start
"set hlsearch
"
"augroup HiglightTODO
" autocmd!
" autocmd WinEnter,VimEnter * :silent! call matchadd('Todo', 'TODO', -1)
"augroup END
"
" Window settings
set winminwidth=20
set winwidth=100
set winheight=20
" Wrapping
set nowrap
set linebreak " wrap nicer
" Keeps lines below the cursor
set scrolloff=2
" Tabbing
" I added this monster because Python doesn't play nice with my usual
" settings, or some such nonsense. Anyway, it appears to work.
function! SetupTabbing()
set tabstop=2
set expandtab
set shiftwidth=2
set softtabstop=2
set sw=2
set autoindent
set smartindent
set smarttab
endfunction
command! -bar SetupTabbing call SetupTabbing()
SetupTabbing
" makes LaTeX use spell checking, word wrapping
autocmd FileType tex set wrap spell
autocmd FileType make set noexpandtab
autocmd FileType python SetupTabbing
let java_allow_cpp_keywords=1
set ruler
set number
set backspace=indent,eol,start
set hlsearch
"" 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 term=xterm