Merge branch 'master' of tardis:/dotfiles

diff --git a/vim/filetype.vim b/vim/filetype.vim
index e62ec35ea746c4c739607fe2a3e8d5a475d82e6b..bd367086278dcdc3a5273474ab06f708795d2653 100644 (file)
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -2,12 +2,12 @@ if exists("did_load_filetypes")
     finish
 endif
 augroup filetypedetect
-    autocmd! BufNewFile,BufRead *.launch  setfiletype roslaunch
     autocmd! BufNewFile,BufRead PKGBUILD* setfiletype PKGBUILD
 augroup END
 
 augroup ft_ros
     autocmd! BufNewFile,BufRead */ros/*.cpp setfiletype cpp.roscpp
     autocmd! BufNewFile,BufRead */ros/*.h   setfiletype cpp.roscpp
+    autocmd! BufNewFile,BufRead *.launch    setfiletype roslaunch
     autocmd! BufNewFile,BufRead package.xml setfiletype rospackage
 augroup END