Set globally receive.denyNonFastForwards = true

[dotfiles.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index f064678b59caca2fa064bc47cf5b502e69d338dd..288fb49a3e42d4b81a7060864224df0de5a54dd5 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -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