naomi/dots
1
0
Fork 0
mirror of https://github.com/NaomiAmethyst/dots.git synced 2025-08-31 22:08:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitosis@majnematic.com:davesdots

Browse source
This commit is contained in:
David Alexander Majnemer 2008-11-17 19:15:30 -06:00
commit 1756718bd8
1 changed files with 43 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
vimrc
View file

@ -18,10 +18,10 @@ set nocompatible " Don't emulate vi's limitations
set encoding=utf-8 " Default encoding should always be UTF-8 set encoding=utf-8 " Default encoding should always be UTF-8
set tabstop=4 " 4 spaces for tabs set tabstop=4 " 4 spaces for tabs
set shiftwidth=4 " 4 spaces for indents set shiftwidth=4 " 4 spaces for indents
"set smarttab " Tab next line based on current line set smarttab " Tab next line based on current line
"set expandtab " Spaces for indentation "set expandtab " Spaces for indentation
"set autoindent " Automatically indent next line set autoindent " Automatically indent next line
"set smartindent " Indent next line based on current line set smartindent " Indent next line based on current line
"set linebreak " Display long lines wrapped at word boundaries "set linebreak " Display long lines wrapped at word boundaries
set incsearch " Enable incremental searching set incsearch " Enable incremental searching
set hlsearch " Highlight search matches set hlsearch " Highlight search matches
@ -68,19 +68,19 @@ if has('eval')
let g:detectindent_preferred_expandtab = 0 let g:detectindent_preferred_expandtab = 0
let g:detectindent_preferred_indent = 4 let g:detectindent_preferred_indent = 4
endif
fun! DetectDetectIndent() fun! <SID>DetectDetectIndent()
try try
call DetectIndent() :DetectIndent
catch catch
endtry endtry
endfun endfun
endif
if has('autocmd') if has('autocmd')
autocmd BufEnter * :call WideFold() autocmd BufEnter * :call WideFold()
if exists("*DetectIndent") if has('eval')
autocmd BufReadPost * :call DetectIndent() autocmd BufReadPost * :call s:DetectDetectIndent()
endif endif
endif endif
@ -122,20 +122,20 @@ if has('eval')
endtry endtry
endwhile endwhile
endfun endfun
endif
if has("gui_running") if has("gui_running")
set background=light " We use a light background here set background=light " We use a light background here
call LoadColorScheme("wombat:desert") " Set the colorscheme call LoadColorScheme("wombat:desert") " Set the colorscheme
elseif &t_Co == 256 elseif &t_Co == 256
set background=light " We use a light background here set background=light " We use a light background here
call LoadColorScheme("wombat:inkpot") " Set the colorscheme call LoadColorScheme("wombat:inkpot") " Set the colorscheme
elseif &t_Co == 88 elseif &t_Co == 88
set background=dark " We use a dark background here set background=dark " We use a dark background here
call LoadColorScheme("inkpot:zellner") " Set the colorscheme call LoadColorScheme("inkpot:zellner") " Set the colorscheme
else else
set background=dark " We use a dark background here set background=dark " We use a dark background here
call LoadColorScheme("zellner") " Set the colorscheme call LoadColorScheme("zellner") " Set the colorscheme
endif
endif endif
" Show trailing whitespace visually " Show trailing whitespace visually
@ -218,18 +218,20 @@ nmap <C-]> :call GoDefinition()<CR>
if has('autocmd') if has('autocmd')
" Shortcuts " Shortcuts
fun! <SID>cabbrev() if has('eval')
iab #i #include fun! <SID>cabbrev()
iab #I #include iab #i #include
iab #I #include
iab #d #define iab #d #define
iab #D #define iab #D #define
iab #e #endif iab #e #endif
iab #E #endif iab #E #endif
endfun endfun
autocmd FileType c,cpp :call <SID>cabbrev() autocmd FileType c,cpp :call <SID>cabbrev()
endif
" make tab reindent in normal mode " make tab reindent in normal mode
autocmd FileType c,cpp,cs,java nmap <Tab> =0<CR> autocmd FileType c,cpp,cs,java nmap <Tab> =0<CR>
@ -278,12 +280,15 @@ imap <silent> <F12> <C-O>:silent set number!<CR>
" Don't force column 0 for # " Don't force column 0 for #
inoremap # X<BS># inoremap # X<BS>#
" Fix broken shit backspace on csil machines " Force <C-?> to be backspace except when in interix mode
" in tcsh with badly compiled vims " because interix uses that for forward delete...
" and always accept <C-h> as a backspace key
map <C-h> <BS> map <C-h> <BS>
map <C-?> <BS>
map! <C-h> <BS> map! <C-h> <BS>
map! <C-?> <BS> if (&term !~ "interix")
map <C-?> <BS>
map! <C-?> <BS>
endif
" Python specific stuff " Python specific stuff
if has('eval') if has('eval')