Update runtime files and translations.

14 files changed, 1992 insertions, 1341 deletions

diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 5f1c4a6261..1be2827c2c 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.4.  Last change: 2014 Sep 30
+*map.txt*       For Vim version 7.4.  Last change: 2014 Oct 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -923,9 +923,11 @@ Examples: ({CURSOR} is where you type a non-keyword character) >
 <		"test;;"	  is not expanded
 		"test ;;"	  is expanded to "test <endofline>"
 
-To avoid the abbreviation in insert mode: Type part of the abbreviation, exit
-insert mode with <Esc>, re-enter insert mode with "a" and type the rest.  Or
-type CTRL-V before the character after the abbreviation.
+To avoid the abbreviation in Insert mode: Type CTRL-V before the character
+that would trigger the abbreviation.  E.g. CTRL-V <Space>.  Or type part of
+the abbreviation, exit insert mode with <Esc>, re-enter insert mode with "a"
+and type the rest.
+
 To avoid the abbreviation in Command-line mode: Type CTRL-V twice somewhere in
 the abbreviation to avoid it to be replaced.  A CTRL-V in front of a normal
 character is mostly ignored otherwise.
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 62bd2d5fc0..daf5270e5a 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.4.  Last change: 2014 Oct 02
+*todo.txt*      For Vim version 7.4.  Last change: 2014 Oct 15
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -35,6 +35,8 @@ not be repeated below, unless there is extra information.
 -------------------- Known bugs and current work -----------------------
 
 Regexp problems:
+- The NFA engine does not implement the time limit passed to
+  nfa_regexec_multi()
 - Bug with pattern: '\vblock (\d+)\.\n.*\d+%(\1)@<!\.$'
   (Lech Lorens, 2014 Feb 3)
 - Issue 164: freeze on regexp search.
@@ -58,15 +60,6 @@ Patch to make getregtype() return the right size for non-linux systems.
 (Yasuhiro Matsumoto, 2014 Jul 8)
 Breaks test_eval.  Inefficient, can we only compute y_width when needed?
 
-Patch to fix 'linebreak' when applying an operator.  And fix the test not
-actually testing. (Christian Brabandt, 2014 Sep 23)
-
-patch to fix issue 26. (Christian)
-
-Test 11 and 100 do not work properly on Windows.
-Patch by Ken Takata (2014 Sep 25)
-Alternative patch Oct 1.
-
 Problem that a previous silent ":throw" causes a following try/catch not to
 work. (ZyX, 2013 Sep 28)
 
@@ -74,15 +67,9 @@ Patch to avoid problems with encoding conversion with diff.vim.
 (Yasuhiro Matsumoto, 2014 Sep 1.
 Depends on current language, language of file can be different.
 
-Add books from Steve Oualline to Vim website. (2014 Sep 25)
-
 ":cd C:\Windows\System32\drivers\etc*" does not work, even though the
 directory exists. (Sergio Gallelli, 2013 Dec 29)
 
-Patch to have the fold and sign column and at the last line of the buffer.
-(Marco Hinz, 2014 Sep 25)
-Alternate suggestion: let all columns continue, also number column.
-
 Patch by Marcin Szamotulski to add count to :close (2014 Aug 10, update Aug
 14, Aug 30)
     Make ":1close" close the first window.
@@ -90,28 +77,31 @@ Patch by Marcin Szamotulski to add count to :close (2014 Aug 10, update Aug
     Make ":-1close" close the previous window.
 Doesn't look right, asked for updates.
 
-Patch to handle multi-byte printer name on MS-Windows. (Yasuhiro Matsumoto,
-2014 Sept 28)
-
-Two patches by Christian, 2014 Sep 29:
-- Combination of precedes listchar and 'showbreak' doesn't work well.
-- Moving cursor is off when 'nu' and 'sbr' are set.
-
 The entries added by matchaddpos() are returned by getmatches() but can't be
 set with setmatches(). (lcd47, 2014 Jun 29)
 
-Patch to fix window title for a command window on MS-Windows. (Yasuhiro
-Matsumoto, 2014 Sep 28)
-
 Patch to fix that 0x80 in abbreviation isn't handled correctly.
 (Christian Brabandt, 2014 Oct 1)
 
+Check for valid yank reg seems wrong.  Patch by Zyx, 2014 Oct 12.
+
+":sign-jump" uses first window in buffer instead of current window.
+Patch by James McCoy, 2013 Nov 22.  Update 2014 Oct 5.
+
 Patch to fix issue 57, on the issue.
 
 Patch for issue 101, maintainer unreachable.
 
+Gvim: when both Tab and CTRL-I are mapped, use CTRL-I not for Tab.
+
+Patch to fix that last_changedtick is not update on saving. (Christian
+Brabandt, 2014 Oct 10, second one)
+
+substitute() can be slow with long strings.  Patch by Ozaki Kiichi, 2014 Oct
+12.
+
 Remove restriction in NSIS installer that the end of the path must be "Vim".
-(Tim Lebedkov, 2014 Sep 24)
+(Tim Lebedkov, 2014 Sep 24) Again Oct 12.
 
 Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15)
 
@@ -119,6 +109,14 @@ Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
 
 'foldexpr' applies to help. (Paul Marshall, 2014 Sep 24)
 
+Patch to fix issue 203. (Christian Brabandt, 2014 Oct 8)
+
+Patch to fix issue 253. (Christian Brabandt, 2014 Oct 8)
+
+Patch to fix issue 78. (Christian Brabandt, 2014 Oct 8)
+
+Patch to fix leak in map() with error. (Christian Brabandt, 2014 Oct 11)
+
 Value returned by virtcol() changes depending on how lines wrap.  This is
 inconsistent with the documentation.
 
@@ -142,9 +140,19 @@ Adding "~" to 'cdpath' doesn't work for completion?  (Davido, 2013 Aug 19)
 
 Patch to make closed folds line up. (Charles Campbell, 2014 Sep 12)
 
+Patch for building a 32bit Vim with 64bit MingW compiler.
+(Michael Soyka, 2014 Oct 15)
+
+Delete old code in os_msdos.c, mch_FullName().
+
 "hi link" does not respect groups with GUI settings only. (Mark Lodato, 2014
 Jun 8)
 
+Patch to switch to the BT regexp engine when the NFA engine uses many states.
+(Christian Brabandt, 2014 Oct 3)
+
+Patch to add argument to :cquit. (Thinca, 2014 Oct 12)
+
 No error for missing endwhile. (ZyX, 2014 Mar 20)
 
 start_global_changes() plus end_global_changes() causes problem for
@@ -338,9 +346,6 @@ buffer. (2013 Dec 9)
 Patch for drag&drop reordering of GUI tab pages reordering.
 (Ken Takata, 2013 Nov 22, second one, also by Masamichi Abe)
 
-":sign-jump" uses first window in buffer instead of current window.
-Patch by James McCoy, 2013 Nov 22.
-
 GTK: problem with 'L' in 'guioptions' changing the window width.
 (Aaron Cornelius, 2012 Feb 6)
 
@@ -414,7 +419,7 @@ Patch to allow setting w:quickfix_title via setqflist() and setloclist()
 functions. (Christian Brabandt, 2013 May 8, update May 21)
 Patch to add getlocstack() / setlocstack(). (Christian Brabandt, 2013 May 14)
 Second one. Update May 22.
-Update by Daniel Hahler, 2014 Jul 4, Aug 14.
+Update by Daniel Hahler, 2014 Jul 4, Aug 14, Oct 14, Oct 15.
 
 Patch to make fold updates much faster. (Christian Brabandt, 2012 Dec)
 
@@ -551,6 +556,10 @@ URXVT:
 - Use urxvt mouse support also in xterm.  Explanations:
   http://www.midnight-commander.org/ticket/2662
 
+Patch to have the fold and sign column and at the last line of the buffer.
+(Marco Hinz, 2014 Sep 25)
+Alternate suggestion: let all columns continue, also the number column.
+
 Patch to add tests for if_xcmdsrv.c., Jul 8, need some more work. (Brian Burns)
 New tests Jul 13.   Update Jul 17.  Discussion Jul 18.
 
@@ -1007,6 +1016,12 @@ to avoid changing 'eventignore'?
 Patch for displaying 0x200c and 0x200d. (Ali Gholami Rudi, 2009 May 6)
 Probably needs a bit of work.
 
+Patch to add farsi handling to arabic.c (Ali Gholami Rudi, 2009 May 2)
+Added test, updates, June 23.
+Updated for 7.4: http://litcave.rudi.ir/farsi_vim.diff
+With modification for Tatweel character: https://dpaste.de/VmFw
+Remark from Ameretat Reith (2014 Oct 13)
+
 List of encoding aliases. (Takao Fujiwara, 2009 Jul 18)
 Are they all OK?  Update Jul 22.
 
@@ -1025,10 +1040,6 @@ on the first character. (John Beckett, 2010 Aug 7)
 Setting 'tags' to "tagsdir/*" does not find "tagsdir/tags". (Steven K. Wong,
 2009 Jul 18)
 
-Patch to add farsi handling to arabic.c (Ali Gholami Rudi, 2009 May 2)
-Added test, updates, June 23.
-Updated for 7.4: http://litcave.rudi.ir/farsi_vim.diff
-
 Patch to add "focusonly" to 'scrollopt', so that scrollbind also applies in
 window that doesn't have focus. (Jonathon Mah, 2009 Jan 12)
 Needs more work.
@@ -1960,7 +1971,7 @@ More patches:
 -   testdir/Make_dos_sh.mak for running tests with MingW. (Bill Mccarthy, 2008
     Sep 13)
 -   Patch for adding "space" item in 'listchars'. (J茅r茅mie Roquet, 2009 Oct 29,
-    Docs patch Oct 30, update David Burgin (glts) 2013 Aug 24)
+    Docs patch Oct 30, update David Burgin (glts) 2013 Aug 24, 2014 Oct 10)
 -   Replace ccomplete.vim by cppcomplete.vim from www.vim.org?  script 1520 by
     Vissale Neang.  (Martin Stubenschrott) Asked Vissale to make the scripts
     more friendly for the Vim distribution.
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 67d3a88288..67d1674537 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:	2014 Sep 05
+" Last Change:	2014 Oct 09
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -1151,7 +1151,7 @@ au BufNewFile,BufRead *.mv,*.mpl,*.mws		setf maple
 au BufNewFile,BufRead *.map			setf map
 
 " Markdown
-au BufNewFile,BufRead *.markdown,*.mdown,*.mkd,*.mkdn,*.mdwn,README.md  setf markdown
+au BufNewFile,BufRead *.markdown,*.mdown,*.mkd,*.mkdn,*.mdwn,*.md  setf markdown
 
 " Mason
 au BufNewFile,BufRead *.mason,*.mhtml,*.comp	setf mason
@@ -1243,8 +1243,8 @@ au BufNewFile,BufRead *.mod
 	\   setf modsim3 |
 	\ endif
 
-" Modula 2
-au BufNewFile,BufRead *.m2,*.DEF,*.MOD,*.md,*.mi setf modula2
+" Modula 2  (.md removed in favor of Markdown)
+au BufNewFile,BufRead *.m2,*.DEF,*.MOD,*.mi	setf modula2
 
 " Modula 3 (.m3, .i3, .mg, .ig)
 au BufNewFile,BufRead *.[mi][3g]		setf modula3
diff --git a/runtime/lang/menu_chinese_gb.936.vim b/runtime/lang/menu_chinese_gb.936.vim
index e636a42319..b3276b5365 100644
--- a/runtime/lang/menu_chinese_gb.936.vim
+++ b/runtime/lang/menu_chinese_gb.936.vim
@@ -1,6 +1,7 @@
-" Menu Translations:	Simplified Chinese <i18n-translation@lists.linux.net.cn>
-" Translated By:	Yuheng Xie <elephant@linux.net.cn>
-" Last Change:		Tue Apr 18 22:00:00 2006
+" Menu Translations:    Simplified Chinese
+" Maintainer:           Shun Bai <baishunde@gmail.com>
+" Previous Maintainer:  Yuheng Xie <elephant@linux.net.cn>
+" Last Change:          2014 Oct 15
 
 " vim: ts=8 sw=8 noet
 
@@ -90,13 +91,14 @@ menutrans Toggle\ &Right\ Scrollbar		开/关右端滚动条(&R)
 menutrans F&ile\ Settings			文件设定(&I)
 
 " Boolean options
-menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	开/关显示行号(&N)<Tab>:set\ nu!
-menutrans Toggle\ &List\ Mode<Tab>:set\ list!		开/关\ list\ 模式(&L)<Tab>:set\ list!
-menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		开/关折行(&W)<Tab>:set\ wrap!
-menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	开/关整词折行(&R)<Tab>:set\ lbr!
-menutrans Toggle\ &expand-tab<Tab>:set\ et!		开/关扩展\ tab(&E)<Tab>:set\ et!
-menutrans Toggle\ &auto-indent<Tab>:set\ ai!		开/关自动缩进(&A)<Tab>:set\ ai!
-menutrans Toggle\ &C-indenting<Tab>:set\ cin!		开/关\ C\ 缩进(&C)<Tab>:set\ cin!
+menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!		开/关显示行号(&N)<Tab>:set\ nu!
+menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu!	开/关相对行号(&V)<Tab>:set\ rnu!
+menutrans Toggle\ &List\ Mode<Tab>:set\ list!			开/关\ list\ 模式(&L)<Tab>:set\ list!
+menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!			开/关折行(&W)<Tab>:set\ wrap!
+menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!		开/关整词折行(&R)<Tab>:set\ lbr!
+menutrans Toggle\ &expand-tab<Tab>:set\ et!			开/关扩展\ tab(&E)<Tab>:set\ et!
+menutrans Toggle\ &auto-indent<Tab>:set\ ai!			开/关自动缩进(&A)<Tab>:set\ ai!
+menutrans Toggle\ &C-indenting<Tab>:set\ cin!			开/关\ C\ 缩进(&C)<Tab>:set\ cin!
 
 " other options
 menutrans &Shiftwidth			缩进宽度(&S)
diff --git a/runtime/lang/menu_zh_cn.gb2312.vim b/runtime/lang/menu_zh_cn.gb2312.vim
index a12d94daf5..0df51885f0 100644
--- a/runtime/lang/menu_zh_cn.gb2312.vim
+++ b/runtime/lang/menu_zh_cn.gb2312.vim
@@ -1,6 +1,7 @@
-" Menu Translations:	Simplified Chinese <i18n-translation@lists.linux.net.cn>
-" Translated By:	Yuheng Xie <elephant@linux.net.cn>
-" Last Change:		Tue Apr 18 22:00:00 2006
+" Menu Translations:    Simplified Chinese
+" Maintainer:           Shun Bai <baishunde@gmail.com>
+" Previous Maintainer:  Yuheng Xie <elephant@linux.net.cn>
+" Last Change:          2014 Oct 15
 
 " vim: ts=8 sw=8 noet
 
@@ -94,6 +95,7 @@ menutrans F&ile\ Settings			文件设定(&I)
 
 " Boolean options
 menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	开/关显示行号(&N)<Tab>:set\ nu!
+menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu! 开/关相对行号(&V)<Tab>:set\ rnu!
 menutrans Toggle\ &List\ Mode<Tab>:set\ list!		开/关\ list\ 模式(&L)<Tab>:set\ list!
 menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		开/关折行(&W)<Tab>:set\ wrap!
 menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	开/关整词折行(&R)<Tab>:set\ lbr!
diff --git a/runtime/lang/menu_zh_cn.utf-8.vim b/runtime/lang/menu_zh_cn.utf-8.vim
index 956363d29c..cb1288f63e 100644
--- a/runtime/lang/menu_zh_cn.utf-8.vim
+++ b/runtime/lang/menu_zh_cn.utf-8.vim
@@ -1,6 +1,7 @@
-" Menu Translations:	Simplified Chinese <i18n-translation@lists.linux.net.cn>
-" Translated By:	Yuheng Xie <elephant@linux.net.cn>
-" Last Change:		Tue Apr 18 22:00:00 2006
+" Menu Translations:    Simplified Chinese
+" Maintainer:           Shun Bai <baishunde@gmail.com>
+" Previous Maintainer:  Yuheng Xie <elephant@linux.net.cn>
+" Last Change:          2014 Oct 15
 
 " vim: ts=8 sw=8 noet
 
@@ -91,6 +92,7 @@ menutrans F&ile\ Settings			鏂囦欢璁惧畾(&I)
 
 " Boolean options
 menutrans Toggle\ Line\ &Numbering<Tab>:set\ nu!	寮�/鍏虫樉绀鸿鍙�(&N)<Tab>:set\ nu!
+menutrans Toggle\ relati&ve\ Line\ Numbering<Tab>:set\ rnu! 寮�/鍏崇浉瀵硅鍙�(&V)<Tab>:set\ rnu!
 menutrans Toggle\ &List\ Mode<Tab>:set\ list!		寮�/鍏砛 list\ 妯″紡(&L)<Tab>:set\ list!
 menutrans Toggle\ Line\ &Wrap<Tab>:set\ wrap!		寮�/鍏虫姌琛�(&W)<Tab>:set\ wrap!
 menutrans Toggle\ W&rap\ at\ word<Tab>:set\ lbr!	寮�/鍏虫暣璇嶆姌琛�(&R)<Tab>:set\ lbr!
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index b51d58bad6..35f99c537c 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2014 Aug 06
+" Last Change:	2014 Oct 09
 
 " If there already is an option window, jump to that one.
 if bufwinnr("option-window") > 0
@@ -728,6 +728,7 @@ call <SID>OptionG("km", &km)
 
 call <SID>Header("editing text")
 call append("$", "undolevels\tmaximum number of changes that can be undone")
+call append("$", "\t(global or local to buffer)")
 call append("$", " \tset ul=" . &ul)
 call append("$", "undoreload\tmaximum number lines to save for undo on a buffer reload")
 call append("$", " \tset ur=" . &ur)
@@ -977,6 +978,7 @@ call <SID>BinOptionG("bk", &bk)
 call append("$", "backupskip\tpatterns that specify for which files a backup is not made")
 call append("$", " \tset bsk=" . &bsk)
 call append("$", "backupcopy\twhether to make the backup as a copy or rename the existing file")
+call append("$", "\t(global or local to buffer)")
 call append("$", " \tset bkc=" . &bkc)
 call append("$", "backupdir\tlist of directories to put backup files in")
 call <SID>OptionG("bdir", &bdir)
diff --git a/runtime/syntax/j.vim b/runtime/syntax/j.vim
index bde954506e..0cdd59b887 100644
--- a/runtime/syntax/j.vim
+++ b/runtime/syntax/j.vim
@@ -2,7 +2,7 @@
 " Language:	J
 " Maintainer:	David B眉rgin <676c7473@gmail.com>
 " URL:		https://github.com/glts/vim-j
-" Last Change:	2014-05-25
+" Last Change:	2014-10-05
 
 if exists('b:current_syntax')
   finish
@@ -12,7 +12,7 @@ let s:save_cpo = &cpo
 set cpo&vim
 
 syntax case match
-syntax sync minlines=50
+syntax sync minlines=100
 
 syntax cluster jStdlibItems contains=jStdlibNoun,jStdlibAdverb,jStdlibConjunction,jStdlibVerb
 syntax cluster jPrimitiveItems contains=jNoun,jAdverb,jConjunction,jVerb,jCopula
@@ -30,26 +30,32 @@ syntax keyword jStdlibVerb AND Endian IFDEF Note OR XOR alpha17 alpha27 anddf an
 syntax match jStdlibNoun /\<\%(adverb\|conjunction\|dyad\|monad\|noun\|verb\)\>/
 syntax match jStdlibVerb /\<\%(assert\|break\|do\)\>\.\@!/
 
-" Numbers. Matching J numbers is difficult. The regular expression used for
-" the general case roughly embodies this grammar sketch:
+" Numbers. Matching J numbers is difficult. In fact, the job cannot be done
+" with regular expressions alone. Below is a sketch of the pattern used. It
+" accepts most well-formed numbers and rejects most of the ill-formed ones.
+" See http://www.jsoftware.com/help/dictionary/dcons.htm for reference.
 "
-"     BASE     := /_?\d+(\.\d*)?([eE]_?\d+)?/
-"     RATIONAL := BASE  |  BASE r BASE
-"     COMPLEX  := BASE  |  BASE (j|a[dr]) BASE
-"     JNUMBER  := RATIONAL  |  RATIONAL [px] RATIONAL  |  COMPLEX  |  COMPLEX [px] COMPLEX
+" "double1" and "double2" patterns:
+"     (_?\d+(\.\d*)?|_\.\d+)([eE]_?\d+)?
+"     (_?\d+(\.\d*)?|_\.\d+|\.\d+)([eE]_?\d+)?
 "
-" The grammar is implemented as shown in this pseudo-regexp:
+" "rational1" and "rational2" patterns:
+"     \k<double1>(r\k<double2>)?|__?
+"     \k<double2>(r\k<double2>)?|__?
 "
-"        base         rational                       complex                       remainder
-"     /\< B  (  [r]B ([px]B([r]B)?)?  |  (j|a[dr])B ([px]B((j|a[dr])B)?)?  |  [px]B ((j|a[dr]|r)B)?  )?/
+" "complex1" and "complex2" patterns:
+"     \k<rational1>((j|a[dr])\k<rational2>)?
+"     \k<rational2>((j|a[dr])\k<rational2>)?
 "
-" All in all, a compromise between correctness and practicality had to be
-" made. See http://www.jsoftware.com/help/dictionary/dcons.htm for reference.
-syntax match jNumber /\<_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(\%(r_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%([px]_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(r_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\)\=\)\=\)\|\%(\%(j\|a[dr]\)_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%([px]_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(\%(j\|a[dr]\)_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\)\=\)\=\)\|\%([px]_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(\%(j\|a[dr]\|r\)_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\)\=\)\)\=/
-syntax match jNumber /\<_\=\d\+\%([eE]\d\+\)\=b_\=[0-9a-z]\+\%(\.[0-9a-z]\+\)\=/
-syntax match jNumber /\<__\=\>/
-syntax match jNumber /\<_\./
-syntax match jNumber /\<_\=\d\+x\>/
+" "basevalue" pattern:
+"     _?[0-9a-z]+(\.[0-9a-z]*)?|_?\.[0-9a-z]+
+"
+" all numbers:
+"     \b\k<complex1>([px]\k<complex2>)?(b\k<basevalue>)?(?![0-9A-Za-z_.])
+syntax match jNumber /\<_\.[0-9A-Za-z_.]\@!/
+syntax match jNumber /\<_\=\d\+x[0-9A-Za-z_.]\@!/
+syntax match jNumber /\<\%(__\=r_\=\d\+\|_\=\d\+r__\=\)[0-9A-Za-z_.]\@!/
+syntax match jNumber /\<\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\%(\%(j\|a[dr]\)\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\)\=\%([px]\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\%(\%(j\|a[dr]\)\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\)\=\)\=\%(b\%(_\=[0-9a-z]\+\%(\.[0-9a-z]*\)\=\|_\=\.[0-9a-z]\+\)\)\=[0-9A-Za-z_.]\@!/
 
 syntax region jString oneline start=/'/ skip=/''/ end=/'/
 
diff --git a/runtime/syntax/rst.vim b/runtime/syntax/rst.vim
index fce9e5dd3e..c1f25699e7 100644
--- a/runtime/syntax/rst.vim
+++ b/runtime/syntax/rst.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
-" Language:         reStructuredText documentation format
-" Maintainer:       Marshall Ward <marshall.ward@gmail.com>
+" Language: reStructuredText documentation format
+" Maintainer: Marshall Ward <marshall.ward@gmail.com>
 " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2014-08-23
+" Latest Revision: 2014-10-03
 
 if exists("b:current_syntax")
   finish
@@ -150,12 +150,19 @@ endif
 
 for code in g:rst_syntax_code_list
     unlet! b:current_syntax
+    " guard against setting 'isk' option which might cause problems (issue #108)
+    let prior_isk = &l:iskeyword
     exe 'syn include @rst'.code.' syntax/'.code.'.vim'
     exe 'syn region rstDirective'.code.' matchgroup=rstDirective fold '
                 \.'start=#\%(sourcecode\|code\%(-block\)\=\)::\s\+'.code.'\_s*\n\ze\z(\s\+\)# '
                 \.'skip=#^$# '
                 \.'end=#^\z1\@!# contains=@NoSpell,@rst'.code
     exe 'syn cluster rstDirectives add=rstDirective'.code
+    " reset 'isk' setting, if it has been changed
+    if &l:iskeyword !=# prior_isk
+        let &l:iskeyword = prior_isk
+    endif
+    unlet! prior_isk
 endfor
 
 " TODO: Use better syncing.
diff --git a/runtime/tutor/tutor.ru b/runtime/tutor/tutor.ru
index 6fd74cf085..1194f60635 100644
--- a/runtime/tutor/tutor.ru
+++ b/runtime/tutor/tutor.ru
@@ -1,29 +1,32 @@
 ===============================================================================
-=    � � � � �   � � � � � � � � � �   �   � � � � � � �   VIM  -  髋矣裳 1.5 =
+=   � � � � �   � � � � � � � � � �   �   � � � � � � �   VIM  --  着矣裳 1.7 =
 ===============================================================================
-     Vim --- 茉� 限盼� 拖菸偈 遗牧嗽弦, 赏爬萆� 臀现庞宰� 讼土文, 犹邵讼�
-     臀锨� 奶� 韵窍, 拊下� 扇 子� 拖治� 沦滔 闲捎猎� � 粤讼� 辙怕紊伺, 肆�
-     茉显. 显 辙怕紊� 幸哨琢� 下哐游稍� 南釉猎限蜗� 奚犹� 讼土文 奶� 韵窍,
-     拊下� 髻 拖翘� � 膛撬嫌载� 捎邢特谙琢载 Vim � 肆夼釉着 遗牧嗽弦� 下菖窍
+
+     Vim -- 茉� 限盼� 拖菸偈 遗牧嗽弦, 赏爬萆� 臀现庞宰� 讼土文, 犹邵讼� 臀锨�
+     奶� 韵窍, 拊下� 扇 子� 拖治� 沦滔 闲捎猎� � 粤讼� 辙怕紊伺, 肆� 茉显.
+     显 辙怕紊� 幸哨琢� 下哐游稍� 南釉猎限蜗� 奚犹� 讼土文 奶� 韵窍, 拊下�
+     踪 拖翘� � 蹋撬嫌载� 捎邢特谙琢载 Vim � 肆夼釉着 遗牧嗽弦� 下菖窍
      瘟谖赁盼裳.
 
      髁� 邢砸怕张杂� 幸陕躺谏耘特蜗 25-30 蜕握� 瘟 嫌紫盼膳 牧挝锨� 辙怕紊肆 �
-     诹咨由拖釉� 显 韵窍, 铀咸厮� 滓磐盼� 髻 邢砸猎稍� 瘟 芩有乓赏盼再.
+     诹咨由拖釉� 显 韵窍, 铀咸厮� 滓磐盼� 踪 邢砸猎稍� 瘟 芩有乓赏盼再.
 
-     胂土文� � 找纤寥 抡恼� 拖纳粕蒙蚁琢载 耘擞�. 笙谀潦耘 讼猩� 茉锨� 屏侍�,
-     拊下� 邢幸了陨讼琢载友 瘟 闻� (庞躺 髻 诹姓釉商� "vimtutor", 韵 茉� 罩�
-     讼猩�).
+     魑赏廖膳! 胂土文镣� � 找纤寥 踪 抡呐耘 哨团窝载 茉显 耘擞�. 笙谀潦耘
+     讼猩� 茉锨� 屏侍�, 拊下� 邢幸了陨讼琢载友 瘟 闻� (庞躺 踪 诹姓釉商�
+     "vimtutor", 韵 茉� 罩� 讼猩�).
 
      髁治� 邢臀稍�, 拊� 茉显 辙怕紊� 幸拍瘟谖赁盼 奶� 下辙盼裳 � 幸厦庞优
-     捎邢特谙琢紊�. � 馅瘟蘖旁, 拊� 髻 南讨钨 诹姓铀猎� 讼土文� 奶� 韵窍,
-     拊下� 肆� 犹拍张� 扇 哨辙稍�. 逵躺 髻 幸嫌韵 幸限稍僚耘 耘擞�, 韵
-     诹抡呐耘 讼土文�!
+     捎邢特谙琢紊�. � 馅瘟蘖旁, 拊� 踪 南讨钨 诹姓铀猎� 讼土文� 奶� 韵窍,
+     拊下� 肆� 犹拍张� 扇 哨辙稍�. 逵躺 踪 幸嫌韵 幸限稍僚耘 茉显 耘擞�, 韵
+     闻 诹邢臀稍� 讼土文�!
 
-     襞信邑 章拍稍庞� � 韵�, 拊� 颂磷邵� CapsLock 闻 姿汤夼瘟 � 瘟滞稍�
-     颂磷邵�   j   闻铀咸厮� 伊�, 粤�, 拊下� 跻纤 1.1 邢涛嫌载� 邢团釉商友 瘟
+     襞信邑 章拍稍庞� � 韵�, 拊� 颂磷邵� CapsLock 闻 姿汤夼瘟, � 瘟滞稍�
+     颂磷邵�  j  闻铀咸厮� 伊�, 粤�, 拊下� 跻纤 1.1 邢涛嫌载� 邢团釉商友 瘟
      芩伊闻.
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			跻纤 1.1:  疱蝈礤铋� 膈蝮矧�
+			 跻纤 1.1:  疱蝈礤铋� 膈蝮矧�
+
 
 ** 涮� 信遗团菖紊� 苏矣弦� 瘟滞稍� 颂磷邵� h,j,k,l 粤�, 肆� 邢肆诹蜗 紊峙. **
 	     ^
@@ -33,802 +36,972 @@
 	     v
   1. 鹣淖汕潦耘 苏矣弦 邢 芩伊握, 邢肆 闻 邢拚子宰张耘 优卵 兆乓盼蜗.
 
-  2. 盍牧咨耘 颂磷邵� `孜哨' (j) 邢肆 衔� 闻 瘟尬旁 邢自弦言赜�.
----> 襞信邑 髻 谖僚耘, 肆� 信遗试� � 犹拍绽菖驼 找纤�.
+  2. 盍牧咨耘 颂磷邵� `孜哨' (j) 邢肆 衔� 闻 瘟尬Ｔ 邢自弦言赜�.
+     襞信邑 踪 谖僚耘, 肆� 信遗试� � 犹拍绽菖驼 找纤�.
 
   3. 橛邢特谡� 颂磷邵� `孜哨' 信遗誓稍� � 跻纤� 1.2.
 
-团蘖紊�: 逵躺 踪 邢肆 闻 兆乓盼� � 韵�, 拊� 瘟律伊旁�, 瘟滞稍� <ESC> 奶�
-	   信遗认牧 � 下俎钨� 遗稚� (Normal mode). 鹣犹� 茉锨� 信遗瘟屡疑耘
-	   砸怕张驼� 讼土文�.
+团蘖紊�! 逵躺 踪 邢肆 闻 兆乓盼� � 韵�, 拊� 瘟律伊旁�, 瘟滞稍� <ESC> 奶�
+	信遗认牧 � 下俎钨� 遗稚� (Normal mode). 鹣犹� 茉锨� 信遗瘟屡疑耘
+	砸怕张驼� 讼土文�.
+
+团蘖紊�! 锫俎钨� 颂磷邵� 招伊滋盼裳 苏矣弦贤 (釉遗趟�) 粤酥� 南讨钨
+	伊孪粤载. 锬瘟讼, 颂磷邵� hjkl 邢谧咸言 琢� 信遗团萘载友
+	谖赁稍盘匚� 沦釉遗�, 肆� 韵特讼 踪 瘟辙稍庞� 赏� 邢特谙琢载友.
 
-团蘖紊�: 锫俎钨� 颂磷邵� 招伊滋盼裳 苏矣弦贤 (釉遗趟�) 粤酥� 南讨钨
-	   伊孪粤载. 锬瘟讼, 颂磷邵� hjkl 邢谧咸言 髁� 信遗团萘载友
-	   谖赁稍盘匚� 沦釉遗�, 肆� 韵特讼 髻 瘟辙稍庞� 赏� 邢特谙琢载友.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		  跻纤 1.2: 瘐箅 � 麇螓孱殄 蜥怙豉 � VIM
+		      跻纤 1.2: 麇螓孱殄 蜥怙豉 � VIM
+
 
-!! 黝轫犷殄! 鹨胖呐, 夼� 踪邢涛言� 汤孪� 哨 闲捎廖钨� 紊峙 哿窍�, 幸限陨耘
+  !! 黝轫犷殄! 鹨胖呐, 夼� 踪邢涛言� 汤孪� 哨 闲捎廖钨� 紊峙 哿窍�, 幸限陨耘
 			       找纤 门躺讼� !!
 
-  1. 盍滞稍� 颂磷邵� <ESC> (奶� 韵窍, 拊下� 漳嫌韵着疑载友, 拊� 髻 � 下俎蜗�
+  1. 盍滞稍� 颂磷邵� <ESC> (奶� 韵窍, 拊下� 漳嫌韵着疑载友, 拊� 踪 � 下俎蜗�
      遗稚团 (Normal mode)).
 
   2. 盍屡疑耘:			:q! <ENTER>.
+     (� 馅瘟蘖旁, 拊� 踪 南讨钨 瘟乱猎� 砸� 由妥咸� :q! � 瘟至载 颂磷邵�
+     鬃夏.) � 邢谧咸稍 琢� 踪试� 哨 遗牧嗽弦� 忮� 箫栩犷孱轳 汤沦� 幽盘廖钨�
+     哨团闻紊�.
 
----> � 邢谧咸稍 髁� 踪试� 哨 遗牧嗽弦� 忮� 箫栩犷孱轳 汤沦� 幽盘廖钨�
-     哨团闻紊�. 逵躺 髻 认陨耘 酉纫廖稍� 哨团闻紊� � 踪试�:
-				:wq  <ENTER>
+  3. 胂悄� 踪 兆赡稍� 幸汕塘叟紊� 讼土文蜗� 下咸限松, 瘟屡疑耘 讼土文�,
+     讼韵伊� 幸勺盘� 琢� � 茉显 辙怕紊�. � 拖峙� 沦载:
+				vimtutor <ENTER>
 
-  3. 胂悄� 髻 兆赡稍� 幸汕塘叟紊� 讼土文蜗� 下咸限松, 瘟屡疑耘 讼土文�,
-     讼韵伊� 幸勺盘� 髁� � 茉显 辙怕紊�. � 拖峙� 沦载
-				vimtutor ru <ENTER>
-     锫俎蜗 拖治� 捎邢特谙琢载:	vim tutor.ru <ENTER>
+  4. 逵躺 踪 兆乓盼� � 韵�, 拊� 诹邢臀商� 茉� 哿巧, 踪邢涛稍� 哿巧 显 1 南 3
+     拊下� 踪试� 游献� 诹姓釉稍� 遗牧嗽弦.
 
----> 'vim' 邢谧咸雅� 诹姓釉稍� 遗牧嗽弦 vim, 'tutor.ru' --- 茉� 屏侍, 讼韵屹�
-     髻 抡呐耘 遗牧嗽梢献猎�.
+团蘖紊�!  :q! <ENTER>  显乱劣僮僚� 汤沦� 幽盘廖钨� 琢蜕 哨团闻紊�. 遗�
+	闻铀咸厮� 找纤献 踪 遮瘟旁� 肆� 酉纫廖言� 哨团闻紊� � 屏侍.
+
+  5. 鹋遗团釉稍� 苏矣弦 孜哨 � 跻纤� 1.3.
 
-  4. 逵躺 髻 兆乓盼� � 韵�, 拊� 诹邢臀商� 茉� 哿巧, 踪邢涛稍� 哿巧 显 1 南 3
-     拊下� 踪试� 游献� 诹姓釉稍� 遗牧嗽弦. 耘� 信遗团釉稍� 苏矣弦 孜哨 �
-     跻纤� 1.3.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		  跻纤 1.3: 蝈溽媵轵秣犷殄 翦塍翎 - 蹁犰孱殄
+		  跻纤 1.3: 蝈溽媵轵秣犷殄 翦塍翎 -- 蹁犰孱殄
 
 
-** 盍认难迂 � 下俎蜗� 遗稚团 瘟滞稍� x, 拊下� 漳撂稍� 由妥咸 邢� 苏矣弦贤. **
+** 盍认难迂 � 下俎蜗� 遗稚团 瘟滞稍�  x  奶� 漳撂盼裳 由妥咸� 邢� 苏矣弦贤. **
 
-  1. 鹋遗团釉稍� 苏矣弦 � 釉蚁伺 孜哨�, 邢团夼挝鲜 --->.
+  1. 鹋遗团釉稍� 苏矣弦 � 釉蚁伺 紊峙, 邢团夼挝鲜 --->.
 
   2. 涮� 捎幸磷膛紊� 羡陕纤, 信遗团釉稍� 苏矣弦, 邢肆 衔 闻 纤林旁友 瘟�
      漳撂雅唾� 由妥咸贤.
 
-  3. 盍滞稍� 颂磷邵� x 奶� 漳撂盼裳 砸怕张拖窍 由妥咸�.
+  3. 盍滞稍� 颂磷邵�  x  奶� 漳撂盼裳 砸怕张拖窍 由妥咸�.
 
-  4. 鹣自弦稍� 哿巧 2--4 邢肆 釉蚁肆 闻 抡呐� 捎幸磷膛瘟.
+  4. 鹣自弦稍� 哿巧 酉 2 邢 4 邢肆 釉蚁肆 闻 抡呐� 捎幸磷膛瘟.
 
 ---> 镌 栽韵邢粤 讼匈栽 行匈特 行� 行邢汤 膛栽稍�.
 
-  5. 襞信邑, 讼悄� 釉蚁肆 显讼乙潘陨蚁琢瘟, 信遗认纳耘 � 找纤� 1.4.
-
-礤铋�: � 认呐 嫌紫盼裳 茉锨� 辙怕紊肆 闻 匈粤试庞� 诹邢蜕瘟载, 辙稍�
-	   � 幸厦庞优 捎邢特谙琢紊�.
+  5. 襞信邑, 讼悄� 釉蚁肆 显讼乙潘陨蚁琢瘟, 信遗认纳耘 � 跻纤� 1.4.
 
+团蘖紊�! � 认呐 嫌紫盼裳 茉锨� 辙怕紊肆 闻 匈粤试庞� 诹邢蜕瘟载, 辙稍�
+	� 幸厦庞优 捎邢特谙琢紊�.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		  跻纤 1.4: 蝈溽媵轵秣犷殄 翦塍翎 - 黧翎麟�
+		   跻纤 1.4: 蝈溽媵轵秣犷殄 翦塍翎 -- 黧翎麟�
 
 
- ** 盍认难迂 � 下俎蜗� 遗稚团 (Normal mode), 瘟滞稍� i 奶� 子粤姿� 耘擞粤. **
+       ** 盍认难迂 � 下俎蜗� 遗稚团, 瘟滞稍�  i  奶� 子粤姿� 耘擞粤. **
 
-  1. 鹋遗团釉稍� 苏矣弦 � 信易鲜 釉蚁伺 孜哨�, 邢团夼挝鲜 --->.
+  1. 鹋遗团釉稍� 苏矣弦 � 信易鲜 釉蚁伺 紊峙, 邢团夼挝鲜 --->.
 
   2. 涮� 韵窍, 拊下� 幽盘猎� 信易绽 釉蚁苏 赡盼陨尬鲜 自弦鲜, 邢团釉稍�
      苏矣弦 瘟 由妥咸 疱蝈� 讼韵屹� 犹拍张� 子粤咨载 耘擞�.
 
-  3. 盍滞稍� i � 瘟屡疑耘 砸怕张唾� 南铝滋盼裳.
+  3. 盍滞稍�  i  � 瘟屡疑耘 砸怕张唾� 南铝滋盼裳.
 
   4. 鹣犹� 捎幸磷膛紊� 子湃 羡陕纤 瘟滞稍� <ESC> 奶� 紫谧伊粤 � 下俎钨� 遗稚�.
-     鹣自弦稍� 哿巧 2--4, 邢肆 埔邻� 闻 抡呐� 捎幸磷膛瘟 邢涛嫌载�.
+     鹣自弦稍� 哿巧 酉 2 邢 4, 邢肆 埔邻� 闻 抡呐� 捎幸磷膛瘟 邢涛嫌载�.
 
----> 釉� 耘擞粤 � 釉蚁伺 屡犹拍蜗 .
+---> 釉� 耘擞粤 � 釉蚁伺 屡佑膛奈� .
 ---> 釉� 耘擞粤 � 茉鲜 釉蚁伺 屡佑膛奈� 幸闲撂�.
 
-  5. 胂悄� 嫌紫稍� 子粤姿� 耘擞粤, 信遗认纳耘 牧特叟 � 蚺诶团.
+  5. 胂悄� 嫌紫稍� 子粤姿� 耘擞粤, 信遗认纳耘 � 跻纤� 1.5.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		 跻纤 1.5: 蝈溽媵轵秣犷殄 翦塍翎 -- 滹忉黛孱殄
 
 
+     ** 盍认难迂 � 下俎蜗� 遗稚团, 瘟滞稍�  A  奶� 南铝滋盼裳 耘擞粤. **
+
+  1. 鹋遗团釉稍� 苏矣弦 � 信易鲜 釉蚁伺 紊峙, 邢团夼挝鲜 --->.
+     钆 赏排� 谖赁盼裳 瘟 肆讼� 由妥咸� 伊有咸现盼 苏矣弦 瘟 茉鲜 釉蚁伺.
+
+  2. 盍滞稍�  A  � 瘟屡疑耘 砸怕张唾� 南铝滋盼裳.
+
+  3. 鹣犹� 南铝滋盼裳 砸怕张拖窍 耘擞粤 瘟滞稍� <ESC> 奶� 紫谧伊粤 � 下俎钨�
+     遗稚�.
+
+  4. 鹋遗团釉稍� 苏矣弦 瘟 犹拍绽菡� 釉蚁苏, 邢团夼挝绽 ---> � 邢自弦稍� 哿巧
+     酉 2 邢 4 奶� 捎幸磷膛紊� 茉鲜 釉蚁松.
+
+---> 釉� 耘擞粤 � 茉鲜 釉蚁伺 屡佑膛
+     釉� 耘擞粤 � 茉鲜 釉蚁伺 屡佑膛奈� 幸闲撂�.
+---> 庞� 粤酥� 闻 南釉粒� 蘖�
+     庞� 粤酥� 闻 南釉粒� 蘖釉� 耘擞粤.
+
+  5. 胂悄� 嫌紫稍� 南铝滋盼膳 耘擞粤, 信遗认纳耘 � 跻纤� 1.6.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-				蝈礤 躜镫� 1
+			 跻纤 1.6: 蝈溽媵轵秣犷殄 驷觎�
+
+
+	** 橛邢特谡试�  :wq  奶� 酉纫廖盼裳 屏侍� � 踪认牧 哨 Vim. **
+
+  !! 黝轫犷殄! 鹨胖呐, 夼� 踪邢涛言� 汤孪� 哨 闲捎廖钨� 紊峙 哿窍�, 幸限陨耘
+			       找纤 门躺讼� !!
+
+  1. 髻誓稍� 哨 Vim, 肆� 踪 茉� 遮瘟躺 � 跻纤� 1.2:  :q!
+     樘�, 庞躺 � 琢� 庞载 南釉招 � 囊涨贤� 耘彝晌撂�, 拖峙耘 幽盘猎� 犹拍绽菖�
+     � 危�.
+
+  2. 鹣 幸汕塘叟紊� 讼土文蜗� 下咸限松 鬃拍稍� 犹拍绽菡� 讼土文�:
+			      vim tutor <ENTER>
+     `vim' -- 讼土文� 奶� 诹姓铀� 遗牧嗽弦� Vim, � `tutor' -- 赏� 屏侍� 奶�
+     遗牧嗽梢献廖裳. 橛邢特谡旁� 赏� 屏侍�, 讼韵屹� 拖治� 哨团窝载.
+
+  3. 饔粤滋咽耘 � 漳撂咽耘 耘擞�, 肆� 踪 瘟辙商捎� � 幸拍倌蛰扇 找纤寥.
+
+  4. 笙纫廖稍� 屏侍 � 哨团闻紊淹� � 踪誓稍� 哨 Vim 踪邢涛勺:  :wq <ENTER>
+
+  5. 逵躺 踪 踪厶� 哨 vimtutor 瘟 哿桥 1, 信遗诹姓釉稍� vimtutor � 信遗认纳耘
+     � 犹拍绽菖驼 蚺诶团.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+				 蝈礤 躜镫� 1
+
 
   1. 胝矣弦 信遗团萘旁友 躺孪 颂磷邵镣� 酉 釉遗趟镣�, 躺孪 颂磷邵镣� hjkl.
-	 h (滋抛�)	j (孜哨)       k (鬃乓�)	    l (仔伊紫)
+	h (滋抛�)	j (孜哨)	k (鬃乓�)	l (仔伊紫)
 
-  2. 涮� 诹姓铀� Vim (哨 幸汕塘叟紊� % 讼土文蜗� 下咸限松) 瘟屡疑耘:
-     vim 轫馹驷觎� <ENTER>
+  2. 涮� 诹姓铀� Vim (哨 幸汕塘叟紊� 讼土文蜗� 下咸限松) 瘟屡疑耘:
+			    vim 轫馹驷觎� <ENTER>
 
   3. 涮� 诹着役盼裳 伊孪再 � Vim 瘟屡疑耘:
-     <ESC>   :q!	 <ENTER>  拊下� 显肆诹载友 显 酉纫廖盼裳 哨团闻紊�.
+	<ESC>   :q!   <ENTER>  拊下� 显肆诹载友 显 酉纫廖盼裳 哨团闻紊�.
      樘� 瘟屡疑耘:
-     <ESC>   :wq	 <ENTER>  拊下� 酉纫廖稍� 哨团闻紊�.
+	<ESC>   :wq   <ENTER>  拊下� 酉纫廖稍� 哨团闻紊�.
 
-  4. 涮� 漳撂盼裳 由妥咸� 邢� 苏矣弦贤 � 下俎蜗� 遗稚团, 瘟屡疑耘: x
+  4. 涮� 漳撂盼裳 由妥咸� 邢� 苏矣弦贤 � 下俎蜗� 遗稚团, 瘟滞稍�:  x
 
   5. 下� 子粤咨载 耘擞� 信遗� 苏矣弦贤 � 下俎蜗� 遗稚团, 瘟屡疑耘:
-	 i     鬃夏稍� 耘擞�	<ESC>
+	 i   鬃夏稍� 子粤滋雅唾� 耘擞�   <ESC>
+     下� 南铝咨载 耘擞� 邢犹� 苏矣弦�:
+	 a   鬃夏稍� 南铝滋雅唾� 耘擞�   <ESC>
 
-礤铋�: 盍至陨� <ESC> 信遗团釉稍 髁� � 下俎钨� 遗稚� (Normal mode) 躺孪
-	   幸乓着� 闻峙塘耘特握� � 蘖釉赊蜗 诹着役盼握� 讼土文�.
+团蘖紊�! 盍至陨� <ESC> 信遗团釉稍 琢� � 下俎钨� 遗稚� (Normal mode) 躺孪
+	幸乓祝� 闻峙塘耘特握� � 蘖釉赊蜗 诹着役Ｎ握� 讼土文�.
 
-襞信邑 信遗认纳� � 跻纤� 2.
+襞信邑 信遗认纳耘 � 跻纤� 2.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			  跻纤 2.1: 腼磲钿� 蹁犰孱轳
+			   跻纤 2.1: 腼磲钿� 蹁犰孱轳
 
 
-	** 盍屡疑耘 dw 奶� 漳撂盼裳 辙劣运� 耘擞粤 南 讼蚊� 犹献�. **
+       ** 盍屡疑耘  dw  奶� 漳撂盼裳 辙劣运� 耘擞粤 南 讼蚊� 犹献�. **
 
   1. 盍滞稍� <ESC>, 拊下� 信遗试� � 下俎钨� 遗稚�.
 
-  2. 鹋遗团釉稍� 苏矣弦 孜哨, � 釉蚁伺, 邢团夼挝鲜 --->.
+  2. 鹋遗团釉稍� 苏矣弦 孜哨, � 釉蚁伺 邢团夼挝鲜 --->.
 
   3. 鹋遗团釉稍� 苏矣弦 � 瘟蘖滔 犹献�, 讼韵蚁� 犹拍张� 漳撂稍�.
 
-  4. 盍屡疑耘  dw , 拊下� 漳撂稍� 茉� 犹献�.
+  4. 盍屡疑耘  dw  奶� 漳撂盼裳 茉锨� 犹献�.
 
-礤铋�: 飨 滓磐� 瘟孪伊 抡俗� dw 邢炎言友 � 邢犹拍闻� 釉蚁伺 芩伊瘟. 逵躺
-	   髻 拊�-韵 瘟屡遗耘 闻幸磷商匚�, 瘟滞稍� <ESC> � 瘟尬稍� 游赁撂�.
+团蘖紊�! 飨 滓磐� 瘟孪伊 抡俗� dw 邢炎言友 有伊琢 � 恿拖� 紊治攀 釉蚁伺
+	芩伊瘟. 逵躺 踪 拊�-韵 瘟屡遥耘 闻幸磷商匚�, 瘟滞稍� <ESC> � 瘟尬稍�
+	游赁撂�.
 
 ---> 钆铀咸厮� 犹献 伊粕瘟� � 茉贤 幸拍滔峙紊� 磷韵艘廖 哨躺畚�.
 
   5. 鹣自弦稍� 哿巧 3 � 4, 邢肆 闻 捎幸磷稍� 子� 羡陕松 � 信遗认纳耘 �
      跻纤� 2.2.
 
-
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		  跻纤 2.2: 滹痫祛轸屐 腼磲钿� 蹁犰孱轳
+		   跻纤 2.2: 滹痫祛轸屐 腼磲钿� 蹁犰孱轳
 
 
-	    ** 盍屡疑耘 d$ 奶� 漳撂盼裳 耘擞粤 南 讼蚊� 釉蚁松. **
+	   ** 盍屡疑耘  d$  奶� 漳撂盼裳 耘擞粤 南 讼蚊� 釉蚁松. **
 
   1. 盍滞稍� <ESC>, 拊下� 信遗试� � 下俎钨� 遗稚�.
 
-  2. 鹋遗团釉稍� 苏矣弦 孜哨, � 釉蚁伺, 邢团夼挝鲜 --->.
+  2. 鹋遗团釉稍� 苏矣弦 孜哨, � 釉蚁伺 邢团夼挝鲜 --->.
 
-  3. 鹋遗团釉稍� 苏矣弦 � 讼蚊� 幸磷商匚鲜 釉蚁松 (痫箪� 信易鲜 . ).
+  3. 鹋遗团釉稍� 苏矣弦 � 讼蚊� 幸磷商匚鲜 釉蚁松 (痫箪� 信易鲜 韵匏�).
 
-  4. 下� 漳撂稍� 嫌粤韵� 釉蚁松, 瘟屡疑耘  d$ .
+  4. 盍屡疑耘  d$  奶� 漳撂盼裳 嫌粤运� 釉蚁松.
 
 ---> 朐�-韵 瘟乱撂 纤衔蘖紊� 茉鲜 釉蚁松 淖林馁. 纤衔蘖紊� 茉鲜 釉蚁松 淖林馁.
 
 
-  5.下� 陶捋� 伊谙乱猎赜� � 茉贤, 信遗认纳耘 � 跻纤� 2.3.
-
-
-
-
+  5. 下� 陶捋� 伊谙乱猎赜� � 韵�, 肆� 茉� 幸仙尤夏稍, 信遗认纳耘 � 跻纤� 2.3.
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 跻纤 2.3: 腼磲钿� � 镡�咫豉
+			  跻纤 2.3: 腼磲钿� � 镡�咫豉
+
 
+  砦锨膳 讼土文�, 哨团