X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.vimrc;h=6a16d72fc7b32845b97bc2c8a213de75be51fe6f;hb=6166d74edb020d8c6042333d72ef424363dd92e8;hp=c4e396cc393523f8c4014a525f518d21445bbfe9;hpb=8f07462da993224ab6e265a34f49915a76ddb3a4;p=dotfiles.git

diff --git a/.vimrc b/.vimrc
index c4e396c..6a16d72 100644
--- a/.vimrc
+++ b/.vimrc
@@ -621,12 +621,12 @@ if executable('chmod')
 endif
 
 function! Code()
-    setlocal tabstop=8 softtabstop=4 shiftwidth=4 expandtab
+    setlocal expandtab tabstop=8 softtabstop=4 shiftwidth=4
 endfunction
 command! Code call Code()
 
 function! Text()
-    setlocal tabstop=8 softtabstop=3 shiftwidth=3 expandtab
+    setlocal expandtab tabstop=8 softtabstop=3 shiftwidth=3
 endfunction
 command! Text call Text()
 
@@ -795,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