vim: remove clutter from roslaunch indent and syntax

diff --git a/vim/indent/roslaunch.vim b/vim/indent/roslaunch.vim
index 6a4393bcb12dd1bbe666822a167765fb5b5c0c60..de1ae9b05d0e144100ad43694d7ab847bedcba87 100644 (file)
--- a/vim/indent/roslaunch.vim
+++ b/vim/indent/roslaunch.vim
@@ -1,4 +1,3 @@
-

 " Use XML indentation rules
 
 if exists("b:did_indent")
 " Use XML indentation rules
 
 if exists("b:did_indent")


@@ -7,25 +6,3 @@ endif
 
 " load the XML indent rules
 runtime! indent/xml.vim
 
 " load the XML indent rules
 runtime! indent/xml.vim

-runtime! indent/yaml.vim
-
-" override the vim indent expression (we'll call it ourselves)
-setlocal indentexpr=GetRoslaunchIndent(v:lnum)
-
-" Only define the function once.
-if exists("*GetRoslaunchIndent")
-  finish
-endif
-
-" wiki-indent will return vim indent inside a <pre> block,
-" and return -1 if not inside a block to trigger auto-indent
-function GetRoslaunchIndent(lnum)
-  return -1
-  if searchpair('<rosparam>','','</rosparam>','bWnm') > 0
-    return GetYAMLIndent(lnum)
-  else
-    return -1
-  endif
-endfunc
-
-

diff --git a/vim/syntax/roslaunch.vim b/vim/syntax/roslaunch.vim
index c9acdd17c0c8eeb3c90a85eacf888f546ded0852..8a63e87c34fd595867b5aeb1adcd725429d9b219 100644 (file)
--- a/vim/syntax/roslaunch.vim
+++ b/vim/syntax/roslaunch.vim
@@ -13,12 +13,3 @@ if exists("b:current_syntax")
 endif
 
 runtime syntax/xml.vim
 endif
 
 runtime syntax/xml.vim

-
-let s:current_syntax=b:current_syntax
-unlet b:current_syntax
-
-syntax include @YAML syntax/yaml.vim
-syntax region ymlSnipInline matchgroup=rosparamTag start="\m<.\{-}rosparam.\{-}>" end="\m</.\{-}rosparam.\{-}>" contains=@YAML containedin=xmlEntity
-hi link rosparamTag ModeMsg
-
-let b:current_syntax=s:current_syntax