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

diff --git a/.vimrc b/.vimrc
index c365a95..288fb49 100644
--- a/.vimrc
+++ b/.vimrc
@@ -471,7 +471,7 @@ if version >= 700
 function! W()
    " let encodings=filter(split(&fileencodings, ','), 'v:val != "ucs-bom"')
    let encodings = ['us-ascii']
-   if $LC_CTYPE == 'ru_RU.UTF-8'
+   if $LC_CTYPE =~ 'UTF-8' " UTF-8 or en_US.UTF-8 or ru_RU.UTF-8 or such
       let encodings += ['utf-8']
    elseif $LC_CTYPE == 'ru_RU.KOI8-R'
       let encodings += ['koi8-r', 'utf-8']
@@ -563,19 +563,19 @@ endif
 
 
 " Called automagically after every buffer read, enables fileencoding
-" setting from modeline (see Tip #911)
+" setting from modeline (see Tip #911: http://vim.wikia.com/wiki/VimTip911)
 function! AutoEncoding()
-  if exists("b:justloaded")
-    unlet b:justloaded
-    if &modified && &fileencoding != ""
-      call SetupEncoding(&fileencoding)
-    endif
+  if &modified && &fileencoding != ""
+    call SetupEncoding(&fileencoding)
   endif
+  autocmd! auto-encoding
+  augroup! auto-encoding
 endfunction
 
-" Magic autocommands installed here
-autocmd BufReadPost * let b:justloaded = 1
+augroup auto-encoding
+autocmd!
 autocmd BufWinEnter * call AutoEncoding()
+augroup END
 
 
 let CONVERT=1
@@ -729,7 +729,7 @@ 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 autgroup
+" Remove the redraw autocommand (it's only needed once) and the group
 autocmd BufReadPost * autocmd! redraw-once
 autocmd BufReadPost * augroup! redraw-once
 augroup END