From 2df58b4a58e376e475a3cc0ccb86d991d65b1b77 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 28 Nov 2012 18:21:11 +0100
Subject: [PATCH] Updated runtime files.

---
 runtime/doc/eval.txt         |  17 ++--
 runtime/doc/helphelp.txt     |  13 +--
 runtime/doc/syntax.txt       |   6 +-
 runtime/doc/tags             |   4 +
 runtime/doc/todo.txt         |  37 +++----
 runtime/doc/usr_05.txt       |   5 +-
 runtime/filetype.vim         |  15 ++-
 runtime/ftplugin/mail.vim    |   7 +-
 runtime/syntax/docbk.vim     | 192 ++++++++++++++++++++++-------------
 runtime/tutor/tutor.ja.euc   |  16 +--
 runtime/tutor/tutor.ja.sjis  |  16 +--
 runtime/tutor/tutor.ja.utf-8 |  16 +--
 12 files changed, 211 insertions(+), 133 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index bf89ee6bfa..94c8f3129a 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 7.3.  Last change: 2012 Nov 14
+*eval.txt*	For Vim version 7.3.  Last change: 2012 Nov 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -4878,9 +4878,9 @@ search({pattern} [, {flags} [, {stopline} [, {timeout}]]])	*search()*
 		Search for regexp pattern {pattern}.  The search starts at the
 		cursor position (you can use |cursor()| to set it).
 
+		When a match has been found its line number is returned.
 		If there is no match a 0 is returned and the cursor doesn't
 		move.  No error message is given.
-		When a match has been found its line number is returned.
 
 		{flags} is a String, which can contain these character flags:
 		'b'	search backward instead of forward
@@ -5694,8 +5694,10 @@ substitute({expr}, {pat}, {sub}, {flags})		*substitute()*
 		This works like the ":substitute" command (without any flags).
 		But the matching with {pat} is always done like the 'magic'
 		option is set and 'cpoptions' is empty (to make scripts
-		portable).  'ignorecase' is still relevant.  'smartcase' is
-		not used.  See |string-match| for how {pat} is used.
+		portable).  'ignorecase' is still relevant, use |/\c| or |/\C|
+		if you want to ignore or match case and ignore 'ignorecase'.
+		'smartcase' is not used.  See |string-match| for how {pat} is
+		used.
 
 		A "~" in {sub} is not replaced with the previous {sub}.
 		Note that some codes in {sub} have a special meaning
@@ -6160,8 +6162,9 @@ winline()	The result is a Number, which is the screen line of the cursor
 winnr([{arg}])	The result is a Number, which is the number of the current
 		window.  The top window has number 1.
 		When the optional argument is "$", the number of the
-		last window is returned (the window count).
-		When the optional argument is "#", the number of the last
+		last window is returned (the window count). >
+			let window_count = winnr('$')
+<		When the optional argument is "#", the number of the last
 		accessed window is returned (where |CTRL-W_p| goes to).
 		If there is no previous window or it is in another tab page 0
 		is returned.
@@ -6532,6 +6535,8 @@ See |:verbose-cmd| for more information.
 			is excluded, ":{range}call" will call the function for
 			each line in the range, with the cursor on the start
 			of each line.  See |function-range-example|.
+			The cursor is still moved to the first line of the
+			range, as is the case with all Ex commands.
 
 			When the [abort] argument is added, the function will
 			abort as soon as an error is detected.
diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt
index 437964d1e2..311d86ca3c 100644
--- a/runtime/doc/helphelp.txt
+++ b/runtime/doc/helphelp.txt
@@ -1,4 +1,4 @@
-*helphelp.txt*	For Vim version 7.3.  Last change: 2012 May 18
+*helphelp.txt*	For Vim version 7.3.  Last change: 2012 Nov 28
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -194,11 +194,12 @@ command: >
 				*E154* *E150* *E151* *E152* *E153* *E670*
 :helpt[ags] [++t] {dir}
 			Generate the help tags file(s) for directory {dir}.
-			All "*.txt" and "*.??x" files in the directory are
-			scanned for a help tag definition in between stars.
-			The "*.??x" files are for translated docs, they
-			generate the "tags-??" file, see |help-translated|.
-			The generated tags files are sorted.
+			All "*.txt" and "*.??x" files in the directory and
+			sub-directories are scanned for a help tag definition
+			in between stars.  The "*.??x" files are for
+			translated docs, they generate the "tags-??" file, see
+			|help-translated|.  The generated tags files are
+			sorted.
 			When there are duplicates an error message is given.
 			An existing tags file is silently overwritten.
 			The optional "++t" argument forces adding the
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 3e15868511..5b565859e4 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.3.  Last change: 2012 Nov 02
+*syntax.txt*	For Vim version 7.3.  Last change: 2012 Nov 28
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1090,6 +1090,10 @@ Simpler is setting the filetype to "docbkxml" or "docbksgml": >
 or: >
 	:set filetype=docbkxml
 
+You can specify the DocBook version: >
+	:let docbk_ver = 3
+When not set 4 is used.
+
 
 DOSBATCH				*dosbatch.vim* *ft-dosbatch-syntax*
 
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 4d0c4d04d7..9e33ec746b 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5728,6 +5728,7 @@ ft-quake-syntax	syntax.txt	/*ft-quake-syntax*
 ft-r-indent	indent.txt	/*ft-r-indent*
 ft-readline-syntax	syntax.txt	/*ft-readline-syntax*
 ft-rexx-syntax	syntax.txt	/*ft-rexx-syntax*
+ft-rst-syntax	syntax.txt	/*ft-rst-syntax*
 ft-ruby-omni	insert.txt	/*ft-ruby-omni*
 ft-ruby-syntax	syntax.txt	/*ft-ruby-syntax*
 ft-scheme-syntax	syntax.txt	/*ft-scheme-syntax*
@@ -5872,6 +5873,7 @@ g:netrw_cygwin	pi_netrw.txt	/*g:netrw_cygwin*
 g:netrw_dav_cmd	pi_netrw.txt	/*g:netrw_dav_cmd*
 g:netrw_decompress	pi_netrw.txt	/*g:netrw_decompress*
 g:netrw_dirhistmax	pi_netrw.txt	/*g:netrw_dirhistmax*
+g:netrw_dynamic_maxfilenamelen	pi_netrw.txt	/*g:netrw_dynamic_maxfilenamelen*
 g:netrw_errorlvl	pi_netrw.txt	/*g:netrw_errorlvl*
 g:netrw_fastbrowse	pi_netrw.txt	/*g:netrw_fastbrowse*
 g:netrw_fetch_cmd	pi_netrw.txt	/*g:netrw_fetch_cmd*
@@ -6840,6 +6842,7 @@ netrw-R	pi_netrw.txt	/*netrw-R*
 netrw-S	pi_netrw.txt	/*netrw-S*
 netrw-T	pi_netrw.txt	/*netrw-T*
 netrw-U	pi_netrw.txt	/*netrw-U*
+netrw-X	pi_netrw.txt	/*netrw-X*
 netrw-a	pi_netrw.txt	/*netrw-a*
 netrw-activate	pi_netrw.txt	/*netrw-activate*
 netrw-bookmark	pi_netrw.txt	/*netrw-bookmark*
@@ -7426,6 +7429,7 @@ rileft.txt	rileft.txt	/*rileft.txt*
 riscos	os_risc.txt	/*riscos*
 rot13	change.txt	/*rot13*
 round()	eval.txt	/*round()*
+rst.vim	syntax.txt	/*rst.vim*
 rsync	pi_netrw.txt	/*rsync*
 ruby	if_ruby.txt	/*ruby*
 ruby-buffer	if_ruby.txt	/*ruby-buffer*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 4a221e8907..da8810279c 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.3.  Last change: 2012 Nov 15
+*todo.txt*      For Vim version 7.3.  Last change: 2012 Nov 28
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -45,30 +45,20 @@ GTK: problem with 'L' in 'guioptions' changing the window width.
 
 Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
 
-Patches for two problems, with explanations. (Christian Brabandt, 2012 Oct 22)
-
 The CompleteDone autocommand needs some info passed to it:
 - The word that was selected (empty if abandoned complete)
 - Type of completion: tag, omnifunc, user func.
 
-Unwanted file name escaping: ":echo input('file:' , '', 'file')"
-And use file name completion on a file with spaces. (Frederic Hardy, 2009 Mar
-23)
-Patch by Christian Brabandt, 2012 Oct 18.  Update Oct 19.
-
-Patch to reset did_endif. (Christian Brabandt,, 2012 Oct 23)
-How about a test?
-
 Patch for Tab behavior with 'conceal'. (Dominique Pelle, 2012 Mar 18)
 Patch to test functionality of 'conceal' with tabs. (Simon Ruderich, 2012 Sep
 5)  Update with screencol() and screenrow() functions: Sep 7.
 
-Patch for integer overflow in move.c. (Dominique Pelle, 2012 Nov 6)
-
 Patch for undefined integer behavior. (Dominique Pelle, 2012 Nov 4, second one)
 
 Patch to have Python interface not depend on multi-byte.
 
+Patch to fix justify.vim. (James McCoy, 2012 Nov 23)
+
 mouse_sgr is not ordered alphabetically in :version output.
 Docs list mouse_urxvt as normal feature, should be big. (Hayaki Saito, 2012
 Aug 16)
@@ -82,6 +72,12 @@ Also remove the "rc" variable.
 
 Crash with vimdiff. (Don Cruickshank, 2012 Sep 23)
 
+Patch to support subdirectories for help files. (Charles Campbell, 2012 Nov
+21)
+
+Patch for mzscheme.  (Sergey Khorev, 2012 Nov 19)
+What about ignoring SEGV?
+
 Win32: use 'guifontwide' for IME composition. (Taro Muraoka, 2012 Sep 30)
 Update Oct 2.
 
@@ -98,6 +94,9 @@ Win32: When a directory name contains an exclamation mark, completion doesn't
 complete the contents of the directory.  No escaping for the "!"? (Jan
 Stocker, 2012 Jan 5)
 
+Problem parsing expression with function(). (Andy Wokula, 2012 Nov 22)
+Patch by Christian Brabandt, Nov 22.  Tests in another patch, Nov 23.
+
 Problem caused by patch 7.3.638: window->open does not update window
 correctly. Issue 91.
 
@@ -121,6 +120,11 @@ then Sep 1, reminder Oct 14)
 
 Issue 72: 'autochdir' causes problems for :vimgrep.
 
+Undo problem: line not removed as expected when using setline() from Insert
+mode. (Israel Chauca, 2010 May 13, more in second msg)
+Break undo when CTRL-R = changes the text?  Or save more lines?
+Patch by Christian Brabandt, 2012 Nov 16.
+
 In the ATTENTION message about an existing swap file, mention the name of the
 process that is running.  It might actually be some other program, e.g. after
 a reboot.
@@ -328,6 +332,9 @@ Oct 26)
 
 Bug in repeating Visual "u". (Lawrence Kesteloot, 2010 Dec 20)
 
+Using "p" in Visual mode while specifying the small delete register "-
+overwrites the register before it is put. (Marcin Szamotulski, 2012 Nov 23)
+
 With "unamedplus" in 'clipboard' pasting in Visual mode causes error for empty
 register. (Michael Seiwald, 2011 Jun 28)  I can't reproduce it.
 
@@ -673,10 +680,6 @@ Problem with stop directory in findfile(). (Adam Simpkins, 2009 Aug 26)
 Using ']' as the end of a range in a pattern requires double escaping:
      /[@-\\]]  (Andy Wokula, 2011 Jun 28)
 
-Undo problem: line not removed as expected when using setline() from Insert
-mode. (Israel Chauca, 2010 May 13, more in second msg)
-Break undo when CTRL-R = changes the text?  Or save more lines?
-
 Slow combination of folding and PHP syntax highlighting.  Script to reproduce
 it.  Caused by "syntax sync fromstart" in combination with patch 7.2.274.
 (Christian Brabandt, 2010 May 27)
diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index b0f27d1fce..45bcc17491 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -1,4 +1,4 @@
-*usr_05.txt*	For Vim version 7.3.  Last change: 2009 Jun 04
+*usr_05.txt*	For Vim version 7.3.  Last change: 2012 Nov 20
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -49,8 +49,7 @@ For MS-DOS and MS-Windows you can use one of these:
 
 The vimrc file can contain all the commands that you type after a colon.  The
 most simple ones are for setting options.  For example, if you want Vim to
-always start with the 'incsearch' option on, add this line you your vimrc
-file: >
+always start with the 'incsearch' option on, add this line your vimrc file: >
 
 	set incsearch
 
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 1f59290916..221c0cafc6 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 Oct 05
+" Last Change:	2012 Nov 28
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -1745,7 +1745,8 @@ au BufNewFile,BufRead *.sgm,*.sgml
 	\ if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'linuxdoc' |
 	\   setf sgmllnx |
 	\ elseif getline(1) =~ '<!DOCTYPE.*DocBook' || getline(2) =~ '<!DOCTYPE.*DocBook' |
-	\   let b:docbk_type="sgml" |
+	\   let b:docbk_type = "sgml" |
+	\   let b:docbk_ver = 4 |
 	\   setf docbk |
 	\ else |
 	\   setf sgml |
@@ -2307,8 +2308,16 @@ func! s:FTxml()
   let n = 1
   while n < 100 && n < line("$")
     let line = getline(n)
-    if line =~ '<!DOCTYPE.*DocBook'
+    " DocBook 4 or DocBook 5.
+    let is_docbook4 = line =~ '<!DOCTYPE.*DocBook'
+    let is_docbook5 = line =~ ' xmlns="http://docbook.org/ns/docbook"'
+    if is_docbook4 || is_docbook5
       let b:docbk_type = "xml"
+      if is_docbook5
+	let b:docbk_ver = 5
+      else
+	let b:docbk_ver = 4
+      endif
       setf docbk
       return
     endif
diff --git a/runtime/ftplugin/mail.vim b/runtime/ftplugin/mail.vim
index 4a4c85195c..2a6bf4c046 100644
--- a/runtime/ftplugin/mail.vim
+++ b/runtime/ftplugin/mail.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	Mail
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2009 Jun 03
+" Last Change:	2012 Nov 20
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -9,7 +9,7 @@ if exists("b:did_ftplugin")
 endif
 let b:did_ftplugin = 1
 
-let b:undo_ftplugin = "setl modeline< tw< fo<"
+let b:undo_ftplugin = "setl modeline< tw< fo< comments<"
 
 " Don't use modelines in e-mail messages, avoid trojan horses and nasty
 " "jokes" (e.g., setting 'textwidth' to 5).
@@ -23,6 +23,9 @@ endif
 " Set 'formatoptions' to break text lines and keep the comment leader ">".
 setlocal fo+=tcql
 
+" Add n:> to 'comments, in case it was removed elsewhere
+setlocal comments+=n:>
+
 " Add mappings, unless the user doesn't want this.
 if !exists("no_plugin_maps") && !exists("no_mail_maps")
   " Quote text by inserting "> "
diff --git a/runtime/syntax/docbk.vim b/runtime/syntax/docbk.vim
index 73c1cb4751..fc679eecaf 100644
--- a/runtime/syntax/docbk.vim
+++ b/runtime/syntax/docbk.vim
@@ -1,9 +1,10 @@
 " Vim syntax file
 " Language:	DocBook
 " Maintainer:	Devin Weaver <vim@tritarget.com>
+" Last Updated By: Shlomi Fish
 " URL:		http://tritarget.com/pub/vim/syntax/docbk.vim
-" Last Change:	$Date: 2005/06/23 22:31:01 $
-" Version:	$Revision: 1.2 $
+" Last Change:	2012 Nov 28
+" Version:	1.2 (and modified after that)
 " Thanks to Johannes Zellner <johannes@zellner.org> for the default to XML
 " suggestion.
 
@@ -28,6 +29,15 @@ if !exists('b:docbk_type')
     let b:docbk_type = 'xml'
   endif
 endif
+
+if !exists('b:docbk_ver')
+  if exists('docbk_ver')
+    let b:docbk_ver = docbk_ver
+  else
+    let b:docbk_ver = 4
+  endif
+end
+
 if 'xml' == b:docbk_type
     doau Syntax xml
     syn cluster xmlTagHook add=docbkKeyword
@@ -40,81 +50,121 @@ elseif 'sgml' == b:docbk_type
     syn case ignore
 endif
 
-" <comment> has been removed and replace with <remark> in DocBook 4.0
-" <comment> kept for backwards compatability.
-syn keyword docbkKeyword abbrev abstract accel ackno acronym action contained
-syn keyword docbkKeyword address affiliation alt anchor answer appendix contained
-syn keyword docbkKeyword application area areaset areaspec arg artheader contained
-syn keyword docbkKeyword article articleinfo artpagenums attribution audiodata contained
-syn keyword docbkKeyword audioobject author authorblurb authorgroup contained
-syn keyword docbkKeyword authorinitials beginpage bibliodiv biblioentry contained
-syn keyword docbkKeyword bibliography bibliomisc bibliomixed bibliomset contained
-syn keyword docbkKeyword biblioset blockquote book bookbiblio bookinfo contained
-syn keyword docbkKeyword bridgehead callout calloutlist caption caution contained
-syn keyword docbkKeyword chapter citation citerefentry citetitle city contained
-syn keyword docbkKeyword classname cmdsynopsis co collab collabname contained
-syn keyword docbkKeyword colophon colspec command comment computeroutput contained
-syn keyword docbkKeyword confdates confgroup confnum confsponsor conftitle contained
-syn keyword docbkKeyword constant contractnum contractsponsor contrib contained
-syn keyword docbkKeyword copyright corpauthor corpname country database contained
-syn keyword docbkKeyword date dedication docinfo edition editor email contained
-syn keyword docbkKeyword emphasis entry entrytbl envar epigraph equation contained
-syn keyword docbkKeyword errorcode errorname errortype example fax figure contained
-syn keyword docbkKeyword filename firstname firstterm footnote footnoteref contained
+syn keyword docbkKeyword abbrev abstract accel acronym address contained
+syn keyword docbkKeyword affiliation alt anchor answer appendix contained
+syn keyword docbkKeyword application area areaset areaspec arg contained
+syn keyword docbkKeyword article artpagenums attribution audiodata contained
+syn keyword docbkKeyword audioobject author authorgroup contained
+syn keyword docbkKeyword authorinitials bibliocoverage bibliodiv contained
+syn keyword docbkKeyword biblioentry bibliography biblioid contained
+syn keyword docbkKeyword bibliolist bibliomisc bibliomixed contained
+syn keyword docbkKeyword bibliomset biblioref bibliorelation contained
+syn keyword docbkKeyword biblioset bibliosource blockquote book contained
+syn keyword docbkKeyword bridgehead callout calloutlist caption contained
+syn keyword docbkKeyword caution chapter citation citebiblioid contained
+syn keyword docbkKeyword citerefentry citetitle city classname contained
+syn keyword docbkKeyword classsynopsis classsynopsisinfo cmdsynopsis contained
+syn keyword docbkKeyword co code col colgroup collab colophon contained
+syn keyword docbkKeyword colspec command computeroutput confdates contained
+syn keyword docbkKeyword confgroup confnum confsponsor conftitle contained
+syn keyword docbkKeyword constant constructorsynopsis contractnum contained
+syn keyword docbkKeyword contractsponsor contrib copyright coref contained
+syn keyword docbkKeyword country database date dedication contained
+syn keyword docbkKeyword destructorsynopsis edition editor email contained
+syn keyword docbkKeyword emphasis entry entrytbl envar epigraph contained
+syn keyword docbkKeyword equation errorcode errorname errortext contained
+syn keyword docbkKeyword errortype example exceptionname fax contained
+syn keyword docbkKeyword fieldsynopsis figure filename firstname contained
+syn keyword docbkKeyword firstterm footnote footnoteref contained
 syn keyword docbkKeyword foreignphrase formalpara funcdef funcparams contained
 syn keyword docbkKeyword funcprototype funcsynopsis funcsynopsisinfo contained
-syn keyword docbkKeyword function glossary glossdef glossdiv glossentry contained
-syn keyword docbkKeyword glosslist glosssee glossseealso glossterm graphic contained
-syn keyword docbkKeyword graphicco group guibutton guiicon guilabel contained
+syn keyword docbkKeyword function glossary glossdef glossdiv contained
+syn keyword docbkKeyword glossentry glosslist glosssee glossseealso contained
+syn keyword docbkKeyword glossterm group guibutton guiicon guilabel contained
 syn keyword docbkKeyword guimenu guimenuitem guisubmenu hardware contained
-syn keyword docbkKeyword highlights holder honorific imagedata imageobject contained
-syn keyword docbkKeyword imageobjectco important index indexdiv indexentry contained
-syn keyword docbkKeyword indexterm informalequation informalexample contained
-syn keyword docbkKeyword informalfigure informaltable inlineequation contained
-syn keyword docbkKeyword inlinegraphic inlinemediaobject interface contained
-syn keyword docbkKeyword interfacedefinition invpartnumber isbn issn contained
-syn keyword docbkKeyword issuenum itemizedlist itermset jobtitle keycap contained
-syn keyword docbkKeyword keycode keycombo keysym keyword keywordset label contained
-syn keyword docbkKeyword legalnotice lineage lineannotation link listitem contained
-syn keyword docbkKeyword literal literallayout lot lotentry manvolnum contained
-syn keyword docbkKeyword markup medialabel mediaobject mediaobjectco contained
-syn keyword docbkKeyword member menuchoice modespec mousebutton msg msgaud contained
-syn keyword docbkKeyword msgentry msgexplan msginfo msglevel msgmain contained
-syn keyword docbkKeyword msgorig msgrel msgset msgsub msgtext note contained
-syn keyword docbkKeyword objectinfo olink option optional orderedlist contained
-syn keyword docbkKeyword orgdiv orgname otheraddr othercredit othername contained
-syn keyword docbkKeyword pagenums para paramdef parameter part partintro contained
-syn keyword docbkKeyword phone phrase pob postcode preface primary contained
-syn keyword docbkKeyword primaryie printhistory procedure productname contained
-syn keyword docbkKeyword productnumber programlisting programlistingco contained
-syn keyword docbkKeyword prompt property pubdate publisher publishername contained
-syn keyword docbkKeyword pubsnumber qandadiv qandaentry qandaset question contained
-syn keyword docbkKeyword quote refclass refdescriptor refentry contained
+syn keyword docbkKeyword holder honorific imagedata imageobject contained
+syn keyword docbkKeyword imageobjectco important index indexdiv contained
+syn keyword docbkKeyword indexentry indexterm informalequation contained
+syn keyword docbkKeyword informalexample informalfigure contained
+syn keyword docbkKeyword informaltable initializer inlineequation contained
+syn keyword docbkKeyword inlinemediaobject interfacename issuenum contained
+syn keyword docbkKeyword itemizedlist itermset jobtitle keycap contained
+syn keyword docbkKeyword keycode keycombo keysym keyword keywordset contained
+syn keyword docbkKeyword label legalnotice lineage lineannotation contained
+syn keyword docbkKeyword link listitem literal literallayout contained
+syn keyword docbkKeyword manvolnum markup mathphrase mediaobject contained
+syn keyword docbkKeyword member menuchoice methodname methodparam contained
+syn keyword docbkKeyword methodsynopsis modifier mousebutton msg contained
+syn keyword docbkKeyword msgaud msgentry msgexplan msginfo msglevel contained
+syn keyword docbkKeyword msgmain msgorig msgrel msgset msgsub contained
+syn keyword docbkKeyword msgtext note olink ooclass ooexception contained
+syn keyword docbkKeyword oointerface option optional orderedlist contained
+syn keyword docbkKeyword orgdiv orgname otheraddr othercredit contained
+syn keyword docbkKeyword othername package pagenums para paramdef contained
+syn keyword docbkKeyword parameter part partintro personblurb contained
+syn keyword docbkKeyword personname phone phrase pob postcode contained
+syn keyword docbkKeyword preface primary primaryie printhistory contained
+syn keyword docbkKeyword procedure productname productnumber contained
+syn keyword docbkKeyword programlisting programlistingco prompt contained
+syn keyword docbkKeyword property pubdate publisher publishername contained
+syn keyword docbkKeyword qandadiv qandaentry qandaset question quote contained
+syn keyword docbkKeyword refclass refdescriptor refentry contained
 syn keyword docbkKeyword refentrytitle reference refmeta refmiscinfo contained
 syn keyword docbkKeyword refname refnamediv refpurpose refsect1 contained
-syn keyword docbkKeyword refsect1info refsect2 refsect2info refsect3 contained
-syn keyword docbkKeyword refsect3info refsynopsisdiv refsynopsisdivinfo contained
-syn keyword docbkKeyword releaseinfo remark replaceable returnvalue revhistory contained
-syn keyword docbkKeyword revision revnumber revremark row sbr screen contained
-syn keyword docbkKeyword screenco screeninfo screenshot secondary contained
-syn keyword docbkKeyword secondaryie sect1 sect1info sect2 sect2info sect3 contained
-syn keyword docbkKeyword sect3info sect4 sect4info sect5 sect5info section contained
-syn keyword docbkKeyword sectioninfo see seealso seealsoie seeie seg contained
-syn keyword docbkKeyword seglistitem segmentedlist segtitle seriesinfo contained
-syn keyword docbkKeyword seriesvolnums set setindex setinfo sgmltag contained
-syn keyword docbkKeyword shortaffil shortcut sidebar simpara simplelist contained
-syn keyword docbkKeyword simplesect spanspec state step street structfield contained
-syn keyword docbkKeyword structname subject subjectset subjectterm contained
-syn keyword docbkKeyword subscript substeps subtitle superscript surname contained
-syn keyword docbkKeyword symbol synopfragment synopfragmentref synopsis contained
-syn keyword docbkKeyword systemitem table tbody term tertiary tertiaryie contained
-syn keyword docbkKeyword textobject tfoot tgroup thead tip title contained
-syn keyword docbkKeyword titleabbrev toc tocback tocchap tocentry tocfront contained
-syn keyword docbkKeyword toclevel1 toclevel2 toclevel3 toclevel4 toclevel5 contained
-syn keyword docbkKeyword tocpart token trademark type ulink userinput contained
+syn keyword docbkKeyword refsect2 refsect3 refsection refsynopsisdiv contained
+syn keyword docbkKeyword releaseinfo remark replaceable returnvalue contained
+syn keyword docbkKeyword revdescription revhistory revision contained
+syn keyword docbkKeyword revnumber revremark row sbr screen screenco contained
+syn keyword docbkKeyword screenshot secondary secondaryie sect1 contained
+syn keyword docbkKeyword sect2 sect3 sect4 sect5 section see seealso contained
+syn keyword docbkKeyword seealsoie seeie seg seglistitem contained
+syn keyword docbkKeyword segmentedlist segtitle seriesvolnums set contained
+syn keyword docbkKeyword setindex shortaffil shortcut sidebar contained
+syn keyword docbkKeyword simpara simplelist simplemsgentry contained
+syn keyword docbkKeyword simplesect spanspec state step contained
+syn keyword docbkKeyword stepalternatives street subject subjectset contained
+syn keyword docbkKeyword subjectterm subscript substeps subtitle contained
+syn keyword docbkKeyword superscript surname symbol synopfragment contained
+syn keyword docbkKeyword synopfragmentref synopsis systemitem table contained
+syn keyword docbkKeyword task taskprerequisites taskrelated contained
+syn keyword docbkKeyword tasksummary tbody td term termdef tertiary contained
+syn keyword docbkKeyword tertiaryie textdata textobject tfoot tgroup contained
+syn keyword docbkKeyword th thead tip title titleabbrev toc tocentry contained
+syn keyword docbkKeyword token tr trademark type uri userinput contained
 syn keyword docbkKeyword varargs variablelist varlistentry varname contained
-syn keyword docbkKeyword videodata videoobject void volumenum warning contained
-syn keyword docbkKeyword wordasword xref year contained
+syn keyword docbkKeyword videodata videoobject void volumenum contained
+syn keyword docbkKeyword warning wordasword xref year contained
+
+if b:docbk_ver == 4
+  syn keyword docbkKeyword ackno action appendixinfo articleinfo contained
+  syn keyword docbkKeyword authorblurb beginpage bibliographyinfo contained
+  syn keyword docbkKeyword blockinfo bookinfo chapterinfo contained
+  syn keyword docbkKeyword collabname corpauthor corpcredit contained
+  syn keyword docbkKeyword corpname glossaryinfo graphic graphicco contained
+  syn keyword docbkKeyword highlights indexinfo inlinegraphic contained
+  syn keyword docbkKeyword interface invpartnumber isbn issn lot contained
+  syn keyword docbkKeyword lotentry medialabel mediaobjectco contained
+  syn keyword docbkKeyword modespec objectinfo partinfo contained
+  syn keyword docbkKeyword prefaceinfo pubsnumber refentryinfo contained
+  syn keyword docbkKeyword referenceinfo refsect1info refsect2info contained
+  syn keyword docbkKeyword refsect3info refsectioninfo contained
+  syn keyword docbkKeyword refsynopsisdivinfo screeninfo sect1info contained
+  syn keyword docbkKeyword sect2info sect3info sect4info sect5info contained
+  syn keyword docbkKeyword sectioninfo setindexinfo setinfo contained
+  syn keyword docbkKeyword sgmltag sidebarinfo structfield contained
+  syn keyword docbkKeyword structname tocback tocchap tocfront contained
+  syn keyword docbkKeyword toclevel1 toclevel2 toclevel3 toclevel4 contained
+  syn keyword docbkKeyword toclevel5 tocpart ulink contained
+
+else
+  syn keyword docbkKeyword acknowledgements annotation arc contained
+  syn keyword docbkKeyword constraint constraintdef cover contained
+  syn keyword docbkKeyword extendedlink givenname info lhs locator contained
+  syn keyword docbkKeyword multimediaparam nonterminal org person contained
+  syn keyword docbkKeyword production productionrecap contained
+  syn keyword docbkKeyword productionset rhs tag tocdiv topic contained
+
+endif
 
 " Add special emphasis on some regions. Thanks to Rory Hunter <roryh@dcs.ed.ac.uk> for these ideas.
 syn region docbkRegion start="<emphasis>"lc=10 end="</emphasis>"me=e-11 contains=xmlRegion,xmlEntity,sgmlRegion,sgmlEntity keepend
diff --git a/runtime/tutor/tutor.ja.euc b/runtime/tutor/tutor.ja.euc
index 69b3d36219..9eabbdc401 100644
--- a/runtime/tutor/tutor.ja.euc
+++ b/runtime/tutor/tutor.ja.euc
@@ -541,7 +541,7 @@ Note: 
 
   4. 呵介の崇柑に败瓢するには % とタイプしましょう。
 
-  5. 戮の (,),[,],{ or } でカ〖ソルを败瓢し、% が部をしているか澄千しましょう。
+  5. 戮の (,),[,],{ や } でカ〖ソルを败瓢し、% が部をしているか澄千しましょう。
 
 ---> This ( is a test line with ('s, ['s ] and {'s } in it. ))
 
@@ -655,7 +655,7 @@ Note: 
 
   3. 矢机 : を病すと、茶烫の呵布婶に :'<,'> が附れます。
 
-  4. w TEST (TESET は赂哼しないファイル叹)をタイプします。
+  4. w TEST (TEST は赂哼しないファイル叹)をタイプします。
      Enter を病す涟に :'<,'>w TEST となっていることを澄千して布さい。
 
   5. Vim は TEST というファイルに联买された乖を今き哈むでしょう。
@@ -772,7 +772,7 @@ Note: a, i 
   3. 弥垂モ〖ドを却けるには <ESC> を病します。乖の荒りが恃构されていないままに
      なることに庙罢してください。
 
-  5. 荒った xxx をステップを帆り手して弥垂しましょう。
+  4. 荒った xxx をステップを帆り手して弥垂しましょう。
 
 ---> Adding 123 to xxx gives you xxx.
 ---> Adding 123 to 456 gives you 579.
@@ -869,10 +869,10 @@ Note: 1
   ":help" コマンドに苞眶を涂えることにより、あらゆる玛叹のヘルプを斧つけること
   ができます。これらを活してみましょう(<ENTER> をタイプし撕れないように):
 
-  :help w
-  :help c_<T
-  :help insert-index
-  :help user-manual
+	:help w
+	:help c_CTRL-D
+	:help insert-index
+	:help user-manual
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		      レッスン 7.2: 弹瓢スクリプトの侯喇
 
@@ -947,7 +947,7 @@ NOTE: 
   これにて Vim のチュ〖トリアルを姜わります。エディタを词帽に、しかも郊尸に
   蝗うことができるようにと、Vim の积つ车前の妥爬のみを帕えようとしました。
   Vim にはさらに驴くのコマンドがあり、ここで链てを棱汤することはできません。
-  笆惯はユ〖ザマニュアルを徊救ください: "help :user-manual"
+  笆惯はユ〖ザマニュアルを徊救ください: ":help user-manual"
 
   これ笆稿の池浆のために、肌の塑を夸力します。
 	Vim - Vi Improved - by Steve Oualline
diff --git a/runtime/tutor/tutor.ja.sjis b/runtime/tutor/tutor.ja.sjis
index 6880cd3ae3..baf81129f1 100644
--- a/runtime/tutor/tutor.ja.sjis
+++ b/runtime/tutor/tutor.ja.sjis
@@ -541,7 +541,7 @@ Note: 
 
   4. 嵟弶偺妵屖偵堏摦偡傞偵偼 % 偲僞僀僾偟傑偟傚偆丅
 
-  5. 懠偺 (,),[,],{ or } 偱僇乕僜儖傪堏摦偟丄% 偑壗傪偟偰偄傞偐妋擣偟傑偟傚偆丅
+  5. 懠偺 (,),[,],{ 傗 } 偱僇乕僜儖傪堏摦偟丄% 偑壗傪偟偰偄傞偐妋擣偟傑偟傚偆丅
 
 ---> This ( is a test line with ('s, ['s ] and {'s } in it. ))
 
@@ -655,7 +655,7 @@ Note: 
 
   3. 暥帤 : 傪墴偡偲丄夋柺偺嵟壓晹偵 :'<,'> 偑尰傟傑偡丅
 
-  4. w TEST (TESET 偼懚嵼偟側偄僼傽僀儖柤)傪僞僀僾偟傑偡丅
+  4. w TEST (TEST 偼懚嵼偟側偄僼傽僀儖柤)傪僞僀僾偟傑偡丅
      Enter 傪墴偡慜偵 :'<,'>w TEST 偲側偭偰偄傞偙偲傪妋擣偟偰壓偝偄丅
 
   5. Vim 偼 TEST 偲偄偆僼傽僀儖偵慖戰偝傟偨峴傪彂偒崬傓偱偟傚偆丅
@@ -772,7 +772,7 @@ Note: a, i 
   3. 抲姺儌乕僪傪敳偗傞偵偼 <ESC> 傪墴偟傑偡丅峴偺巆傝偑曄峏偝傟偰偄側偄傑傑偵
      側傞偙偲偵拲堄偟偰偔偩偝偄丅
 
-  5. 巆偭偨 xxx 傪僗僥僢僾傪孞傝曉偟偰抲姺偟傑偟傚偆丅
+  4. 巆偭偨 xxx 傪僗僥僢僾傪孞傝曉偟偰抲姺偟傑偟傚偆丅
 
 ---> Adding 123 to xxx gives you xxx.
 ---> Adding 123 to 456 gives you 579.
@@ -869,10 +869,10 @@ Note: 1
   ":help" 僐儅儞僪偵堷悢傪梌偊傞偙偲偵傛傝丄偁傜備傞戣柤偺僿儖僾傪尒偮偗傞偙偲
   偑偱偒傑偡丅偙傟傜傪帋偟偰傒傑偟傚偆(<ENTER> 傪僞僀僾偟朰傟側偄傛偆偵):
 
-  :help w
-  :help c_<T
-  :help insert-index
-  :help user-manual
+	:help w
+	:help c_CTRL-D
+	:help insert-index
+	:help user-manual
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		      儗僢僗儞 7.2: 婲摦僗僋儕僾僩偺嶌惉
 
@@ -947,7 +947,7 @@ NOTE: 
   偙傟偵偰 Vim 偺僠儏乕僩儕傾儖傪廔傢傝傑偡丅僄僨傿僞傪娙扨偵丄偟偐傕廩暘偵
   巊偆偙偲偑偱偒傞傛偆偵偲丄Vim 偺帩偮奣擮偺梫揰偺傒傪揱偊傛偆偲偟傑偟偨丅
   Vim 偵偼偝傜偵懡偔偺僐儅儞僪偑偁傝丄偙偙偱慡偰傪愢柧偡傞偙偲偼偱偒傑偣傫丅
-  埲崀偼儐乕僓儅僯儏傾儖傪嶲徠偔偩偝偄: "help :user-manual"
+  埲崀偼儐乕僓儅僯儏傾儖傪嶲徠偔偩偝偄: ":help user-manual"
 
   偙傟埲屻偺妛廗偺偨傔偵丄師偺杮傪悇慐偟傑偡丅
 	Vim - Vi Improved - by Steve Oualline
diff --git a/runtime/tutor/tutor.ja.utf-8 b/runtime/tutor/tutor.ja.utf-8
index 248d696e84..2034443c23 100644
--- a/runtime/tutor/tutor.ja.utf-8
+++ b/runtime/tutor/tutor.ja.utf-8
@@ -541,7 +541,7 @@ Note: 妞滅储銇屻儠銈°偆銉伄绲傘倧銈娿伀閬斻仚銈嬨仺銆併偑銉椼偡銉с兂 'wrapsc
 
   4. 鏈€鍒濄伄鎷姬銇Щ鍕曘仚銈嬨伀銇� % 銇ㄣ偪銈ゃ儣銇椼伨銇椼倗銇嗐€�
 
-  5. 浠栥伄 (,),[,],{ or } 銇с偒銉笺偨銉倰绉诲嫊銇椼€�% 銇屼綍銈掋仐銇︺亜銈嬨亱纰鸿獚銇椼伨銇椼倗銇嗐€�
+  5. 浠栥伄 (,),[,],{ 銈� } 銇с偒銉笺偨銉倰绉诲嫊銇椼€�% 銇屼綍銈掋仐銇︺亜銈嬨亱纰鸿獚銇椼伨銇椼倗銇嗐€�
 
 ---> This ( is a test line with ('s, ['s ] and {'s } in it. ))
 
@@ -655,7 +655,7 @@ Note: 銇撱亾銇� Vim 銈掔祩浜嗐仐銆併儠銈°偆銉悕 TEST 銇ㄥ叡銇捣鍕曘仚銈嬨仺
 
   3. 鏂囧瓧 : 銈掓娂銇欍仺銆佺敾闈€伄鏈€涓嬮儴銇� :'<,'> 銇岀従銈屻伨銇欍€�
 
-  4. w TEST (TESET 銇瓨鍦ㄣ仐銇亜銉曘偂銈ゃ儷鍚�)銈掋偪銈ゃ儣銇椼伨銇欍€�
+  4. w TEST (TEST 銇瓨鍦ㄣ仐銇亜銉曘偂銈ゃ儷鍚�)銈掋偪銈ゃ儣銇椼伨銇欍€�
      Enter 銈掓娂銇欏墠銇� :'<,'>w TEST 銇ㄣ仾銇ｃ仸銇勩倠銇撱仺銈掔⒑瑾嶃仐銇︿笅銇曘亜銆�
 
   5. Vim 銇� TEST 銇ㄣ亜銇嗐儠銈°偆銉伀閬告姙銇曘倢銇熻銈掓浉銇嶈炯銈€銇с仐銈囥亞銆�
@@ -772,7 +772,7 @@ Note: a, i 銇� A 銇悓銇樻尶鍏ャ儮銉笺儔銇哥Щ銈娿伨銇欍亴銆佹枃瀛椼亴鎸垮叆銇�
   3. 缃彌銉€兗銉夈倰鎶溿亼銈嬨伀銇� <ESC> 銈掓娂銇椼伨銇欍€傝銇畫銈娿亴澶夋洿銇曘倢銇︺亜銇亜銇俱伨銇�
      銇倠銇撱仺銇敞鎰忋仐銇︺亸銇犮仌銇勩€�
 
-  5. 娈嬨仯銇� xxx 銈掋偣銉嗐儍銉椼倰绻般倞杩斻仐銇︾疆鎻涖仐銇俱仐銈囥亞銆�
+  4. 娈嬨仯銇� xxx 銈掋偣銉嗐儍銉椼倰绻般倞杩斻仐銇︾疆鎻涖仐銇俱仐銈囥亞銆�
 
 ---> Adding 123 to xxx gives you xxx.
 ---> Adding 123 to 456 gives you 579.
@@ -869,10 +869,10 @@ Note: 1銇ゃ伄妞滅储銈炽優銉炽儔銇犮亼澶ф枃瀛楀皬鏂囧瓧銇尯鍒ャ倰銈勩倎銇熴亜
   ":help" 銈炽優銉炽儔銇紩鏁般倰涓庛亪銈嬨亾銇ㄣ伀銈堛倞銆併亗銈夈倖銈嬮鍚嶃伄銉樸儷銉椼倰瑕嬨仱銇戙倠銇撱仺
   銇屻仹銇嶃伨銇欍€傘亾銈屻倝銈掕│銇椼仸銇裤伨銇椼倗銇�(<ENTER> 銈掋偪銈ゃ儣銇楀繕銈屻仾銇勩倛銇嗐伀):
 
-  :help w
-  :help c_<T
-  :help insert-index
-  :help user-manual
+	:help w
+	:help c_CTRL-D
+	:help insert-index
+	:help user-manual
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		      銉儍銈广兂 7.2: 璧峰嫊銈广偗銉儣銉堛伄浣滄垚
 
@@ -947,7 +947,7 @@ NOTE: 瑁滃畬銇銇忋伄銈炽優銉炽儔銇у嫊浣溿仐銇俱仚銆傘仢銇椼仸 CTRL-D 銇� <T
   銇撱倢銇仸 Vim 銇儊銉ャ兗銉堛儶銈€儷銈掔祩銈忋倞銇俱仚銆傘偍銉囥偅銈裤倰绨″崢銇€併仐銇嬨倐鍏呭垎銇�
   浣裤亞銇撱仺銇屻仹銇嶃倠銈堛亞銇仺銆乂im 銇寔銇ゆ蹇点伄瑕佺偣銇伩銈掍紳銇堛倛銇嗐仺銇椼伨銇椼仧銆�
   Vim 銇伅銇曘倝銇銇忋伄銈炽優銉炽儔銇屻亗銈娿€併亾銇撱仹鍏ㄣ仸銈掕鏄庛仚銈嬨亾銇ㄣ伅銇с亶銇俱仜銈撱€�
-  浠ラ檷銇儲銉笺偠銉炪儖銉ャ偄銉倰鍙傜収銇忋仩銇曘亜: "help :user-manual"
+  浠ラ檷銇儲銉笺偠銉炪儖銉ャ偄銉倰鍙傜収銇忋仩銇曘亜: ":help user-manual"
 
   銇撱倢浠ュ緦銇缈掋伄銇熴倎銇€佹銇湰銈掓帹钖︺仐銇俱仚銆�
 	Vim - Vi Improved - by Steve Oualline
-- 
GitLab