Updated runtime files.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index bf89ee6..94c8f31 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 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 @@
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 @@
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 @@
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 437964d..311d86c 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 @@
*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 3e15868..5b56585 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 @@
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 4d0c4d0..9e33ec7 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5728,6 +5728,7 @@
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_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-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 @@
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 4a221e8..da88102 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 b0f27d1..45bcc17 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 @@
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 1f59290..221c0ca 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 @@
\ 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 @@
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 4a4c851..2a6bf4c 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 @@
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 @@
" 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 73c1cb4..fc679ee 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 @@
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 @@
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 69b3d36..9eabbdc 100644
--- a/runtime/tutor/tutor.ja.euc
+++ b/runtime/tutor/tutor.ja.euc
@@ -541,7 +541,7 @@
4. ºÇ½é¤Î³ç¸Ì¤Ë°ÜÆ°¤¹¤ë¤Ë¤Ï % ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦¡£
- 5. ¾¤Î (,),[,],{ or } ¤Ç¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¡¢% ¤¬²¿¤ò¤·¤Æ¤¤¤ë¤«³Îǧ¤·¤Þ¤·¤ç¤¦¡£
+ 5. ¾¤Î (,),[,],{ ¤ä } ¤Ç¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¡¢% ¤¬²¿¤ò¤·¤Æ¤¤¤ë¤«³Îǧ¤·¤Þ¤·¤ç¤¦¡£
---> This ( is a test line with ('s, ['s ] and {'s } in it. ))
@@ -655,7 +655,7 @@
3. ʸ»ú : ¤ò²¡¤¹¤È¡¢²èÌ̤κDz¼Éô¤Ë :'<,'> ¤¬¸½¤ì¤Þ¤¹¡£
- 4. w TEST (TESET ¤Ï¸ºß¤·¤Ê¤¤¥Õ¥¡¥¤¥ë̾)¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£
+ 4. w TEST (TEST ¤Ï¸ºß¤·¤Ê¤¤¥Õ¥¡¥¤¥ë̾)¤ò¥¿¥¤¥×¤·¤Þ¤¹¡£
Enter ¤ò²¡¤¹Á°¤Ë :'<,'>w TEST ¤È¤Ê¤Ã¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ²¼¤µ¤¤¡£
5. Vim ¤Ï TEST ¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤ËÁªÂò¤µ¤ì¤¿¹Ô¤ò½ñ¤¹þ¤à¤Ç¤·¤ç¤¦¡£
@@ -772,7 +772,7 @@
3. ÃÖ´¹¥â¡¼¥É¤òÈ´¤±¤ë¤Ë¤Ï <ESC> ¤ò²¡¤·¤Þ¤¹¡£¹Ô¤Î»Ä¤ê¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¤Þ¤Þ¤Ë
¤Ê¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£
- 5. »Ä¤Ã¤¿ xxx ¤ò¥¹¥Æ¥Ã¥×¤ò·«¤êÊÖ¤·¤ÆÃÖ´¹¤·¤Þ¤·¤ç¤¦¡£
+ 4. »Ä¤Ã¤¿ xxx ¤ò¥¹¥Æ¥Ã¥×¤ò·«¤êÊÖ¤·¤ÆÃÖ´¹¤·¤Þ¤·¤ç¤¦¡£
---> Adding 123 to xxx gives you xxx.
---> Adding 123 to 456 gives you 579.
@@ -869,10 +869,10 @@
":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 @@
¤³¤ì¤Ë¤Æ 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 6880cd3..baf8112 100644
--- a/runtime/tutor/tutor.ja.sjis
+++ b/runtime/tutor/tutor.ja.sjis
@@ -541,7 +541,7 @@
4. ÅÌÊÉÚ®·éÉÍ % Æ^CvµÜµå¤B
- 5. ¼Ì (,),[,],{ or } ÅJ[\ðÚ®µA% ª½ðµÄ¢é©mFµÜµå¤B
+ 5. ¼Ì (,),[,],{ â } ÅJ[\ðÚ®µA% ª½ðµÄ¢é©mFµÜµå¤B
---> This ( is a test line with ('s, ['s ] and {'s } in it. ))
@@ -655,7 +655,7 @@
3. ¶ : ð·ÆAæÊÌÅºÉ :'<,'> ª»êÜ·B
- 4. w TEST (TESET ͶݵȢt@C¼)ð^CvµÜ·B
+ 4. w TEST (TEST ͶݵȢt@C¼)ð^CvµÜ·B
Enter ð·OÉ :'<,'>w TEST ÆÈÁÄ¢é±ÆðmFµÄº³¢B
5. Vim Í TEST Æ¢¤t@CÉIð³ê½sð«Þŵå¤B
@@ -772,7 +772,7 @@
3. u·[hð²¯éÉÍ <ESC> ðµÜ·BsÌcèªÏX³êĢȢÜÜÉ
Èé±ÆÉӵľ³¢B
- 5. cÁ½ xxx ðXebvðJèÔµÄu·µÜµå¤B
+ 4. cÁ½ xxx ðXebvðJèÔµÄu·µÜµå¤B
---> Adding 123 to xxx gives you xxx.
---> Adding 123 to 456 gives you 579.
@@ -869,10 +869,10 @@
":help" R}hÉøð^¦é±ÆÉæèA çäéè¼Ìwvð©Â¯é±Æ
ªÅ«Ü·B±êçðµÄÝܵå¤(<ENTER> ð^CvµYêÈ¢æ¤É):
- :help w
- :help c_<T
- :help insert-index
- :help user-manual
+ :help w
+ :help c_CTRL-D
+ :help insert-index
+ :help user-manual
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
bX 7.2: N®XNvgÌì¬
@@ -947,7 +947,7 @@
±êÉÄ Vim Ì`
[gAðIíèÜ·BGfB^ðÈPÉAµ©à[ªÉ
g¤±ÆªÅ«éæ¤ÉÆAVim ÌÂTOÌv_ÌÝð`¦æ¤ÆµÜµ½B
Vim ÉͳçɽÌR}hª èA±±ÅSÄðྷé±ÆÍūܹñB
- È~Í[U}j
AðQƾ³¢: "help :user-manual"
+ È~Í[U}j
AðQƾ³¢: ":help user-manual"
±êÈãÌwK̽ßÉAÌ{ðEµÜ·B
Vim - Vi Improved - by Steve Oualline
diff --git a/runtime/tutor/tutor.ja.utf-8 b/runtime/tutor/tutor.ja.utf-8
index 248d696..2034443 100644
--- a/runtime/tutor/tutor.ja.utf-8
+++ b/runtime/tutor/tutor.ja.utf-8
@@ -541,7 +541,7 @@
4. 最初の括弧に移動するには % とタイプしましょう。
- 5. 他の (,),[,],{ or } でカーソルを移動し、% が何をしているか確認しましょう。
+ 5. 他の (,),[,],{ や } でカーソルを移動し、% が何をしているか確認しましょう。
---> This ( is a test line with ('s, ['s ] and {'s } in it. ))
@@ -655,7 +655,7 @@
3. 文字 : を押すと、画面の最下部に :'<,'> が現れます。
- 4. w TEST (TESET は存在しないファイル名)をタイプします。
+ 4. w TEST (TEST は存在しないファイル名)をタイプします。
Enter を押す前に :'<,'>w TEST となっていることを確認して下さい。
5. Vim は TEST というファイルに選択された行を書き込むでしょう。
@@ -772,7 +772,7 @@
3. 置換モードを抜けるには <ESC> を押します。行の残りが変更されていないままに
なることに注意してください。
- 5. 残った xxx をステップを繰り返して置換しましょう。
+ 4. 残った xxx をステップを繰り返して置換しましょう。
---> Adding 123 to xxx gives you xxx.
---> Adding 123 to 456 gives you 579.
@@ -869,10 +869,10 @@
":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 @@
これにて Vim のチュートリアルを終わります。エディタを簡単に、しかも充分に
使うことができるようにと、Vim の持つ概念の要点のみを伝えようとしました。
Vim にはさらに多くのコマンドがあり、ここで全てを説明することはできません。
- 以降はユーザマニュアルを参照ください: "help :user-manual"
+ 以降はユーザマニュアルを参照ください: ":help user-manual"
これ以後の学習のために、次の本を推薦します。
Vim - Vi Improved - by Steve Oualline