Minor refactoring

diff --git a/.vim/ftplugin/xml.vim b/.vim/ftplugin/xml.vim
index 02d8ac61080ffa282b65cfd493b9681c642c5cde..9069c202b2d173bca11e80f367588e9713c34d50 100644 (file)
--- a/.vim/ftplugin/xml.vim
+++ b/.vim/ftplugin/xml.vim
@@ -10,8 +10,8 @@ if version >= 702 && has("iconv") && !exists('b:encoding_set')
          " By default XML files are in UTF-8
          let encoding = "UTF-8"
       endif
+      call SetupEncoding(encoding)
    endif
-   call SetupEncoding(encoding)
 endif
 
 setlocal matchpairs+=<:> " Add brokets to the list of pairs that match for the '%' command

diff --git a/.vimrc b/.vimrc
index 288fb49a3e42d4b81a7060864224df0de5a54dd5..eee8502433d658340bd2c56f349e51e7c33daaf1 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -289,15 +289,13 @@ autocmd BufReadPost * call RestorePosition()
 
 
 function! SetupEncoding(encoding)
-   if !has("iconv") || exists('b:encoding_set')
+   if !has("iconv") || exists('b:encoding_set') || strlen(a:encoding) <= 0
       return
    endif
 
-   if strlen(a:encoding) > 0
-      call RestorePosition()
-      let b:encoding_set = 1
-      execute "edit ++enc=" . a:encoding
-   endif
+   call RestorePosition()
+   let b:encoding_set = 1
+   execute "edit ++enc=" . a:encoding
 endfunction