diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index 3d0b228..c37e6b1 100644
--- a/.vim/filetype.vim
+++ b/.vim/filetype.vim
@@ -2,7 +2,6 @@
 if exists("did\_load\_filetypes")
   finish
 endif
-let b:auto_trim_whitespace=0
 " Filetype mappingss
 augroup markdown
   au! BufRead,BufNewFile *.mkd   setfiletype mkd
diff --git a/.vimrc b/.vimrc
index 21e98e6..69eed33 100644
--- a/.vimrc
+++ b/.vimrc
@@ -83,6 +83,7 @@ let Tlist_Show_One_File = 0
 let g:ConqueTerm_CWInsert = 1
 let g:ConqueTerm_InsertOnEnter = 0
 let g:ConqueTerm_SendVisKey = '<Leader>ss'
+let b:auto_trim_whitespace = 0
 
 "MiniBufExplore Options
 "let g:miniBufExplMapWindowNavVim = 1
@@ -328,7 +329,8 @@ endfunction
 " Removes trailing spaces
 function AutoTrimWhitespace()
   if b:auto_trim_whitespace == 1
-    %s/\s\+$//e
+    m'
+    :%s/\s\+$//e
     ''
   endif
 endfunction