.vimrc: Minor refactoring: reorder options

[dotfiles.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index ab92bd46f9f0723c51a09c5c6d7c376509098253..6a16d72fc7b32845b97bc2c8a213de75be51fe6f 100644 (file)
--- 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