diff --git a/configs/vimrc b/configs/vimrc
index 912eef6..6de169f 100644
--- a/configs/vimrc
+++ b/configs/vimrc
@@ -191,16 +191,16 @@ endfunction
 " spaces are a tab (softtabstop) and break the line at column 78 (textwidth))
 " also, remove all tailing spaces
 au FileType python setlocal expandtab tabstop=4 shiftwidth=4 softtabstop=4 textwidth=78 colorcolumn=79
-au FileType python autocmd BufWritePre * :call TrimWhiteSpace()
+au FileType python autocmd BufWritePre <buffer> :call TrimWhiteSpace()
 
 " Default C/C++ style
 " show a column marker at column 100, break the line at line 100, use tabs
 " instead of sapces and display a "¦" for tabs (this way we can see the lines
 " that are not using real tabs)
 au FileType c setlocal colorcolumn=100 tw=100 noet list
-au FileType c autocmd BufWritePre * :call TrimWhiteSpace()
+au FileType c autocmd BufWritePre <buffer> :call TrimWhiteSpace()
 au FileType cpp setlocal colorcolumn=100 tw=100 noet list
-au FileType cpp autocmd BufWritePre * :call TrimWhiteSpace()
+au FileType cpp autocmd BufWritePre <buffer> :call TrimWhiteSpace()
 
 " Default ReStructured document style
 " reStructured files follow python closely, but use 3 tab stops instead of 4
@@ -247,7 +247,7 @@ au FileType javascript setlocal expandtab tabstop=2 sw=2 sts=2 textwidth=0
 let g:vim_json_syntax_conceal = 0
 autocmd BufNewFile,BufRead *.json set filetype=json
 autocmd Filetype json set et ts=4 sts=4
-autocmd FileType json autocmd BufWritePre * :call TrimWhiteSpace()
+autocmd FileType json autocmd BufWritePre <buffer> :call TrimWhiteSpace()
 
 " Default Pinpoint style
 au BufNewFile,BufRead *.pin set filetype=pinpoint
@@ -255,7 +255,7 @@ au FileType pinpoint setlocal colorcolumn=79 textwidth=78
 
 " Default Yang style
 au FileType yang set et
-au FileType yang autocmd BufWritePre * :call TrimWhiteSpace()
+au FileType yang autocmd BufWritePre <buffer> :call TrimWhiteSpace()
 
 " ----------------------------------------------------------------------
 " mapings