From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Tue, 16 Dec 2014 14:08:15 +0000 (+0000)
Subject: Merge branch 'master' of tardis:/dotfiles
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/79576a460da69ad9e5862ab7bfb30788c8367c77?hp=77941ca461b6e164533bbc88b08b9ba69490a07c

Merge branch 'master' of tardis:/dotfiles
---

diff --git a/vim/filetype.vim b/vim/filetype.vim
index e62ec35..bd36708 100644
--- 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