after/syntax/diff.vim: Add highlights for GVim.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 5993bff360d6dea7766e06e228b16d6e293da2d7..40e95ba3c9a798419ca7a1753859c1c8c1ff2fe8 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -189,7 +189,7 @@ set formatoptions+=ro
 " started.
 set formatoptions+=l
 " Remove comment leader when joining lines where it makes sense.
-if <SID>HasVersionAndPatch(703, 541)
+if s:HasVersionAndPatch(703, 541)
     set formatoptions+=j
 endif
 
@@ -387,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')
@@ -399,13 +416,19 @@ if has('statusline')
 
     " Short function names to make 'statusline' more readable.
     function! SBC()
-        return <SID>StatuslineBufferCount()
+        return s:StatuslineBufferCount()
     endfunction
     function! SRF()
-        return <SID>StatuslineRelativeFilename()
+        return s:StatuslineRelativeFilename()
+    endfunction
+    function! SFF()
+        return s:StatuslineFileFormat()
+    endfunction
+    function! SFE()
+        return s:StatuslineFileEncoding()
     endfunction
     function! SSG()
-        return <SID>StatuslineSyntaxGroup()
+        return s:StatuslineSyntaxGroup()
     endfunction
 
     set statusline=
@@ -424,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
@@ -579,10 +608,10 @@ endif
 " on Freenode for an improved version which doesn't clobber any marks.
 nnoremap <silent> <Leader>; :call setline(line('.'), getline('.') . ';')<CR>
 
+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 = @@ " unnamed register
         normal! gvy
@@ -593,6 +622,16 @@ if has('eval')
     endfunction
     vnoremap * :<C-U>call <SID>VSetSearch()<CR>//<CR>
     vnoremap # :<C-U>call <SID>VSetSearch()<CR>??<CR>
+
+" 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('<cword>')
+        let l:regex = substitute(escape(l:cword, '\'), '\n', '\\n', 'g')
+        let @/ = '\C\V'. '\<' . l:regex . '\>'
+    endfunction
+    nnoremap * :call <SID>NSetSearch()<CR>//<CR>
+    nnoremap # :call <SID>NSetSearch()<CR>??<CR>
 endif
 
 " I often type "W" instead of "w" when trying to save a file. Fix my mistake.
@@ -732,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 && <SID>HasSyntaxGroup('ColorColumn')
+            if &t_Co == 256 && s:HasSyntaxGroup('ColorColumn')
                 2match ColorColumn /\%>78v./
             else
                 2match Todo /\%>78v./
@@ -764,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 && <SID>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 <SID>CustomSyntaxHighlights()
+    call s:CustomSyntaxHighlights()
     if has('autocmd')
         augroup vimrc
-            autocmd WinEnter * call <SID>CustomSyntaxHighlights()
+            autocmd WinEnter * call s:CustomSyntaxHighlights()
         augroup END
     endif
 
@@ -931,7 +970,7 @@ if has('autocmd')
 
             echoerr 'Do not edit this file! (Maybe a template file.)'
         endfunction
-        autocmd BufRead * call <SID>SearchForDoNotEditHeader()
+        autocmd BufRead * call s:SearchForDoNotEditHeader()
 
 " AFTER/FTPLUGIN AUTO COMMANDS