Vim syntax: Fix angleBrackets and vars regex.

Fixes #6386

Signed-off-by: Michael Friedrich <michael.friedrich@netways.de>