X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.vimrc;h=d86e0bb8c1843ea9ce3753d0cc8375455cc5726c;hb=16862d6c73ccda3803e4618d16b080a90fe9d84f;hp=288fb49a3e42d4b81a7060864224df0de5a54dd5;hpb=491e96e877838c3c1597ece3f875abb930d24122;p=dotfiles.git

diff --git a/.vimrc b/.vimrc
index 288fb49..d86e0bb 100644
--- a/.vimrc
+++ b/.vimrc
@@ -204,15 +204,17 @@ else
          \ || has("win32")
       " Background of the terminal is black or dark grey
       set background=dark
+      highlight MoreMsg ctermfg=white
+      highlight ModeMsg ctermfg=white
+      highlight Question ctermfg=white
    else
       set background=light
+      highlight MoreMsg cterm=bold ctermfg=NONE
+      highlight Question cterm=bold ctermfg=NONE
    endif
 
    if (&term =~ "linux")
       execute 'set t_kb=' . nr2char(127)
-   else
-      highlight MoreMsg cterm=bold ctermfg=NONE
-      highlight Question cterm=bold ctermfg=NONE
    endif
 
    if (&term =~ "rxvt") || (&term =~ "screen") || (&term =~ "term") || (&term =~ "vt100")
@@ -289,15 +291,13 @@ autocmd BufReadPost * call RestorePosition()
 
 
 function! SetupEncoding(encoding)
-   if !has("iconv") || exists('b:encoding_set')
+   if !has("iconv") || exists('b:encoding_set') || strlen(a:encoding) == 0
       return
    endif
 
-   if strlen(a:encoding) > 0
-      call RestorePosition()
-      let b:encoding_set = 1
-      execute "edit ++enc=" . a:encoding
-   endif
+   call RestorePosition()
+   let b:encoding_set = 1
+   execute "edit ++enc=" . a:encoding
 endfunction
 
 
@@ -567,6 +567,8 @@ endif
 function! AutoEncoding()
   if &modified && &fileencoding != ""
     call SetupEncoding(&fileencoding)
+  else
+    redraw
   endif
   autocmd! auto-encoding
   augroup! auto-encoding
@@ -725,14 +727,5 @@ command! UName call Uname()
 endif
 " ----------
 
-augroup redraw-once
-autocmd!
-" Redraw screen after all macros in ~/.vimrc and ~/.vim/
-autocmd BufReadPost * redraw
-" Remove the redraw autocommand (it's only needed once) and the group
-autocmd BufReadPost * autocmd! redraw-once
-autocmd BufReadPost * augroup! redraw-once
-augroup END
-
 " This has to go to the very end of ~/.vimrc to allow reading the .vimrc
 set secure        " safer working with script files in the current directory