Revert ".vimrc: Set universal encoding for .viminfo"

[dotfiles.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index b25ff63f9d891c1088edfe5d6110d9e1c475dea6..ddcc499e7c7eae18ed621244a1ce718a19db9317 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -612,6 +612,7 @@ if executable('chmod')
          echoerr 'Error running chmod: ' . v:shell_error
       endif
       checktime
+      autocmd! FileChangedShell <buffer>
    endfunction
    function! _BufChangedCB()
       autocmd! FileChangedShell <buffer>
@@ -619,6 +620,15 @@ if executable('chmod')
    command! ToggleXbit if executable(expand("%:p")) | call SetExecutableBit(0) | else | call SetExecutableBit(1) | endif
 endif
 
+function! Code()
+    setlocal tabstop=8 softtabstop=4 shiftwidth=4 expandtab
+endfunction
+command! Code call Code()
+
+function! Text()
+    setlocal tabstop=8 softtabstop=3 shiftwidth=3 expandtab
+endfunction
+command! Text call Text()
 
 " ----------
 " From http://slobin.pp.ru/vim/_vimrc.html
@@ -785,15 +795,5 @@ command! UName Uname
 endif
 " ----------
 
-if has("iconv")
-function! SetViminfoEncoding()
-   " Set universal encoding for .viminfo
-   if &encoding != 'utf-8'
-      set encoding=utf-8
-   endif
-endfunction
-autocmd VimLeavePre * call SetViminfoEncoding()
-endif
-
 " 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