X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=40e95ba3c9a798419ca7a1753859c1c8c1ff2fe8;hb=18a2c1a79c19450bc858152b2f5d60c1a88f4058;hp=f19fa910abfc9f16600b179b840ef0051123a7dc;hpb=e4c2c10baa2afee714f934d52fd3ca3ae4b04ba0;p=config%2Fdotfiles.git diff --git a/vimrc b/vimrc index f19fa91..40e95ba 100644 --- a/vimrc +++ b/vimrc @@ -105,9 +105,6 @@ if exists('+cryptmethod') set cryptmethod=blowfish endif -" Create new split windows on the right (and not left). -set splitright - " Clear all vimrc-related autocmds. Has to be done here as the vimrc augroup " is used multiple times. Necessary to support reloading the vimrc. if has('autocmd') @@ -192,7 +189,7 @@ set formatoptions+=ro " started. set formatoptions+=l " Remove comment leader when joining lines where it makes sense. -if HasVersionAndPatch(703, 541) +if s:HasVersionAndPatch(703, 541) set formatoptions+=j endif @@ -236,6 +233,11 @@ endif " (add ! to override)" warning when switching buffers. set hidden +" When splitting vertically put the new window right of the current one. +if has('vertsplit') + set splitright +endif + " DISPLAY SETTINGS @@ -385,6 +387,23 @@ if has('statusline') endif endfunction + " Display unexpected 'fileformat' and 'fileencoding' settings. + function! s:StatuslineFileFormat() + if &fileformat != 'unix' + return '[' . &fileformat . ']' + else + return '' + endif + endfunction + function! s:StatuslineFileEncoding() + if &fileencoding != '' && &fileencoding != 'utf-8' + \ && &filetype != 'help' + return '[' . &fileencoding . ']' + else + return '' + endif + endfunction + " Return current syntax group in brackets or nothing if there's none. function! s:StatuslineSyntaxGroup() let l:group = synIDattr(synID(line('.'), col('.'), 1), 'name') @@ -397,13 +416,19 @@ if has('statusline') " Short function names to make 'statusline' more readable. function! SBC() - return StatuslineBufferCount() + return s:StatuslineBufferCount() endfunction function! SRF() - return StatuslineRelativeFilename() + return s:StatuslineRelativeFilename() + endfunction + function! SFF() + return s:StatuslineFileFormat() + endfunction + function! SFE() + return s:StatuslineFileEncoding() endfunction function! SSG() - return StatuslineSyntaxGroup() + return s:StatuslineSyntaxGroup() endfunction set statusline= @@ -422,6 +447,12 @@ if has('statusline') set statusline+=%m " [+] if buffer was modified, " [-] if 'modifiable' is off set statusline+=%r " [RO] if buffer is read only + if v:version >= 700 " %#..# needs 7.0 + set statusline+=%#Error# " display warnings + set statusline+=%{SFF()} " - unexpected file format + set statusline+=%{SFE()} " - unexpected file encoding + set statusline+=%## " continue with normal colors + endif " on the right set statusline+=%= " right align @@ -577,12 +608,12 @@ endif " on Freenode for an improved version which doesn't clobber any marks. nnoremap ; :call setline(line('.'), getline('.') . ';') +if has('eval') " * and # for selections in visual mode. Thanks to " http://got-ravings.blogspot.com/2008/07/vim-pr0n-visual-search-mappings.html " and all nerds involved (godlygeek, strull in #vim on Freenode). -if has('eval') function! s:VSetSearch() - let l:temp = @@ + let l:temp = @@ " unnamed register normal! gvy " Added \C to force 'noignorecase' while searching the current visual " selection. I want to search for the exact string in this case. @@ -591,6 +622,16 @@ if has('eval') endfunction vnoremap * :call VSetSearch()// vnoremap # :call VSetSearch()?? + +" Use 'noignorecase' for * and #. See comment in s:VSetSearch() for details. +" Thanks to the writers of s:VSetSearch(), see above. + function! s:NSetSearch() + let l:cword = expand('') + let l:regex = substitute(escape(l:cword, '\'), '\n', '\\n', 'g') + let @/ = '\C\V'. '\<' . l:regex . '\>' + endfunction + nnoremap * :call NSetSearch()// + nnoremap # :call NSetSearch()?? endif " I often type "W" instead of "w" when trying to save a file. Fix my mistake. @@ -730,7 +771,7 @@ if has('syntax') if !&diff && exists(':2match') " Use ColorColumn for overlong lines if available and my color " scheme is used. - if &t_Co == 256 && HasSyntaxGroup('ColorColumn') + if &t_Co == 256 && s:HasSyntaxGroup('ColorColumn') 2match ColorColumn /\%>78v./ else 2match Todo /\%>78v./ @@ -762,17 +803,17 @@ if has('syntax') " Special highlight for tabs to reduce their visibility in contrast to other " SpecialKey characters (e.g. ^L). - if &t_Co == 256 && HasSyntaxGroup('specialKeyTab') + if &t_Co == 256 && s:HasSyntaxGroup('specialKeyTab') call matchadd('specialKeyTab', '\t') endif endif endfunction " Enable highlights for the current and all new windows. Thanks to bairui in " #vim on Freenode (2012-04-01 00:22 CEST) for the WinEnter suggestion. - call CustomSyntaxHighlights() + call s:CustomSyntaxHighlights() if has('autocmd') augroup vimrc - autocmd WinEnter * call CustomSyntaxHighlights() + autocmd WinEnter * call s:CustomSyntaxHighlights() augroup END endif @@ -901,10 +942,10 @@ if has('autocmd') autocmd InsertLeave * set nopaste endif -" Write file when running :mak[e] before 'makeprg' is called. QuickFixCmdPre -" doesn't exist in older Vims. +" Write all files when running :mak[e] before 'makeprg' is called. +" QuickFixCmdPre doesn't exist in older Vims. if exists('##QuickFixCmdPre') - autocmd QuickFixCmdPre * write + autocmd QuickFixCmdPre * wall endif " Don't ignore case while in insert mode, but ignore case in all other modes. @@ -927,11 +968,9 @@ if has('autocmd') return endif - echohl WarningMsg - echo 'Do not edit this file! (Maybe a template file.)' - echohl None + echoerr 'Do not edit this file! (Maybe a template file.)' endfunction - autocmd BufRead * call SearchForDoNotEditHeader() + autocmd BufRead * call s:SearchForDoNotEditHeader() " AFTER/FTPLUGIN AUTO COMMANDS