Fix more 'cpo' issues in runtime files.
diff --git a/runtime/syntax/dtd.vim b/runtime/syntax/dtd.vim
index 76778ba..001dbbd 100644
--- a/runtime/syntax/dtd.vim
+++ b/runtime/syntax/dtd.vim
@@ -13,17 +13,11 @@
" TODO:
" - improve synchronizing.
-if version < 600
- syntax clear
- let __dtd_cpo_save__ = &cpo
- set cpo&
-else
- if exists("b:current_syntax")
- finish
- endif
- let s:dtd_cpo_save = &cpo
- set cpo&vim
+if exists("b:current_syntax")
+ finish
endif
+let s:dtd_cpo_save = &cpo
+set cpo&vim
if !exists("dtd_ignore_case")
" I prefer having the case takes into consideration.
@@ -168,13 +162,8 @@
delcommand HiLink
endif
-if version < 600
- let &cpo = __dtd_cpo_save__
- unlet __dtd_cpo_save__
-else
- let &cpo = s:dtd_cpo_save
- unlet s:dtd_cpo_save
-endif
+let &cpo = s:dtd_cpo_save
+unlet s:dtd_cpo_save
let b:current_syntax = "dtd"
diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim
index ddaad89..8d85d02 100644
--- a/runtime/syntax/help.vim
+++ b/runtime/syntax/help.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Vim help file
" Maintainer: Bram Moolenaar (Bram@vim.org)
-" Last Change: 2012 Apr 25
+" Last Change: 2012 May 18
" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
@@ -25,10 +25,10 @@
syn match helpHyperTextEntry "\*[#-)!+-~]\+\*$" contains=helpStar
endif
if has("conceal")
- syn match helpBar contained "|" conceal
+ syn match helpBar contained "[|`]" conceal
syn match helpStar contained "\*" conceal
else
- syn match helpBar contained "|"
+ syn match helpBar contained "[|`]"
syn match helpStar contained "\*"
endif
syn match helpNormal "|.*====*|"
@@ -38,7 +38,7 @@
syn match helpVim "VIM REFERENCE.*"
syn match helpOption "'[a-z]\{2,\}'"
syn match helpOption "'t_..'"
-syn match helpCommand "`[^` ]*`"hs=s+1,he=e-1
+syn match helpCommand "`[^` ]*`"hs=s+1,he=e-1 contains=helpBar
syn match helpHeader "\s*\zs.\{-}\ze\s\=\~$" nextgroup=helpIgnore
syn match helpGraphic ".* \ze`$" nextgroup=helpIgnore
if has("conceal")