From 6d4ae7443a104fdafc93de38b0768986e4ffc8aa Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 12:16:45 +0200
Subject: [PATCH 001/136] updated for version 7.3.647 Problem:    "gnd" doesn't
 work correctly in Visual mode. Solution:   Handle Visual mode differently in
 "gn". (Christian Brabandt)

---
 src/search.c          | 17 +++++++----------
 src/testdir/test53.in |  4 +++-
 src/testdir/test53.ok |  1 +
 src/version.c         |  2 ++
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/search.c b/src/search.c
index b54b30f9e8..158cfd8f5d 100644
--- a/src/search.c
+++ b/src/search.c
@@ -4545,7 +4545,6 @@ current_search(count, forward)
     int		dir;
     int		result;		/* result of various function calls */
     char_u	old_p_ws = p_ws;
-    int		visual_active = FALSE;
     int		flags = 0;
     pos_T	save_VIsual;
     int		zerowidth = FALSE;
@@ -4561,11 +4560,6 @@ current_search(count, forward)
     {
 	orig_pos = curwin->w_cursor;
 	save_VIsual = VIsual;
-	visual_active = TRUE;
-
-	/* just started visual selection, only one character */
-	if (equalpos(VIsual, curwin->w_cursor))
-	    visual_active = FALSE;
 
 	pos = curwin->w_cursor;
 	start_pos = VIsual;
@@ -4619,7 +4613,7 @@ current_search(count, forward)
 	    p_ws = old_p_ws;
 	    return FAIL;
 	}
-	else if (!i && !result && !visual_active)
+	else if (!i && !result)
 	{
 	    if (forward) /* try again from start of buffer */
 	    {
@@ -4691,7 +4685,8 @@ is_zerowidth(pattern)
     regmmatch_T	regmatch;
     int		nmatched = 0;
     int		result = -1;
-    pos_T       pos;
+    pos_T	pos;
+    int		save_called_emsg = called_emsg;
 
     if (search_regcomp(pattern, RE_SEARCH, RE_SEARCH,
 					      SEARCH_KEEP, &regmatch) == FAIL)
@@ -4704,15 +4699,17 @@ is_zerowidth(pattern)
     {
 	/* Zero-width pattern should match somewhere, then we can check if
 	 * start and end are in the same position. */
+	called_emsg = FALSE;
 	nmatched = vim_regexec_multi(&regmatch, curwin, curbuf,
 						  pos.lnum, (colnr_T)0, NULL);
 
 	if (!called_emsg)
 	    result = (nmatched != 0
-		    && regmatch.startpos[0].lnum == regmatch.endpos[0].lnum
-		    && regmatch.startpos[0].col == regmatch.endpos[0].col);
+		&& regmatch.startpos[0].lnum == regmatch.endpos[0].lnum
+		&& regmatch.startpos[0].col == regmatch.endpos[0].col);
     }
 
+    called_emsg |= save_called_emsg;
     vim_free(regmatch.regprog);
     return result;
 }
diff --git a/src/testdir/test53.in b/src/testdir/test53.in
index be76b05c1c..af617c01f1 100644
--- a/src/testdir/test53.in
+++ b/src/testdir/test53.in
@@ -40,7 +40,8 @@ gnd
 /\>\zs
 0gnd/^
 gnd$h/\zs
-gnd
+gnd/[u]niquepattern/s
+vlgnd
 :/^start:/,/^end:/wq! test.out
 ENDTEST
 
@@ -67,4 +68,5 @@ join
 lines
 zero width pattern
 delete first and last chars
+uniquepattern uniquepattern
 end:
diff --git a/src/testdir/test53.ok b/src/testdir/test53.ok
index 928caff7c0..0a2a6f4d19 100644
--- a/src/testdir/test53.ok
+++ b/src/testdir/test53.ok
@@ -24,4 +24,5 @@ abcdx |  | abcdx
 join lines
 zerowidth pattern
 elete first and last char
+ uniquepattern
 end:
diff --git a/src/version.c b/src/version.c
index 2f20fa674d..922e86544b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    647,
 /**/
     646,
 /**/

From d9b3765a8adf55d7693e22d85d2752bbc5a5d6d9 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 12:16:45 +0200
Subject: [PATCH 002/136] Added tag v7-3-647 for changeset 29fe4e5c1db1

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 4353652793..d340ed2bc8 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1983,3 +1983,4 @@ fdac34e3afa5f0dea26dba5e96932e3b9a0be50a v7-3-643
 fb7c028dcac7555fee78096813e3846d157cc91b v7-3-644
 1810ee914648ef3e16a8cf866299a32c4a9a00cb v7-3-645
 e70485d3f81df4d72cb40d6fa4ad4218cf1e8392 v7-3-646
+29fe4e5c1db17a62b16a95fdda84f08cd05c27b5 v7-3-647

From 7d1fb96bc163568f4134c86cbf311b8f0636d1b6 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 13:30:40 +0200
Subject: [PATCH 003/136] updated for version 7.3.648 Problem:    Crash when
 using a very long file name. (ZyX) Solution:   Properly check length of
 buffer space.

---
 src/buffer.c  | 31 ++++++++++++++++++++++---------
 src/version.c |  2 ++
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/buffer.c b/src/buffer.c
index 355dbc7398..0a2ce8ec96 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3234,12 +3234,15 @@ maketitle()
 	{
 	    /* format: "fname + (path) (1 of 2) - VIM" */
 
+#define SPACE_FOR_FNAME (IOSIZE - 100)
+#define SPACE_FOR_DIR   (IOSIZE - 20)
+#define SPACE_FOR_ARGNR (IOSIZE - 10)  /* at least room for " - VIM" */
 	    if (curbuf->b_fname == NULL)
-		vim_strncpy(buf, (char_u *)_("[No Name]"), IOSIZE - 100);
+		vim_strncpy(buf, (char_u *)_("[No Name]"), SPACE_FOR_FNAME);
 	    else
 	    {
 		p = transstr(gettail(curbuf->b_fname));
-		vim_strncpy(buf, p, IOSIZE - 100);
+		vim_strncpy(buf, p, SPACE_FOR_FNAME);
 		vim_free(p);
 	    }
 
@@ -3263,7 +3266,7 @@ maketitle()
 		buf[off++] = ' ';
 		buf[off++] = '(';
 		home_replace(curbuf, curbuf->b_ffname,
-					       buf + off, IOSIZE - off, TRUE);
+					buf + off, SPACE_FOR_DIR - off, TRUE);
 #ifdef BACKSLASH_IN_FILENAME
 		/* avoid "c:/name" to be reduced to "c" */
 		if (isalpha(buf[off]) && buf[off + 1] == ':')
@@ -3274,18 +3277,28 @@ maketitle()
 		if (p == buf + off)
 		    /* must be a help buffer */
 		    vim_strncpy(buf + off, (char_u *)_("help"),
-						  (size_t)(IOSIZE - off - 1));
+					   (size_t)(SPACE_FOR_DIR - off - 1));
 		else
 		    *p = NUL;
 
-		/* translate unprintable chars */
-		p = transstr(buf + off);
-		vim_strncpy(buf + off, p, (size_t)(IOSIZE - off - 1));
-		vim_free(p);
+		/* Translate unprintable chars and concatenate.  Keep some
+		 * room for the server name.  When there is no room (very long
+		 * file name) use (...). */
+		if (off < SPACE_FOR_DIR)
+		{
+		    p = transstr(buf + off);
+		    vim_strncpy(buf + off, p, (size_t)(SPACE_FOR_DIR - off));
+		    vim_free(p);
+		}
+		else
+		{
+		    vim_strncpy(buf + off, (char_u *)"...",
+					     (size_t)(SPACE_FOR_ARGNR - off));
+		}
 		STRCAT(buf, ")");
 	    }
 
-	    append_arg_number(curwin, buf, IOSIZE, FALSE);
+	    append_arg_number(curwin, buf, SPACE_FOR_ARGNR, FALSE);
 
 #if defined(FEAT_CLIENTSERVER)
 	    if (serverName != NULL)
diff --git a/src/version.c b/src/version.c
index 922e86544b..577eddeafb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    648,
 /**/
     647,
 /**/

From 395c4a76925ddc8180b1976db96663a3e4bbee50 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 13:30:41 +0200
Subject: [PATCH 004/136] Added tag v7-3-648 for changeset 76c099d45772

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d340ed2bc8..2090c2b1c6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1984,3 +1984,4 @@ fb7c028dcac7555fee78096813e3846d157cc91b v7-3-644
 1810ee914648ef3e16a8cf866299a32c4a9a00cb v7-3-645
 e70485d3f81df4d72cb40d6fa4ad4218cf1e8392 v7-3-646
 29fe4e5c1db17a62b16a95fdda84f08cd05c27b5 v7-3-647
+76c099d45772a233982c39a29510d89eaa4d5a1c v7-3-648

From e7de33a2d3c525ed063d0ab26defa557b538ba9c Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 14:18:45 +0200
Subject: [PATCH 005/136] updated for version 7.3.649 Problem:    When
 'clipboard' is set to "unnamed" small deletes end up in the 	    numbered
 registers. (Ingo Karkat) Solution:   Use the original register name to decide
 whether to put a delete 	    in a numbered register. (Christian
 Brabandt)

---
 src/ops.c     | 5 ++++-
 src/version.c | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/ops.c b/src/ops.c
index 561046d378..f08e576cfe 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -1623,6 +1623,7 @@ op_delete(oap)
 #endif
     linenr_T		old_lcount = curbuf->b_ml.ml_line_count;
     int			did_yank = FALSE;
+    int			orig_regname = oap->regname;
 
     if (curbuf->b_ml.ml_flags & ML_EMPTY)	    /* nothing to do */
 	return OK;
@@ -1715,8 +1716,10 @@ op_delete(oap)
 	/*
 	 * Put deleted text into register 1 and shift number registers if the
 	 * delete contains a line break, or when a regname has been specified.
+	 * Use the register name from before adjust_clip_reg() may have
+	 * changed it.
 	 */
-	if (oap->regname != 0 || oap->motion_type == MLINE
+	if (orig_regname != 0 || oap->motion_type == MLINE
 				   || oap->line_count > 1 || oap->use_reg_one)
 	{
 	    y_current = &y_regs[9];
diff --git a/src/version.c b/src/version.c
index 577eddeafb..4b4890c7e0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    649,
 /**/
     648,
 /**/

From e09f6bfff5221b80c3a651c61a3a7cb35f0fc9cb Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 14:18:45 +0200
Subject: [PATCH 006/136] Added tag v7-3-649 for changeset 063765c3cebb

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 2090c2b1c6..03795a374f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1985,3 +1985,4 @@ fb7c028dcac7555fee78096813e3846d157cc91b v7-3-644
 e70485d3f81df4d72cb40d6fa4ad4218cf1e8392 v7-3-646
 29fe4e5c1db17a62b16a95fdda84f08cd05c27b5 v7-3-647
 76c099d45772a233982c39a29510d89eaa4d5a1c v7-3-648
+063765c3cebbd6040dc091b8c1ba28739fef9118 v7-3-649

From b6aa05255d1e16078f9044e478531d517e5c485a Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 15:03:30 +0200
Subject: [PATCH 007/136] updated for version 7.3.650 Problem:    Completion
 after ":help \{-" gives an error message and messes up 	    the
 command line. Solution:   Cancel the tag search if the pattern can't be
 compiled. (Yasuhiro 	    Matsumoto)

---
 src/tag.c     | 2 ++
 src/version.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/tag.c b/src/tag.c
index 08abd41758..4f2426b90c 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1443,6 +1443,8 @@ find_tags(pat, num_matches, matchesp, flags, mincount, buf_ffname)
 	orgpat.len = p_tl;
 
     prepare_pats(&orgpat, has_re);
+    if (has_re && orgpat.regmatch.regprog == NULL)
+	goto findtag_end;
 
 #ifdef FEAT_TAG_BINS
     /* This is only to avoid a compiler warning for using search_info
diff --git a/src/version.c b/src/version.c
index 4b4890c7e0..a2ca2386e8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    650,
 /**/
     649,
 /**/

From ea3f5fe0537294bd681fc740a5a69766b167cdf8 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 15:03:30 +0200
Subject: [PATCH 008/136] Added tag v7-3-650 for changeset a638ae0f1b0c

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 03795a374f..c21e192313 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1986,3 +1986,4 @@ e70485d3f81df4d72cb40d6fa4ad4218cf1e8392 v7-3-646
 29fe4e5c1db17a62b16a95fdda84f08cd05c27b5 v7-3-647
 76c099d45772a233982c39a29510d89eaa4d5a1c v7-3-648
 063765c3cebbd6040dc091b8c1ba28739fef9118 v7-3-649
+a638ae0f1b0cc41d8d753d79503238f11215f3ea v7-3-650

From 742f0ab7cbcaf5098f2cabd5b833237cb346ce66 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 15:15:07 +0200
Subject: [PATCH 009/136] updated for version 7.3.651 Problem:    Completion
 after ":help \{-" gives an error message. Solution:   Prepend a backslash.

---
 src/ex_cmds.c | 15 ++++++++++-----
 src/version.c |  2 ++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index f715af6a8f..889ea62032 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4851,7 +4851,7 @@ do_sub(eap)
 #ifdef FEAT_EVAL
 		if (do_count)
 		{
-		    /* prevent accidently changing the buffer by a function */
+		    /* prevent accidentally changing the buffer by a function */
 		    save_ma = curbuf->b_p_ma;
 		    curbuf->b_p_ma = FALSE;
 		    sandbox++;
@@ -5264,7 +5264,7 @@ do_sub_msg(count_only)
  * is assumed to be 'p' if missing.
  *
  * This is implemented in two passes: first we scan the file for the pattern and
- * set a mark for each line that (not) matches. secondly we execute the command
+ * set a mark for each line that (not) matches. Secondly we execute the command
  * for each line that has a mark. This is required because after deleting
  * lines we do not know where to search for the next match.
  */
@@ -5896,9 +5896,14 @@ find_help_tags(arg, num_matches, matches, keep_lang)
 	}
 	else
 	{
-	  /* replace "[:...:]" with "\[:...:]"; "[+...]" with "\[++...]" */
-	    if (arg[0] == '[' && (arg[1] == ':'
-					 || (arg[1] == '+' && arg[2] == '+')))
+	  /* Replace:
+	   * "[:...:]" with "\[:...:]"
+	   * "[++...]" with "\[++...]"
+	   * "\{" with "\\{"
+	   */
+	    if ((arg[0] == '[' && (arg[1] == ':'
+			 || (arg[1] == '+' && arg[2] == '+')))
+		    || (arg[0] == '\\' && arg[1] == '{'))
 	      *d++ = '\\';
 
 	  for (s = arg; *s; ++s)
diff --git a/src/version.c b/src/version.c
index a2ca2386e8..6afaf8d317 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    651,
 /**/
     650,
 /**/

From 642db37e7b36cdac4e485fc7af77b70dace01fd3 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 15:15:07 +0200
Subject: [PATCH 010/136] Added tag v7-3-651 for changeset ece544e85821

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c21e192313..fb9bdca4f7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1987,3 +1987,4 @@ e70485d3f81df4d72cb40d6fa4ad4218cf1e8392 v7-3-646
 76c099d45772a233982c39a29510d89eaa4d5a1c v7-3-648
 063765c3cebbd6040dc091b8c1ba28739fef9118 v7-3-649
 a638ae0f1b0cc41d8d753d79503238f11215f3ea v7-3-650
+ece544e85821a6118da55dad1538ea4c3625bd1c v7-3-651

From 8acd9d785d3b7e35d834c92bb91a0ce91f3d3060 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 17:28:21 +0200
Subject: [PATCH 011/136] updated for version 7.3.652 Problem:    Workaround
 for Python crash isn't perfect. Solution:   Change the type of the length
 argument. (Sean Estabrooks)

---
 src/if_py_both.h | 7 +------
 src/version.c    | 2 ++
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/if_py_both.h b/src/if_py_both.h
index 60375d1161..931ecb98a7 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -74,18 +74,13 @@ static struct PyMethodDef OutputMethods[] = {
     static PyObject *
 OutputWrite(PyObject *self, PyObject *args)
 {
-    int len;
+    Py_ssize_t len;
     char *str = NULL;
     int error = ((OutputObject *)(self))->error;
 
     if (!PyArg_ParseTuple(args, "et#", ENC_OPT, &str, &len))
 	return NULL;
 
-    /* TODO: This works around a gcc optimizer problem and avoids Vim
-     * from crashing.  Should find a real solution. */
-    if (str == NULL)
-	return NULL;
-
     Py_BEGIN_ALLOW_THREADS
     Python_Lock_Vim();
     writer((writefn)(error ? emsg : msg), (char_u *)str, len);
diff --git a/src/version.c b/src/version.c
index 6afaf8d317..37791e6a82 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    652,
 /**/
     651,
 /**/

From f4b74091c3ba112b54d18e1d0bfac128d303ae2b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 17:28:21 +0200
Subject: [PATCH 012/136] Added tag v7-3-652 for changeset 5edf3c51aa93

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index fb9bdca4f7..ba6451786c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1988,3 +1988,4 @@ e70485d3f81df4d72cb40d6fa4ad4218cf1e8392 v7-3-646
 063765c3cebbd6040dc091b8c1ba28739fef9118 v7-3-649
 a638ae0f1b0cc41d8d753d79503238f11215f3ea v7-3-650
 ece544e85821a6118da55dad1538ea4c3625bd1c v7-3-651
+5edf3c51aa93110e57fcd0428c30e5bed149df34 v7-3-652

From ff38ed852335ccdf79007020bd5a82779f29c4a0 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 17:57:39 +0200
Subject: [PATCH 013/136] updated for version 7.3.653 Problem:    MingW needs
 build rule for included XPM files.  Object directory 	    for 32 and 64
 builds is the same, also for MSVC. Solution:   Add MingW build rule to use
 included XPM files.  Add the CPU or 	    architecture to the object
 directory name. (Sergey Khorev)

---
 src/Make_ming.mak  | 69 ++++++++++++++++++++++++++++++----------------
 src/Make_mvc.mak   |  7 +++--
 src/version.c      |  2 ++
 src/xpm/README.txt |  3 ++
 4 files changed, 56 insertions(+), 25 deletions(-)

diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index de706eacc9..8e523a24e3 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -1,14 +1,15 @@
-# Makefile for VIM on Win32, using 'EGCS/mingw32 1.1.2'.
+# Makefile for VIM on Win32
+#
 # Info at http://www.mingw.org
-# Also requires 'GNU make 3.77', which you can get through a link
-# to 'JanJaap's page from the above page.
+# Alternative x86 and 64-builds: http://mingw-w64.sourceforge.net
+# Also requires GNU make, which you can download from the same sites.
 # Get missing libraries from http://gnuwin32.sf.net.
 #
 # Tested on Win32 NT 4 and Win95.
 #
-# To make everything, just 'make -f Make_ming.mak'
-# To make just e.g. gvim.exe, 'make -f Make_ming.mak gvim.exe'
-# After a run, you can 'make -f Make_ming.mak clean' to clean up
+# To make everything, just 'make -f Make_ming.mak'.
+# To make just e.g. gvim.exe, 'make -f Make_ming.mak gvim.exe'.
+# After a run, you can 'make -f Make_ming.mak clean' to clean up.
 #
 # NOTE: Sometimes 'GNU Make' will stop after building vimrun.exe -- I think
 # it's just run out of memory or something.  Run again, and it will continue
@@ -20,8 +21,8 @@
 # "make mpress" uses the MPRESS compressor for 32- and 64-bit EXEs:
 #     http://www.matcode.com/mpress.htm
 #
-# Maintained by Ron Aaron <ronaharon@yahoo.com>
-# updated 2003 Jan 20
+# Maintained by Ron Aaron <ronaharon@yahoo.com> et al.
+# Updated 2012 Sep 5.
 
 #>>>>> choose options:
 # set to yes for a debug build
@@ -31,32 +32,33 @@ OPTIMIZE=MAXSPEED
 # set to yes to make gvim, no for vim
 GUI=yes
 # FEATURES=[TINY | SMALL  | NORMAL | BIG | HUGE]
-# set to TINY to make minimal version (few features)
+# Set to TINY to make minimal version (few features).
 FEATURES=BIG
-# set to one of i386, i486, i586, i686 as the minimum target processor
+# Set to one of i386, i486, i586, i686 as the minimum target processor.
+# For amd64/x64 architecture set ARCH=x86-64 .
 ARCH=i386
-# set to yes to cross-compile from unix; no=native Windows
+# Set to yes to cross-compile from unix; no=native Windows.
 CROSS=no
-# set to path to iconv.h and libiconv.a to enable using 'iconv.dll'
+# Set to path to iconv.h and libiconv.a to enable using 'iconv.dll'.
 #ICONV="."
 ICONV=yes
 GETTEXT=yes
-# set to yes to include multibyte support
+# Set to yes to include multibyte support.
 MBYTE=yes
-# set to yes to include IME support
+# Set to yes to include IME support.
 IME=yes
 DYNAMIC_IME=yes
-# set to yes to enable writing a postscript file with :hardcopy
+# Set to yes to enable writing a postscript file with :hardcopy.
 POSTSCRIPT=no
-# set to yes to enable OLE support
+# Set to yes to enable OLE support.
 OLE=no
-# Set the default $(WINVER) to make it work with pre-Win2k
+# Set the default $(WINVER) to make it work with pre-Win2k.
 ifndef WINVER
 WINVER = 0x0500
 endif
-# Set to yes to enable Cscope support
+# Set to yes to enable Cscope support.
 CSCOPE=yes
-# Set to yes to enable Netbeans support
+# Set to yes to enable Netbeans support.
 NETBEANS=$(GUI)
 
 
@@ -431,11 +433,32 @@ endif
 endif
 endif
 
-ifdef XPM
 # Only allow XPM for a GUI build.
 ifeq (yes, $(GUI))
-CFLAGS += -DFEAT_XPM_W32 -I $(XPM)/include
+
+ifndef XPM
+ifeq ($(ARCH),i386)
+XPM = xpm/x86
 endif
+ifeq ($(ARCH),i486)
+XPM = xpm/x86
+endif
+ifeq ($(ARCH),i586)
+XPM = xpm/x86
+endif
+ifeq ($(ARCH),i686)
+XPM = xpm/x86
+endif
+ifeq ($(ARCH),x86-64)
+XPM = xpm/x64
+endif
+endif
+ifdef XPM
+ifneq ($(XPM),no)
+CFLAGS += -DFEAT_XPM_W32 -I $(XPM)/include -I $(XPM)/../include
+endif
+endif
+
 endif
 
 ifeq ($(DEBUG),yes)
@@ -565,10 +588,10 @@ TARGET := gvim$(DEBUG_SUFFIX).exe
 DEFINES += $(DEF_GUI)
 OBJ += $(GUIOBJ)
 LFLAGS += -mwindows
-OUTDIR = gobj$(DEBUG_SUFFIX)$(MZSCHEME_SUFFIX)
+OUTDIR = gobj$(DEBUG_SUFFIX)$(MZSCHEME_SUFFIX)$(ARCH)
 else
 TARGET := vim$(DEBUG_SUFFIX).exe
-OUTDIR = obj$(DEBUG_SUFFIX)$(MZSCHEME_SUFFIX)
+OUTDIR = obj$(DEBUG_SUFFIX)$(MZSCHEME_SUFFIX)$(ARCH)
 endif
 
 ifdef GETTEXT
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 283f0d43c4..20b306d19c 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -213,6 +213,7 @@ CPU = i386
 # We're on Windows 95
 CPU = i386
 !endif # !PROCESSOR_ARCHITECTURE
+OBJDIR = $(OBJDIR)$(CPU)
 
 # Build a retail version by default
 
@@ -283,10 +284,12 @@ NETBEANS_LIB	= WSock32.lib
 
 !ifndef XPM
 # XPM is not set, use the included xpm files, depending on the architecture.
-!if ("$(CPU)" == "AMD64") || ("$(CPU)" == "IA64")
+!if "$(CPU)" == "AMD64"
 XPM = xpm\x64
-!else
+!elseif "$(CPU)" == "i386"
 XPM = xpm\x86
+!else
+XPM = no
 !endif
 !endif
 !if "$(XPM)" != "no"
diff --git a/src/version.c b/src/version.c
index 37791e6a82..4c31c9761f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    653,
 /**/
     652,
 /**/
diff --git a/src/xpm/README.txt b/src/xpm/README.txt
index 6ec5220899..586de6c817 100644
--- a/src/xpm/README.txt
+++ b/src/xpm/README.txt
@@ -10,6 +10,9 @@ nmake -f Make_mvc.mak GUI=yes CSCOPE=yes NETBEANS=yes XPM=e:\hg\xpm\x86
 MinGW:
 mingw32-make -f Make_ming.mak GUI=yes CSCOPE=yes XPM=e:/hg/xpm/x86
 
+MinGW 64 for x64:
+mingw32-make -f Make_ming.mak GUI=yes ARCH=x86-64 XPM=E:\HG\xpm\x64
+
 Microsoft Visual C++ on x64 (tested with versions 2008 and 2010):
 nmake -f Make_mvc.mak GUI=yes CSCOPE=yes XPM=E:\HG\xpm\x64
 

From 15ffbeb6c67b8e261d3b549bc6f623772c55b317 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 17:57:39 +0200
Subject: [PATCH 014/136] Added tag v7-3-653 for changeset fd0c7452fa51

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ba6451786c..0d2c5a5a88 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1989,3 +1989,4 @@ e70485d3f81df4d72cb40d6fa4ad4218cf1e8392 v7-3-646
 a638ae0f1b0cc41d8d753d79503238f11215f3ea v7-3-650
 ece544e85821a6118da55dad1538ea4c3625bd1c v7-3-651
 5edf3c51aa93110e57fcd0428c30e5bed149df34 v7-3-652
+fd0c7452fa51118d8f6557b34b4cc96e830ef6c7 v7-3-653

From 817a4b1cce62b87eff76d5729fcbf0f76cc1f608 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 18:45:28 +0200
Subject: [PATCH 015/136] updated for version 7.3.654 Problem:    When creating
 a Vim dictionary from Python objects an empty key 	    might be used.
 Solution:   Do not use empty keys, throw an IndexError. (ZyX)

---
 src/if_py_both.h | 28 +++++++++++++++++++++-------
 src/version.c    |  2 ++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/if_py_both.h b/src/if_py_both.h
index 931ecb98a7..3ab18516eb 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -607,6 +607,14 @@ pyll_add(PyObject *self, pylinkedlist_T *ref, pylinkedlist_T **last)
 
 static PyTypeObject DictionaryType;
 
+#define DICTKEY_GET_NOTEMPTY(err) \
+    DICTKEY_GET(err) \
+    if (*key == NUL) \
+    { \
+	PyErr_SetString(PyExc_ValueError, _("empty keys are not allowed")); \
+	return err; \
+    }
+
 typedef struct
 {
     PyObject_HEAD
@@ -659,7 +667,7 @@ pydict_to_tv(PyObject *obj, typval_T *tv, PyObject *lookupDict)
 	if (valObject == NULL)
 	    return -1;
 
-	DICTKEY_GET(-1)
+	DICTKEY_GET_NOTEMPTY(-1)
 
 	di = dictitem_alloc(key);
 
@@ -730,7 +738,7 @@ pymap_to_tv(PyObject *obj, typval_T *tv, PyObject *lookupDict)
 	    return -1;
 	}
 
-	DICTKEY_GET(-1)
+	DICTKEY_GET_NOTEMPTY(-1)
 
 	valObject = PyTuple_GetItem(litem, 1);
 	if (valObject == NULL)
@@ -784,16 +792,22 @@ DictionaryLength(PyObject *self)
 DictionaryItem(PyObject *self, PyObject *keyObject)
 {
     char_u	*key;
-    dictitem_T	*val;
+    dictitem_T	*di;
     DICTKEY_DECL
 
-    DICTKEY_GET(NULL)
+    DICTKEY_GET_NOTEMPTY(NULL)
 
-    val = dict_find(((DictionaryObject *) (self))->dict, key, -1);
+    di = dict_find(((DictionaryObject *) (self))->dict, key, -1);
+
+    if (di == NULL)
+    {
+	PyErr_SetString(PyExc_IndexError, _("no such key in dictionary"));
+	return NULL;
+    }
 
     DICTKEY_UNREF
 
-    return ConvertToPyObject(&val->di_tv);
+    return ConvertToPyObject(&di->di_tv);
 }
 
     static PyInt
@@ -811,7 +825,7 @@ DictionaryAssItem(PyObject *self, PyObject *keyObject, PyObject *valObject)
 	return -1;
     }
 
-    DICTKEY_GET(-1)
+    DICTKEY_GET_NOTEMPTY(-1)
 
     di = dict_find(d, key, -1);
 
diff --git a/src/version.c b/src/version.c
index 4c31c9761f..b3daa7d61c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    654,
 /**/
     653,
 /**/

From 11f53ee19aceecb4c721c033624d690c8941687f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 18:45:28 +0200
Subject: [PATCH 016/136] Added tag v7-3-654 for changeset 73557eda7027

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0d2c5a5a88..911a325b98 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1990,3 +1990,4 @@ a638ae0f1b0cc41d8d753d79503238f11215f3ea v7-3-650
 ece544e85821a6118da55dad1538ea4c3625bd1c v7-3-651
 5edf3c51aa93110e57fcd0428c30e5bed149df34 v7-3-652
 fd0c7452fa51118d8f6557b34b4cc96e830ef6c7 v7-3-653
+73557eda70271b49015265b7147562b63a7a094d v7-3-654

From 16c23bed52e3cbb3dd89b43c1ba07d0fb8c5db8f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 18:49:24 +0200
Subject: [PATCH 017/136] updated for version 7.3.655 Problem:    64 bit MingW
 xpm .a file is missing. Solution:   Add the file. (Sergey Khorev)

---
 src/version.c            |   2 ++
 src/xpm/x64/lib/libXpm.a | Bin 0 -> 73758 bytes
 2 files changed, 2 insertions(+)
 create mode 100644 src/xpm/x64/lib/libXpm.a

diff --git a/src/version.c b/src/version.c
index b3daa7d61c..9deec1739c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    655,
 /**/
     654,
 /**/
diff --git a/src/xpm/x64/lib/libXpm.a b/src/xpm/x64/lib/libXpm.a
new file mode 100644
index 0000000000000000000000000000000000000000..cd8bb7e8af647372a73fab5fa72b2cf28f428b1f
GIT binary patch
literal 73758
zcmd3P4SZD9nf{$*fQaZsMWtOTqmCNXLc)h61=|dnz#W}vDhRYvO-O=?gd|NS0v0tm
zla|}-D7#hHcHNe(ZI`z0%5E)1Yc&BRQmu{DS}m={R&8QLQ$G-?n*Z~h_uMlxN$7UF
zwZH%QWpbbQJ>OsNdC$4$oO}9$>eib2PfnZ}%r-@{=UgynUQyA!Il*9|vda7)3>M8P
znI%4|CR&!Y$g;*y8T*%CYFYe!><0NwKVn(lZ^hRvi@z&xl3(r1mUXn>b=xc}^S9{?
z%i=G2ZT8Oro%y?UvSr<Ni)Gz;n*6@`QOnBwJ-XAfo<*Aen%_$umNjtxsGsk+4$F7K
zc>dP6tX<SvS69~D*xb6bdR1ecwL&=M>*IAzZ4J#$ZRCXG@z#b_?eV&{B@NfrS@0EY
zYKW(~<SePnWawZroPbl-T2~#fTiCvObzSSC*5<WfMb}nets)(1H^L%P9j_kSi)SMq
zkdU@`YfW`qUCr7SCSAf+mRbJcu(G<ft&ZNqO|{}|3=fjpw1t;u1~$^p#KJ(w_M&VM
z_a$}f<4aJeO;@w*NG)$}t@ZHbQKH3l8BRcyt&Nkdl5N*j*VeU?WQa>QwA8hcu&dkZ
zmozpjcf`@AcwK9gXQOJEHJ8O;10aJID>7<?d_!m0H?3}F-aKoPutoJp0V}H8)?|=`
z)$!)`2Kqo2%3E8TTXnv{i8ZWht!~}0tge+!%?p*!%aFfC4UKh6o707y=6U6t=9uP^
zW+4>QCdj?)>Q$Fiua$B_QZ&gFl3KiQHENU&$YJJ;djurS!wZphFF~(rZb#dxud7*u
znyjd9Y;3NvvUp`<@Q@hga7CnUb#;4Vd|5+Vdv&AbkxOb2ISNDDM(SGP^@dVCb!|18
zwrU27v{r-}p2nYUuWQ|)FuE@D;o*#)V6D(i6*Z4|&|{i6m=avx+7Pc}*=ICy6p4y&
zS#@K(lwdk~)$kOVAv8P>UVB%GxVUbE5+_+Pcy*b@^h%mdA<IHiX^C8!(d>;2-gt1q
zyzKFysIc&Y3oZx-XU&~m;*AHjUmS-a!LnYPU|A<C<hN$T(E}Bhe?d6;4d9mXLZ5&~
z(5kGOQOlnF=S`_q*)?NTTic&^Wmz3`w>~?-7(Bfv$ur(dt-{h7E!pmD*xE?jCy)o4
z6Y-<F%a<=(VkcfLusiqJ&SUXQJNMr(Kk<sscAl_P{>$v{KEIu6^cAiSOiL<%cIt*g
z+dUr6<Kz0tu@igq?2-@KU$IMGYk$FZp0yKu3a+^Fs?QCGtq{9C|KZESOS9t)B(I0d
z&i(N^#2a-UXS}ggWA~K6w1{Oz-ASQzWMQ{4loxe3hVnZP#-|k>TD`?~C%u!lM`C;>
zZ?AhrIk7v3<9W98u1aP!v1dv}$*b-6W~4B@GMt@CGIp<~nc<~(XCD%`J54jLt6ZPm
z6E0-_dcwtgfNT-6UX$zjJhaDe_iXAQgaO<v$Z9Y6u4VbG_{rdH*Swxh7`T;rGc&%P
za21(7;T3!g_Ne5g(<9Yah!i=G9oo|oztMIt%D0`1TilB#ITzRWESyAdcF)3mK9QjK
zw5V$r!bMfswF{h!S44YC3uzbbDJ@XXLsowL1Xu<WkLEiUhk!!P#RZ8+3*3wHoLo1@
zx%hmiY^uA^@00~m*@dX=-KKpU+T)9V)xB<#?Y1HrOG5=QClU&#CcV#~RZZBPUA9XL
z7Z!n}3x4PD4d*6a_t~jS3ZqVUEH(MYX!q~@QQuDo{dS@oyrO8LJ1<u9B${RWLE9;7
zaTiW<%Ic$TDJr;ZJ)Vdx(Se`<rvS2`N95hjMNad;xA0V@f#(#`1226rJRF$TLF^uD
z_ms5|IgfU{_(8`@IZkf-4BNdJMdsy3Wy8%?8Bke)7gdBkWySQ_Q&!K%z%2+iv%Tv|
z%84KAe!94Gf1tC&$13Rvbe1UK3nZU~znHtGr2_4{#x1Mw?7Cq=qTd&D4pyXUAIW2T
zZ@1V7z4m#OzL<Cf#r0DAlTo)qN<HQbsAPM&(`iJ;*0V_;=UJ|2%5B%}-~$%<+Cmks
zw%a_?jtm-AOz<?>3oWx$++4Q43GR{=o%`Fbk@i2)P3(lf&aU=Tdva9>T6n0Q7?@Vd
zq-=+UmkMH<9_5c{aId?h9uc?n7yW5?ctrNx+`%uyuByLN?5gOar)&iuZtlRkVfb*P
zg<~gopc?h(%Nu9qE%X=WR^_z#D$!{tO|T{{%qyHwHNItBrN1kummOLECitxhm*p1b
zRQX!Qa>rQf`46TAzZ2mxAI~73XX6(FF2wV{@GAiB!m|p+0)<>XImWPoU5MXF`1!5x
z8T3<wUNopF$FeY4fV;T}MSSct=tYBGHRu?>=k5%HK55W$gSHto9%+)0uQ2iYkZ$3D
zWgUZGF4EwkJfMK$Q8bAyOF<CRE4EV%Z>m8-V;eF&mX!EqIf>sw!<%CeOHOPT7+$GC
z5o0@JH8dGeG#?CG*3~|(JJblz`_CNF_^hCngB*`#P63lOt=uRFOl=UZ)0|I$!&*;s
zV&HUTaXtqQTY|XB)IAt+u8%E)8b{h>>K$kXaFe$4P^Qj-z{hrzp>Ht9xjv>Y+hpn*
zNC@26_)iTZZB|3COj9T^MKl{0ISEiu1C0v$A<r+f)NZYcPb_Q2^kGqJ)YBA=o>)A#
zo;Z8<tPDL-l)qZ6Ah6A{=VjIvIi=9Q{HTjAb^{o;;}1noY|YmHN)b;)#|fwm^v=?e
z`Xtkn9OZ7bKFQv>4ekoKS^~qIQ=bek4=*!g-lkXAqs>%cz;|vAbpb}5U&Wkcs29-g
zQ7tllZP>Mn_Cak3+}@1=!ij|{<JW}U(t^&e_^PP8q7cJh(IF^>rLk1al#0~(du;dE
zen#njAukmlf2{4U$%m#lwdjD17qQ<$C*AE+PD-AK3;()Tp!vm|-v^TafM!ljaPY@H
zkx(TA`N_HX2Vx}&Xe5<I2M}?E?dnvzb{>bpJQZAO#W>r&O_EPF3l_(S#mZdR7%x+@
zZG69t{-lA+7FRV@+Yik=H@Kp*B6zO-@XU#A@#=U(P4vNFO?`E1@Z4bZp|y2ad@gul
z@C(jB%(*AD8Huu;c&Np8Hip*6oNt9Xz==8cg|^_ix+fXB6VHi8v5Gp61d_*~58A1v
z^wj;(bl9sTx+_DKod*J)52Dz^?&7?1_fn|#C+ET5PQ^kkP}2&)pG0-7+?}BO*og;K
zX05QZCw_wM-mIuYzWhLE4yrJMFjtl{&}UJu5vMPl*pmxIBjS6hC*p58<NS%1^NIw-
zCa^n@JPnaMe^iMJ``)sB-O4uNqSDJd_XRp*lDJ7>cRAGj8}s)jLoJXLXLNQ2lIvkd
zRVa0z;!zzdR?PxMQx$c78%-@e#U~S%$ONUWmD<RR9ZfC5w4z7rcU0PnZTHle^KQ`r
zNt+uFmB!rIw7d$`=QKM-5r#53nO)d+{up!pQ^et&wr?+*R-T>sQ$hRBdd4$@m~p5q
zPe0^)J1evCxe@1unDd6@(@ykgEo1)1kR3>V6JaCG18bpy;F;FvJw0vb`_xS~?O_Mv
zY>Em|_{#8AyS)Y&a~C4PD3_VgQlhDf=}0jXu9BK+nLcnT_+FL8+;F~f{0%UXF74L#
zJ*%9DeR~EvVUuc_$F6{awg!gY8y=2friE$3^1QG+0rRH7y}J@!{&3*l#s1XNani%6
z&7+j70?D~ZaD+Xm9I5KeN42q;!MDG{ZO)In%~Q(Vd2m{fhGOT!OX7%6)ggG5tf1uW
zh!-)|hf|A&A7COPPHm{M!g(+3{K`&rVT#j@`pvNe_x@bftPNpN8s6&<oq;~>EAKoM
zpBHmpE;`^w{*@IMbq-Sy*uD?gOxQA_?$U8mK;e?-);$x;tqqmhxs4$^+=D<+o8d%{
z4`Jm-P)o(_->Pu_5OI-&@ZJfCqDMth&J@O+4=8RT6d8Y6T+EZoL*U+?sIMn-UTvrn
z&3+|=?%cOHwQ&Kof2skV7%6u?h~>sZRc>X04JlaE6>|<@&X7Eaa!D;5rZ8l-C=g?A
zE-Lg)SRmJ`LLnOMJ1H2^Vj&yPV`7uA=j0*+`ItJnNL(993Fp4OCC{&W-V>D_aG*rx
zzoEXO4^U>6uULu_+A|^MEcLexOhN<k8Y3zu6@kF<bw}KbLJ@ai5K*u>n&#C@1zZad
zw8kl_H6B1CXKT!jg{pLuG#(y?oih}fK4d>|{=_pF`z7V6jT4URS(Fz+LTu-h)jf+Q
zoq_T~Q(D;LFTQ?0dLv@sIAc4$qOO6TAcd+Q4g3HIQ&iL!Ry#Jmx{aB4?+f+u>HH$*
z?5c1cwL1^QC)hF#iKT81btubtD5#QzDaryHEi7z9SeDw(8;To4u1oFIZQAj({qG+}
zHnnH8>tf|fiJVP)80!^R?)IFQ7j>ae^*;t5gO6|V%*=DoYCCu4MC**RYJ=XNCCEDF
zthV4;ZI&*M6-z;!L5dI0_)eN=o#eaKnpAjf)x?%#D)YL=_xk&ChI~-%kMW&s<rMm=
z==N)RooXwd^PrP(Jii)0YHfb&%LZ{mD!exgnuKO5ymdgL>E8|{bB*ml$Er~F0kIMI
ztrH;)s0;h8LLhPXpFpQ7-X0)ouYT(>Ao2SvAn`j4Bz~u2lo7uXAg0)FT@NHaZUPb?
z-!;7dGCa<4B$T_+J|x}%B)y>PfOIH863RBiyU*~BMQMq<d?0bR!0^I`_Y}}aRQg^4
z!V4OtG#{n>4+`O*g&_5;NKhW=;}nmxBH`s5#9WK*=-G+USZm<O7-UizHDf?MjAepg
zvi^@Yt6;kbWqJIY%_=gqQ>HZ6SDY0OiA>E@m4`1oEy_*CDkn06aM&t{vQ0?_nPXw~
zx)JN;+IVx3MIOT<2X1OwHh3(>X~D~v`05e9KI=L0d^M%L(br!x?_m(^abmpm-0m?{
z$lnHqrEOV~mp2?-ZO>fx9%&~l-<VLPm(s_Y@?`PMn+7i`FM{+N3<RiO-FUBGJU13*
zPm${Q|7P}7G#hK}G*uI8zbN&#4U_q!&7OMUgtMnob{81D0!8V32&?QF?UV5o;`bDK
zL#8>}?8&dw=DFppD07BPK3i!4+%<CH0){ysWA?;l77Ub}Jq-cs*%PIMH+zDn%thTm
z=N};7pu5#GG&~#ia|NGN>mOjMphG!(F)S_ZemPfb3eex8&YnP$(k?wMxGS_3&h?Ot
zQ3`%WO%7r;Ls8#zoFXW3CG!J9H9yEjda2jfE4}`Cq%J!BIgaVWVXV<dGGq6L0?C&l
z<Zb8I(D1^(L;Z*wiCK=!EmqTj&izmnO9M%Ef>`RF&{pLd!)uJXf6>91uU~2S)NZtP
zkLeRsG!@cVx;+Q2Kcm~nroV<%rV|-Ro`f94oL4duNR>Y7L|(;o;1OR*W2ki9Cao_+
z>kZsH0hw>aI`;~dX_kC4)PY!$C%>;daIa9QNk5JF{;20cT9;lCNd5|K99dZ!&Ry&;
zIsj$4k?YJW!tT0BHgw_Cq+PZ%F)$6Q-IIT#@`%?Y0_>FSvvVgs58e2Aq-?jZ<hizI
zk(8y>lU5**#&UNi8`Nf&Kx)#XDm}ZRsmV{<xrich7;5$joLsG^;$PveQ>wdjTPO(+
zf#l=(pXkqVA5=7Fq@0OD`@{M?RAtOj9}L|I4ocvcQAg?NrQuZhaAKEFRCvzXoLyRv
z{}uIk%u|<Q0zvJp9LwGdlnyW2+Mm&`Cy$qAQu5n%&r*@Eq9WhI*#KHWZK${+_nZpn
z>O83Jc`<17rR{geFq>E(L&}-Hm@6q~jEi(`Y|I4L|Jmt7W~9uOr_tNKNNBx{VqU-3
zXR+0DGJ85IQI$HiQug1XVd$l-R;(~gMO;gZ4zS+1Sm3=&V|}fACFZ=KGKUEa)JFKs
zngPn<NFaF}l-jHXl5+F}wMH^$kM}kM^8meC(mA{+)i~3K^$@Vu<i|f+bbxOYMy;0k
zxLWcSR!idJmHPi+V(-K-S~!IZGGt*jVnxJh3^fjX8!EkO+ye!i#qRW`2o(-|?wv4j
zEYcToqnHkagAgUuYhqrPx-;tAJMbGdC%8??50(*|q`MH)oz_B58?j7q0_F^{&<Z;>
z^-0)wz~0V17Voauvhz6k{W(}z6u_LUv0Sebp_XmTjP|l=mB!rhh?)vmdFlq4u|`UU
zuRRH`O;ib^0`u(LT)afei?~gBcB%}`cy&Jg7Ncndl3#?^qJxlGIb2;re|r@v8kFUr
zaLPZU<Z#=msKi&j(9roJgLo+w8O*0#2$vjO_fz)W;>D@>g_u1Z^j(x%`AVKWABzt0
zNmxCYf(jbA90kZ$YlE;KP?H@@a#r_*^OizPoiOl22u@50Z7jGH5AK#ie;&LKc{a25
z-T&=uW<Gpm%x1h93??umCNVOd<a8#}$n53z|8e$GD5`?RXAgcHPpQz!tmGeoL`&ZW
zB=eJ3fn@G50j*dx_fG@KoM07@%s?7|#BV#0`29y9@w*L3{2np9xfqOu_emg`Pt3q*
zp=TQg{RxQa^jpWGM+@Q`6+Htn=r=%;f){}#1<Nt43a<)Ccx!>g@ArTt1wS^tT9k^+
zK&}Il83=X#4`&9VwZ0l;&ln_L8J`7>7Ns?oq5j4?RBp1?%IP83$GWAPwE6I6Afa?5
z8vQM2AagT9M>Bz0XgEioT`bFXGkQ)EZyhn;7(KTcdj@h%R>&keM{zi^i(v}40z%W5
zSq3WnFWp^tl-Wnw82g;`OBfT2H?jDOCLcAe+$-q4x5181z2ozOqrAB(Dk`2g7c-B{
zxyRB1%ep{idGwo`mY~c%ww|FJSnKfkQ05*PZ`>HuR{Y|p6Q#{qa|){blaaPX=ZHJ@
zbmeZuTqX#9ht7kzq`S&e*+~*q^Nq)B=joX9^SBI>om~%Ld>Y1X73U2us$$iO9*g#4
z1ipQj(~C_YLA42ldsEEL8SE-ru`>vF;l$zmb(8S_n2&TN`VJ?$@;Nf&ZOLX>Langz
z;1gx9o<Tl20K-X#K)rU3cP~oYR7z?NLwg@_ufXP_NIHZ8c(I@xXT6C^yo#Z99BphU
zd)x6WI#f>e^k?PHBh&?VDyw5S@D~pEmUlu`Lki+csO806)q9~-bW*6%reO7!q65?&
z&ow(=T>m#Pfq}*yc7|+hyC`=jCBwr{hoPXpXy<MW6>#2zjZ!^I9iR)&Rtk{;J5#-j
z4)=-fo0a}eui6u#96cD?$;W-6?RX&ZSiFp2Ua=Ka1UmgTJY()Xp*}nl!&p%MNDe_x
zAju)jIlMRNS2O2pk4b#s4}9rl6i5VxOm7v=Yp8-b$R4Jd2f2iwTn0a=>!O3Iw&9M^
z(Bd3eKzB?fLkz9F=*3RF!{}*0ZSX?dU6LQzkz-Tacb4RrZT6o7B@)^G!?mZoxrxKM
z@!vxCeHL3XM1#t3u<rTJLxJQoNU#@h460@^_4O{q8+JZGM7D#8&F;aIsf&dXFtq!^
zaLHSNBxi(CH-IUmN-S1u`ywST+s>aN&O0%v+Qryq#-NdlUWCSNF}9mO%uy5Iw$L+R
z^5w-G+AMM>ebaeGEGw|)dv4S{g?!I>GSu%mcd*q=dDtqJQ2FL#ehTYA=K;J?Ngzlc
z!e<eeEDg;Gbbb$9tWCeg!cCzc+>gOenv@MKwxFo1^U$02_XEj4fX#-<%%kNz4AL4r
zHL&9{zMv>v?JTIo3yG3<0?CJ91HCj93p_OIA~*6@DW;L_zj^?<wN%)uK)}1mfn6ZU
z89JR0-Uo#l+l*o^x06`$f3V$SBo9&da<l>H&)wl+H9^DsGATATS`-`EsoPZLtG;l5
zDFR@^F*ilp<1;hTz1`=%d0?bWdSJ(itDWRhHXY20ONQECMtf%Yu>K!|k`!}4&J?NY
z7D*Fvu^<5#eAk$~15Sz#4J6=1HMfUMb4yhYZ#wb;_<=7eF;R0k@T25LMzosEcBAqk
zbshLoS2<ooAwO88xamE-rW^hxt2*fUV549y!xbhiX-BAv`S(c$Cnq5#s#OP)t&oq5
z;~G3o>rSWVi!I>qM9uS+o{eBLd;IQ*ZXo4+zcWFVfT|NzP}F(V6Son}fTR%iVcvu4
zMIlhudF5-nW%+@Jie;8vmY-TYe4&&@AKXeZJAd<M3+*Y|)*$^$-$NrpT6QZ&|LVko
zYpg)>hsv|pfv_!8T7nyaYu$y)ogr@64E)GnuZzs<MF-=Bs$IdB&Bya3MLf2r%%XlC
zja(P?WL?ygGK<>j88}w+r)Kg8K1M3Fl5c5#V6i2n$0tm+GH2e{#rkIZD+9|=ODJhJ
zNHl2_^+jOlPGTygNY<#3Yt{&h>JKQKqJx74nc-*2!p+I^*%H-a(d*ZqDbkR84Nw?b
z8fH0J_ghYhA4Tw9U+YH{@LvpRfw%nsiRqu$FInbZZIq)|NE_FcfjyEDchXJH8|kX}
zcve-2kBpia;Ul9SIzNKqR10|M1T3OJ=W8O*LP!oJa%BFuw8f_|{b!e&jQ*pBJk&d&
zq=F1g^eZedAq`)K+w5S+Gkcl!hP8^Z>I<H~3(uKO_1eeS?gy?N;o6MfW4o94hl`j#
zZ{Kn-umhvp)5)&*hQN-G+R!3IU?mT<pFJ2g;RSXq#*WryKDdhpc3g?&uO46WK)e86
z0}nkq{7dYq2t4!{o+W$YzX(s?!`I@XNa1Dw?$uiY4|Nso4?MJgx~E@}9oVtVSJXAw
z4<U-j3z_=X2z_Cj>a7ok^3ii_=mb;v?A))`l4-@)o_nb@<iR44d=0~bn}ZdkZKZ+E
z<&YTLeC^ZJ!WA4#%R_S<Qa*Pn+Rfbt#i9=W(15XGf;}9E_LM#V@kM1W4!#vXG2$ke
zkchJ@0<9^YcqPY99rsUf4-bFWLT^+r@Z*zWZsJim;!fdG@Pk<0)><J}NZfyU26ncy
zGGr%?<iKJDLtb}0_G#n+xc)8hwjzR&k{N;hN^mh!yckGgEe`Swwpc@oV>n54bAL!K
zQo51jRu#tk6>NxAT%F|t9(Ir%#*1*cv7uFMMmTDh$>4Ievq<(=a0%;=Xq=Gto!2u0
z^tK>lR<8$o$}RK|<oAp)Is=w>px^ai6Z0eZL7yyS_mBdg4nJIB>bwmgu`v|)T^q#m
zPTaH~=b4y0XD@nCduL+Mm-v%!-9gxIO#EqF;Et{&#+v7mKI15m+{5Ii(^w&COs-Vo
zFcz};PMgDG1=Z7~p-L8h(5vBLtgmCQ@fTtk>A4Fb?B)Z}IXMO3I8Q>U3p@VJ^g<`J
zD5b>-&IC9oSqu^-K$GEIJIfy!fT*zD%St2e8r#N-atGWE+=g^|`n%eB0u7pZ{Nm|I
zII9y~Zx}VTl1riRkTr5rgEkqHT<KQI#uP+Wb;eGlsAQ_${DCtOAm#@sR0a>8g~APd
z>1L#E;A{A2<j1l+Za~5EbR%|rKuPI<Q`>ppc5vcgf7E#@aC=vI(Xg}E(?_{?Wbc&n
zlGkM?N7OxydkQ9(CJ)5}G3R&QKn|I|1QzX2MBPi&<}yq`bZfjQv0#GLj@3!7k|$ot
z!_uamxGv9%zkw-F;Fjx|fIDq>at{&^zoowc3#d@`I#u~0UfcPA`&E$Q*KM4Xs1GFX
zM(IWqpF{^=h>S+vD-j`dsIP!XzuoCSU4;|qyp`dj0LN(0rw^QmpwLd&j|<%Tb$UmE
zsvg25ODk5%Mpo8C|DUo2ohos7d?0x-8(?A=mTa#(Y{dtdkz411CwpzAygGZ?G)AOe
zjS39Y)Ns^!#%r+bm}tFd$5O+ATb@ATz2=KP$+jDIv6`!!@1tR7az`rc^O~*Kj2)kL
z#m4KL>NQ{GoPC>39NwIqfpgIkS!H2&5x4$16XKWaGVJfevL`B{+!UU4f{1gv7o8ix
zn>rFI8tkJ&Uz&t5O(H<(kE0G4vNHimK%Ca#9<O;0{8lZLi}>w_m8zsnS&T}hM5~N9
zVpsdMM^uMdKky`KjMbsqPKwQ&E5~VlQ38a_A3IFllg74WY!Kx=ud7a~q`i^aNVgKw
zO1uwLBROimmc27nCfs+awx-q`Fd2Wk!r2?ckfg>cY;I&7(%5>VBQfB&`0P+{8zBt1
z_Xx7$6QVr|^3^0mvf=?YRtZ#W*asG1E{`$H7wFs%N8ULhJn?!;@~p=I8R)v{2-Dkb
zeou4-k_W(ZmrOxZ+=y|@&(UYSig2R)l`g~t3k)hJuR<ZgK3|O{EgaJly|87CwYZl|
z>V6?d;^V7WY=c|Egk`an!uL4U_$;=1aoaxz8|vYu7>7BLW~oHrEyhO67p(8bAkH9u
zRsCV^4|~2C!%MkF9@g22UIn{S`eiwjDD2<*4*LFKF3L0pl4l}|8_!a5gk{Qe9eI$a
zf#gI|iQC|dQ=#|h8*PY{n4xHcb7vL@J27?k5AwK{98=+Bhe=a!k6%K#6`e1}^St+B
zJRJi<oT7y{Vr*c0${HI`S$W%XSXrB473lnw5-~cij9O;bNrpP;CV8crDs992^s~lx
zjS|=h&11_!h^x*6UVXEWS|Ie{2mO!Q0m_5AZ`@txhs@mQ3*V1CSnlzWKm;!dS-30~
zt~hK&BY`F?sZ>KU)5b#o@v9Uns?0loz~s1#rm%vbLB5MB^+)h-3$~Dg5*lUz{S%ll
zuiXc3NAU3zHa%#1OrUcgqBSM%oe5%h_z4pDPA>K&p{Tf8WQsQzP1lFAxd%+dBn{^7
z?Fh$Fhj5rrY{Hf_M4j;+$S<7NsT9iwWoA!xKghWX@MXLzItZN%Mc9b)8dk!J5+sO#
zp`-NCPX{0}3klyc@F%!}s50*V4K&M<jfoo#)_Y|b-pQg?{TQX_F7l&{3f%E5ss8%G
zbdgpu02HZe_+u2QYNaUB``~9_A5v|iJ{vx<{^hmXjJ8B5!=g0lOe<+)WB5YK*rpaB
z9z>x8h-y#+eGvQU`6No1ojK;LDRj!XHp=elB-oAymLqvyg?aMb>nsCTs1m1el9GN5
z<Jidc(M_)wv(7P3*oLR=-WA%8r^w|f*Mc9Zz{yNV*<M6PL;Q?D3SVx@u{x9-rg}>Q
zE;kBlNEK4U^EG4;eZp12sUibS{!j-0u*OEPD_Icj!JB@%X5(#v@-4D_2U%m)j1<4f
z@^90TmgQ($f#kzr`~`yis{<K=ygo~i*FzJeSUNuJmSgE^7zY}{f!ljHTR_+lh|b<X
z@~c45zBlb*VP^>|)JIxgb--Dm^9t%sW8_4JdL;Tk@p26Lfv^gX?Nm3c-}fV+Y+(h>
zFa|#mR>$EX>&@&;tQyV}rl@B!G#O7jb(@+*avF~i)yTlwBvDLHAx#vLpz27Q0uoa-
z;ccNs8Fapf)`;cxK<CzR?6}$y98;ngIU#Ze?+kLVR(%9()h8jd6f#QuAccK!ty7c{
zdU76PMEltaYZ_wq5E^23Y8v9r0xgJ3CN$^T<F(*KbaPa65)B8hNjhb!GC8UdWRGfW
zve_Iq+-y$oC=UBjh8v_nB`ba$BO#O+!B<HaKB3}sm}Gxb!{ifw1O<mGzv7V41h5qZ
z1oIb^+{0QTC}lU$pyZjVlygui2$S`np_X_;4I7gX$Jq8vQy_WjQT;P1f#kZQ`e$+i
z$#<CtGzLlz3UqRrN!1`x{e7U(DcHiGekN7sITgU$o!dmOP)!sr86RyhT0-m5O_gGb
zL?N5fX61szLicN;-t3K^8@Tx(%ct|emiTE(vx%Q-RGQBHEGSRD+UV^|n1)`2lQGE4
z5U+-Iozg-?rg{?6*a62#Kml0!NDN@GfB%bWR6^(YJR*Q}lY#qk4BVbvjblrT2wXGP
zF{BY=okTM-_%;*#iOd>eR*lXS7?g>dRr=T)nJ6h;5K=<e6~@xthWKcMqLw_fbg={P
z4Kho~?9(ooU-l@S5Y`=Fu>ahb7`-%WXRm5|Bu#6^3xuO|Q7lPe&_dfD)lqpWQnlP8
zP~9Ma1Ih8=Pzdw1@ie4_GL4HhHu%w=@<JpMXWh#S_*6{{_Hf3GBOoUSSXEZf!YOp(
zEcAQXS(pc;a<dRRyqDjF`Ee}1;++s2N1gIK;vvEL#D@h>0i@W(?EfDCDJR2;3M)VC
zlm|gmhyvoS0}N;HgV4HIk_TxR%vJ=0ZAvU#b`DVi*gQl9a6L8c39y(gwtu*#bg-ST
zYzHOk8k?<3eXk0z+|v45E%*As1KUQ_@rMSMkOA4xe0jszz{P4Z*8vtn9j!}?{zGf2
z-Aw%lD)Ja!&@ia{eCl`E%1`~kJv>PPoh69C)Wn$?Vu!+<zXcj${Xjlv#ZI@1NsX_a
zTj9qWQcwh}s(~J4L+P6jq46Wc^w=<vi_E0;t5NoJ%SdT58|J`c2$JtVZ&USb%4QFO
zV|(5P_bO2X5740}FaB)!1MA>axfoEJt`N*tFBpc&bV!&BFn*F_tOtDLATexcCNY0R
ze;Lub|C**fK$S5&Q@3y#Bz1XVMXDV0MNhp6B)5Z)w}waQ!2@@oZoES->gnTY`C0n3
zJQ}k9o1AChmw$|vf78hGE8we>Em7Y{8{fq7*2G!k3&&OYTXHLNy2RbdqxX<0|EC^>
zf6gdAl4ADgR097Pze)IY;rBEAxFf6=zb_-vloVU=3?761Ou&5Jho24Hh3CqA?41Fw
z!t>zCawdET&zhiRZ3h36=B7G4EcA8Gz_65%ZMc_=`=I<5UyV*v=<E0&ROt8kFMGW{
zhBU}tuYW*LXDHhipfeSE6ey(7+d$&uL_{Y(LO{X`8y?Sfo~3*oF}CB7IN3#ZGm!ZG
zXCR5~5-0#?Dj&B1NqBbwiR}ugRpKLM(EUK-<4J?w1v*=WG7Xx&gfbIILb(A*e0&q=
z9Odr!KoT;Kv<hkfnyPHS3nbw^YtS*M7vWt9^fBdbDqd+7D1^g+)^vsb8%Xxqorx`Y
zf_e<9JI*W9H-W@<9<CV>v<*nY+X-~83hzC`n}pUNaeM?w+)W1(cRARQD7@o<#NG8k
z=c!O`GwAyU?J{T;HbS1S+{F#r2qgJ+4ElG2?lY(#NaB4HNYZi&wj2uYbRf1tzx5iB
zgm=iGlh7%IHwUd-e0&N>Qh%x8eHKVUzQ*v{fh6QTKoZJR20ei;AmKd=B;kDqg*-#0
z<xU{6y&FhE-fehK07=N7Lr0ydeEb-wP@%KYyowYm29kI$GH9hiO+Zqn9R}TLY_}Wq
ztU+%ZG#L$2>TQleOAU$}^m#N_Nx=;U1<~<msr1bO(q#&y%hd2b3nV$e+VEO|B<J@7
z%~qi-fcTK`E&-aOc((&dyx%nFK7;lFiH|dbo{wUnxytW8{6AeG{L`n@APzLj148qF
zRHN)XP9ZdLjVMFKmJ(EK*<%F-jcv&An18WlU5H=Sqwts;LB+;)f#H=J6fw58;l&K9
zG`33(Z-qfCjct|T)f!Z9Y)7Be(>oMv;3UJatZ00Y=40K`K|6>Hi>Xp>$WU^v3(qu%
za<DgxQwoZsQrgXDz~R_LP7bh~`Q!+db`uAewKg8VT>LES2K+d3rG0%B9FAYY$-LtN
z(IFQ#LA;^`N}IpgzTJ%7ku14f-_~>_8fBig!q5XZjrh+oD{W?E?21%5^|39EHuq+*
zq{McO;ygKu^U5gByQ4VVhc3pei<3rirj6ooHk0kEIE!<2T|A?GF=U=(#Lbo?d@aiI
zHTE9i&t|z{0INrF+DCDcqd2#Z;(T`$=SQPBkBs6xHH!25QJgnMar{zkNWE9i$B*Jn
z8^z%{Wij+s1}fvqMA-u^S0Y;Gx|%ktV#)H#_P9ECS=q3@uCZ-KLtAV0j3P^2c8E(u
zVVh|&i`U(-e)R3560W{}v24lmrDgVvIrGxHu2slc$3Ed-h0Xog=}Sqkx~gGq%T-J2
z8tZD}m#(@7|1FOt@oUnHZ*2>%A;Dd)kuq%&f!BDNjN`V~b+|nAs8>izKyu(T^9o5M
zk2jSrk$X$CPMVg<{%^Q2SCD!aSdO^Qa>Q+ys(5&zWma(B*75ASDYI_G^vWuI6RIk@
zqux+yDpu|xf_Gf|sjpOJn*aRes3Y&U#M#*BB3>@!?NB%S(@Vy_S*U2vTyrC_cLQZ1
z1TsfT>R*{smz*lJ{NLcYQMX)<w||fQ=^T+4nBD>cM(sP#IGar#(_IU9Z)vxbx^$Oy
zUr-+`c{4*PGHR!=^_O(&u22V`&d;#vqJpm?o=C4G$PQ6l&49H6`oa{rHdG0M<Fpn3
zymuuA_O5#yFzgg|yWmY@h4aS>r=R!h6mowNRtoX<v!C9uobbr{<GJ0yIg$=QN2S+2
z;B(U+rZ>HikB#W1NN!f>NJ$}s<XQ%c3fb^taUL1`@6}tl?|##(RR}2N^xzgp+j$ai
z!c{U%E>qa5qjuiEflz|XB@<i-g4&H<Y}vGjfgm-zv*+0-9All}TWL)!Jf<qIWkTin
zE`M)MAI9#9<E)9e%}ZwB3<md|$%6yCwFE!bSqXmBKm1l0|Dgr|)!;uS8$jt(S6e_+
zAM;z^!hepYe(N6mhnfI%AO3R|>$eW!zqmUUF-XW9=Op9^5Y%<Jqfw)`!h-U^!_><X
zZBlsjCx~&1?P%T0^gbrt7>PyeF^G9A!<iw=<7m1L%ZYt0Z9Y6*M>U{yL_ni;9o8B9
zR<>a+it$FlsK>B8&Wcf-YesQ4jN;rninDbTC#^+!aXp;n=5bIfyt74SluKXatOs0u
zKQl)_Z3m&8bqjR{t*@D;b;hOQa4_QH=`qGnag^a}MfUC08Kk<69PUjhmTGAjkN;vh
zKX={*L1lOc0$Z|WZATYpJ+dE+l=FRPZ<O=zp|jKcJ>~p^I!=k%vW_O_Uxd3j#T3ln
zRL)0TKbFXqtY_Gi^%ShC<>IMiK9?ZtbwcG;1{f5LG`Lah^Mv|lF}|gaYpeL$w5b0(
zj1~W@abm|`Hcs#&sH~xaSyp2k3a6NaH)OD23RzONS5m;G=|cLnE~H96VYO6S$+$Gu
zP~-bwj5D7^8>T76^J)Cp*2fxW{vCW7XZ{=LMEv~LQ}{3A2h$?s%n*=_Glzj>oVftu
zio4}NGR|BDB;!mE(1$k8u=oG3#~IE~Ssq6lXIM`E|Bo|V6B6S|`f`t9d7P!AIIBl-
z+DCERQJlL*alSu_!&Q4RjQvqS2=9#P3da&op3-dCn-NIaK)V0`HpbK<#oqYBq2qs=
zOU#{Hh*<^=#~9HLZbNrET@}sfF=hyA6yGg|*ll3A$~xv;0&d<yqa0$Vf?*#lwW|K=
z+w3>O|65$Z%P?b&F>FCC$6FRxylEs}+_RIhszZJietY09)0E<@tGS^RH{T~pa&hZ?
zAh{NKvEA<mA?RYMhM?_!23rhY59}znHiv^eyx~nBHctrbxZH=$%F|zSx+8&yc7;pu
zdifIgQ#U>&4iCru$^Gq*hn;;%T=Kmek(Y0VRK_LVxUpWni;Ut_V*xxA2jUTIav5%)
zGPuBYUcpJ5%?o|S6YSJAzW8|z=xi_2O&<&+eeJ)-9W*@fXBl_x&u}jn<}g#Uod%L$
zf-{7Oa8>FNCOidpoN5x?j-A1h);&z<)p$P|cnF^XkTaCHo-QGm_p8geaSq{x!9l$@
zKCt6bY%_e_m*G6|ny<Zogdg+n(@XUL&&jFub`9Pfb2mw0e>xZr>|iMub?NY<*wB|B
z!BsYa9Vg%hc--F!I=p#l4mMToh*`ekCj*_7{ygl4qV9zicl$qC)K!63*eu!bC-UPL
z!Rj9dBZx2N>{Bjdsi<%Br+x9laB+V8JQa(M;X)R#il%*k%y}}oe<w>>yGH~VE~gHj
z<-N;AU<fkGhlGe^<rP2Keok_KeD+a-eGI{>KnHuaByl~=WvVEWhy@WR8nFRkMCpZb
z0MqFj;0YwSPfmgRis>kafmL|ni<3VYXRYNM4(fh+ZoPd1LE^A&Ao(Id$Nfbp4>ax1
z=LI^yLdK8P;#T`-?Zl5+0ap7IFJ??&JHUX-@NEAxe1q)W*W!MKE&~spSkfEEL54T<
zYj@+19{wF3jDLAA9C+v}j0>Lrl}!yt7gRVrz3>|bwyXV@gSe{(@fr6_Y)LOpA0xZ)
z)BfUs+Nl<vV!NNtLxDR)e%yZ)&Ns1d3G8s_FS#!c%d&jX`QAB5)QBH7bI{B6rRg*T
zl72*@&Q0#f8$5-1_`TX`UxtkvlHnbBIB6A2m7==K@{6C0W3O;o{=m=p#vQJIs9k5r
z7fAjG>_4G$9!UNh-MTJ|kNdoSS$snKlY_fd^`-Y7WS!lDOj0#zJHIS<dQ?5$h&sW>
z5ggBHz=;Mm#(LX5QAW7at2>Z<6>f0e9L|nKv8!Tyqy1TIu^pVTCGo*<d}iRGgyIgx
zL**s!wM|>NIer#;#y}J&m6Te?a8w8p=MVA6(Pwq74Dba2i%Ca4I9W$v<7(YV$?xJH
zVW~s{JFtSXw><FBOSschh1344qT#`hp?<Y{y2aM3wtS}tu4m9Gj!5A)uorBnEkCk(
ztw>O2qCGFQ7-1i7-D4-#<okG)Yg!noi*OOcz-g)vm0DauVF`zKS}bSh7gVl;{oiKU
zi$eU2x2b>A9y+{2edfcQ1<fjd?1hC3R>2c$>nnDFfMz{(eoGZZ6OMmiqtUM*Ap#GT
zqhjQ=cHp5qRQc}0F?Lwl&fws&x<8-;1b8)o?Ocg7y1B^S!RdpMR1LGPiXP{)ZSMX5
zFL>m^WOdV+vT?`5wc23BR79OmMjXgV?jdD1GH(Xn>z`%~KCQ+VCTXc^+YNc%mU?Hm
zI)I$`({Q|7?M9b~5$i)=RO!b3%y%Gvu~coS5Ib10+1kkO@aCx@gu{EFlrJ{A-SN+Q
zKA(wS%0?94^gfHf{mJswy;2YFM$&g8tJ4bqfe0>2O~Ss>rJ+Kpt(fzNa_4mws|p+O
z4&I7XVuLFjmpcRHzIWSC+dIJuKS+^`qCw9Cum=8s>Xq@dJXMXdMQpK9LB#o;<cvkS
zm)qqE;w2Gm9AcE^Shd3?wRDGLT*{qtv2d^dcx&)(PrftvFAjW(%}1~H$vIG7lB~*3
z(o%F_;FI8pT|=g8;9<2ZThb@;8OwU^30UES^qb&Dr*`gZKNU5}J8qCI)x16Viy=>?
zEml)D)lMx5+77n*cT2X&a!=Wd*BV7#J!MlfJZH!gIjbt2BI5dx8^l|VmUJ?Ynd&~E
z8joJHYzzgZI`(c-qr=`!Y!egleHxCYDv};GTq}rLjY9S%4o?tIf#kWW#p8awXZvR=
z8;m}ju_O*-e=?VS?bKY()$Zq#8_uVNA7l}|`JKQ&?+W}=SMjbuXARpc+x@c=X8#}5
zek!F67VXF7UNwhfsk2Jyowuvq0$|!_PhyUjN*>033lZ}+0ls*$YjAnIT2*mfI<mW8
z9&fvmLiCFSB>^m{yz-*teKt>2B$(kqa*#}i^0WWz*t#^Z2kABOp|zJnaB-yXVrr6K
zKul_ZR_;4TLI1|C+3Ov#>+VC8lXKKHU#fqiFc7?T{{$7u>nMiKhgI`Y*;hr=-;W((
z?8g_=qGsrUtCZV;y^%RVz2K{5#<_Gb{gIt{bdZ`f1A!};csI`uT>7Y8vX9~W;Yx}L
zNrf~&xfBnjN)9{<tH6#$d3)9PpmV)B!FJI9O`QCJ-7%Y$-2k_!alB5=Wue`l%b>=p
z%sbS!v5YuAi#XEl6L+zwB&zcDD#DeDkP7IZt|A`Cl>tdgV8^(RD1r@hU@js^hgY<J
z;9W4JQ4M?qFlz~X3q8_cqlGf6*APt<+Ot2}6PqWL3F_yW`gz6~0?yX-bp4#CpP$mt
zGX1pm(~IBp@6i`&`%mlVGX4C&KF0bQjSm}T$1jxopw*tcg(G*?VJ#vr*UIxnEMFn8
z+CR5=)IPbaaE_Z`9S8U6-FTAnU8pjeUOYEJ0#Fic!Siu+%pm!A=0Xl~i7Fq@YtT9(
zz%6(_jo(V(K0JSid1*cHnYDGR8=C5@t5!F+;&Xv`F<HSMHmRJBDlM~So@<>u6IWy7
z<u^aDpg*r*$)^=2TD&Se*3i~s&9@5L>f)adTETM)CR)>{>*k==qS*5M7RMk#&l(g&
z4`NI4TbCMiKDvUqivWpjt>N8f(8I{JtUL7piH{SJdqL*{iQi8EiMvBUY`1=kd*--G
z<hTAEh;7Di4FQSY@en3rivziuw-!itw%rLNKDvP<jy_|Xhq4vh89;39eru&c-vW}5
ze`MTUi#;Q(MZDty;<}XIdcdGR8gx90RBTrQO;hf!F}wtjgwhQZRJMJF=SOXe-!dR^
zS8sR;gZ|l|?-}$XgAl0l>r=a07>ZA=0SXEl+X92o*tL&hgGvpu4XQM#%Ak6KS`1om
zP=`UA4ccPRR)e+~wB4Yc1_3C+C0|uSap8Sf9{%Sm#1a!8X+g}Z*s`q%kM%7mXlz4<
zS76Zj#<tM#<`~2hl8_e|Ua3Ls!(wY2Ud*6MV>|kNom%0lfrBiAE~AVOZRKctrMM(S
zIYT!hcG&7DZPJ|c=mz~N&Ea@V$&=<R1c&k`&0)$Zg@lv&UIt<S>7jI*0hBglya|NU
zlhY1>{<^O)ZOjUT#OODHOTirxSH}7nGK(~SmR?7hD>R4YCuLZl;U>o#z00V*DU-*N
z$Fiw>$W{6D>f%}x4msHS(v*E)I<3E)<!1EWB<0I&Y0}}~tIw_4A35IuR`2A>n%Aza
zYf>Mu&De^9#F6^He?nLG)ikuVwN%&CjkzTyYnzI9zxu>_Y#@nOuQH3c-U{x#!lUd4
znOlN;3~ADD32#E1X3wVV&1{Y2bfDUPgXbQMJTwsX=no&lP3al?@fZ)~!Acz`X_~QC
za4AbTDo)g0no>*c2FbW(XO``5$j6osUZAlNx9Syjt=@t~F)SNkX%d%_biXjJ-1lgB
zdRN5h!g@kZd9thhdH0y2{qOt{D*)ZU&$Vmz*}gyF1ExPeJa~f4#Owra=Ph~O4lKs~
zO1YSJ$0yrvUTJYr`%Ac@qo2uz^8T!itse<>t08aQL6`>y|66J9nJdSbsjB@NI3C;6
zU&iT6LS4=j|7Zl$%#8JljPH5gPjRTCLEJbr0m^o;{bW7nBjuJ`mN&o5fBi(RbCu-{
z?p(daJ@0{KmtTH)%&o}}{{(vNa4P<B%Ngi?!S4(?v)_5e8R|YfZTc=}iQfw}eiNrW
zSdg((lZWh*-Zm_S;lkmPUb{zi<<_CjgEyR$UWs1t7C)4FJidv<$=gOwCLCNo!Vjt5
zhz}UOfLyAe6J>cmb$5#0Q_f<tBs~N9NK{%A=f`A&c)12K*Aw<%uCn)7PdJYr?&m0F
zl38TeoP;FyGKn8CGpmtlWk%FGU+{|EYMwp#X4cB5zO@pooB6zn31`t~*)_O#Y3g1Z
zH=m!Ps#`9OdR<~Jd9D?cELm=}dls`gIQb6heKVs@lZ^Gf$8kB<xLLl!%o8jO=3n>^
zW-ER>Pyh_O3(qrA?jc}KsCWw@N7NhflQ)|$1Ie4s`EV=f4j_4V`8&f~37^7iFbG~%
z&lXL9eOxpF*#pf!B|N4?5aor~QWFp!H330EW6SgkufQOtTl|h5uRVE|J!I?7Eh8p!
zGL~W5w&LfryfK3MC(A9(nF$U{PdJ&fj)CU-SgK5I+Ke&srY$x4>qcHmxNI|e<Sm2)
zmVVlBm!}!BOioLU1Ll47NXHQzLzUSfsqtU@k@l>yM{ki-FE`D&lYV!2w2^0CiQa~o
zG4gCjvCFHs(IZb4(#(;kid6%HszH7~{E>&{y+FswcxlEOdD!l4xQlDI)Pv}*C#-4=
zpK@l4#D2XnU0PTlOY(^|W=J;5dpD}S{Fmo0nIs~`y;yzlPv7C+Q>OeWnUc8^kJ0(G
z<Y0Kp6`n!-C@0xh=He$i70Q5^4(UNqRnfDF1?2%j*#wVi79L#-VjmaV(fw3vKf9ND
zvFQG#%LRdC8HO6f?`VCHd0<_q&4<?qv-=if9Nh<5zO3796Efu3J?;Y7qnBm9@L!SM
z{pD@<8nHJxip^#jUCO+VKU$wEnl%f09!*-C3ql*Bd>>1jt3sWyPj%=5W=r^c^eNW)
zU$VEC@~#qT+osdU`eC2q8?STFlh|I_qq2GyX!?Vmz#+!MSI@UdACphfFLQnTn0N&J
zP2G}qoOHIHG6{@#4kC2Jm7sN3G+fomc#hxSeo_w#SdaDII=j210E_W2;{wBx-+)$0
z8hm`jdpb9V`-b?@ZeM)7XgNG)K7P|N?3{1z&a@BV3ytgHW)rumh4I?%rVjW7#A~#h
zHVd3W->1M~m4pD>LVP_BAJ_;NY|D=a+=ZdUG5Jn7h|gj;;n16z@`Nj#OpGT}6b4P>
z%|cne-T1M+^x`*!AM1wCPs2k#o|oV!nn<ld*BNvVkmw`;S|ea+q8qR({{Fg#>TM%M
zn93v5=(EtXSr}s&_OC+xlpAG#2LAVEaf(2(e8kOYU4!Mu5=fg5PtLLbWt-7*j`_)!
zhokifhOxi|M9Ifm&yaK6ESn+b^xoMKJ7q_F_N#n-ysoLOp}DEeTHDZ8Gp772I?8Nz
z_PmVQtVrqo=$?|_(K-bxL+wY}qvZ>h7g5U}zD|*kc<`bv%Z#N{uns1}-Dyh1NPQ@G
z8S5<!qyxVQ-0==;8qqx}OL5ci{&)rEu*a0AKHVGcIC9LoPn8$#AN;6(e+-)_Zi4Lg
zm8U)f>pvZ{?zEJ@BaBHfCd2!}CHupvNVvECnXqH2Ehf8*x*$%|vogHo`ZS_Tbo&$U
zj$1bcB>TEuGkLS^>mBaHT?XTh2jfjoE`kP`)_p)P96@uSG`bP&&ly2;iP_lid<^S8
z8MEL4SXvpcXxLpdf3&7PK~sg_Gx)L3_2Kt2ev~`xqi^HKwvVQ(js=yswl?FK683nv
z*VNRtwGm$0QrEPo8sBuURV^GK+H`GoV}l|uX|AYS+uXXrgrHq&Cqej^FfDbeVJG5x
z9KSyNZo_XIel#`si45f$l%Rw`Uoq%zgMMJpZi9Yd&>w*)t3=L-tR)uo_mH}5AB@ef
z-nR&9G`tpr;s&iZXtdU;<O2)InDrT}gMUt9GuKu4r6u+$p!y646+~U^&q{2z5=xA;
z`S2t*B}TUSOC)yYzD3G}T;E3g7rE$#Hd?9|zzX@tsWjC_^(i}WVhyWWt6MiLt81lr
zwl1q(w6uAQlV|geDxK%Rh9<pRly9|^GKChAIVLi79a=i?)RK~Oj}JvUkC3J;>!gm8
z>7Xec<D2$O_idxxjs7YlCCNQ-cQ*1$!w02!)(N#OV1|E!H80#Hqr${Ct)l(?bdOVG
zy91kF1yb9OoNl@6JW|px+X--UO%QJQvAZ8F4TV+%)e@aew3?`ZsGjItqHBoGC*qd`
z3-N5>^*6=NuK?qOrM!e`J(2BQOG=_LeeGpZCFf+O&v{l~zOHu0$hXZ>m&#5PwE<~&
z{Ki<#AEM45)z`Oq38S~^gkRI%t1=lWd8d6Lw#%G}Tkf#@`8nKm&4X|(mh^5UeB>Cp
z<jo$~q#|F1z_t!mYATSypK`5{Y2t~w!3Q-l_yerW$+Dt2yIYMBl&P6UP8ysz>O>pe
za3cmy2tUzV=L4~&_^mzo&o^FvCBsEZ_kk8k`vDO34}K?E-kbQXOMobE{MHH}c^_M6
zcs%>ef~Aa-|1w7>E$eV>QMuM=d1!iM4Sjk>!qKu0VUIMK{f^eTKIWFaEp7g0k}adJ
zsr>jxbRa}I`ukWSA=0VIo|lVclQPM4L!9YTVmc?oNsiTwQ9R9{21_&7u=H%cx;C3r
z)7acr=dtJ}i(zSB#s%e8junLmNKw42sa*thLCMb5IQ}f}dahc{O$8UsF=VYu+gM9&
z6IDIq5P_!~o3}hik-WuowcyQI7x*6Pm@SztEVBiW(}Ew@1#01jhBft}NZt`|d02-r
z9Vg?Z8A~swJNBHLwOdc3a=#`e1~vj?vnI|Y6>{l{pI=w?8cXqT5=2Og5(9W4Gb7FN
zBnLNkwqRR!fpSAi=I}09o<Q>E%d(H<M9Wvmlv-AUJk)(DRDAtNy|?nlnUTng6+j{-
z094tI?BDYK{3!jK_5OeC-%O_`6_^I}C%zaLsQSQIZ^8e%b#2yFwi&ItjNNxBA;qxw
z(3~$M{(GE7qd3d5IP8L1eGa9k4&|hKA*|KvCEdvh9=gf84gogQ1~XlHG^e!EAERDx
z%vk%z61ObK$^W9l!V50AAQ+rAr)2I(O^DxnKU1ZBbbkz@f%Du<m##GK+xbxXV}^8Q
zQrN6R*$o9Py0SD=Lem}B0G5t&H(C>7c-%3u2fdPp_0Il%xg1vK4oNJ&$p^@=&l9$)
z6XLqo8y8^HBO8Rb?N})mWqE<53ucdMu6oz1+QrPEs5fA$7=fpnUT<q8MTMQ(c=88t
zekcApemU&lNxcti4i#z}>6_na|0l#YRRxT2umiJSZTHp^LDIqf-x+!jlG6DFXm2~I
z!VO%9e?7Uz@5zjH@W<wDr1+Cm<4t7V0B_pOm{)VXvM}+kFMe#|-JEz4*8B^v*loKX
zRTq!yNTH4u*d@DhY{H$W91I{1Ze3-5!P1|lqgNZ>e#?5hslPe1>D4}#xO-QK7eHWN
zx{VufyU23zNgZCztaE&Gr~_P0DDCjwej9Iep>_5II=_l|)%}v+CeS(;gQ6$z*bna+
zRW!tJX@&Cw%ak|&;<^Ez8CCcCO4PWCK*hws*H4KVf4AwR>FW}7_{u5v%a&5E+x@%v
zo>}KYS*dRw_aPyoMe6o|KviVfiBSUv^8iqQClc=^#_1XST6*0>nrjO}#m8>=ewcSF
z{6fWN-T@<M<m}!4Al|NHq&ZuSBvD+`tj|Fq&1x(vR%6XXq+5?L3|7B2_LeeceAa4j
zs%c)^(u&20;Kyr%XPnh`hSh4#xcWNl>h`AV8d`!M|Gefh-M(YTTgUp!Eq`HdRZfeq
zQmy4)hBwP<ALU9bb04ML*KmoId0)dg$Qqh_JXhhzajON-?;vUHCfo63o2ESG4nB5F
zzq&DxtG0f17n*3bt3eB|)1cc8+6Kh%{MNmO_W+P+&Mz3=8$hB%&qOK&EdvrQ`D;Lw
zh}gdf#Ps;Bp98T2`>p4JWUt~0NVV)ioCzd*2Kg2usNC`6M5inCb>og|gM`cvqe;j^
zKxZg-yz5AIJc86~C=`NR)et?M@7&~Fn($bTf|v)fW&VZ7^a=_Z+mPY0L5eL)UHl$J
zLx^VU2P_3KKIC<*k)5{GNLb&>jdFe#{<GG}L8f7f@nhW!CsS*LGla}G!SYI*znNZ<
zF)}eXxxTb6;Ki0XDveWaI4)(IOx;7~4IGm=4rLo^Yo3w3U*VB>3a2rPgE#Sw>A3_;
zY<1S;f}FON)`q4y`vi@0lQnT5hvqu<pZ`2g_TDwxQ0j{D+<f0-7+(*J;`EN<yfBJ0
zG>U@?*M@N&2a2noo(jbUf2vGnoD|8`RE60}m(j00FH4(^E~RHbEvm3IaaBX}s;gE*
z<av{!7AYn~l=TKRgVwJW{_fXuOl-Y6z1uDbW9DK<(fvw_XF&s`Nw0zh(aojbjMn{n
zQQFk~Ch3mFwmO#X*M$kkQ)oU(?d}!0EB!y5nWntqZJ?QEthpHb&x3Hc?M!jW^eJ~4
zJ(f1XJj;4@RCtx8JDJdoHT)%5^oLVi&kof9?<xX#8-YWY`J0Z=VSJXGhqo3_mg9`)
z%Yhxgjg&mr{#^G!eqhJGNXfJ9zp!ie>z536_wW2T(V2e*URvN--q>gIa3&H1HwJNj
z9%wVd@5j%2Ac%ihql!9@D4N^(3Ob6d_@Tg#O5bL61{7z2-%#$n1CwynegJ1!aAX&s
z;N_RHKF+XkcJxHNOBw#<<_SD59oP{_?rVQdpWw;x8~5)m&8ZGQNG-1DU@UbZJr7P?
zy(QI*^NKIsID26#qK;KMJ>9QQ^YuJA9IJUJ+WoS>!uJ8bBdgMxz=yEPu74tux_TI1
zZulAR-DakGa)<FBk;$2`9tJHrRd02mJr<<b*uq!s#`mK58Jxh5UgxC1j;Ff&^PN*{
zSAXzkN0*bMVjJA0bWLwA?CC0$yfj0H8L5m^d>$G66(4F;=5yA=-FzsmfzKg)-;PF=
z8lG>z{ToHkR{t$)_{BX6eL~aTqf~?8!JjE~sb^tHcuO_?<@0{0&{dlL_POUORHy0Z
zc792rW=&u9PhVGPgQjnk;H;#k_cu_Nu&i4&J=`iY&)YP8#u;}ibhl@JSn_j^rtv{P
zh5k#^JHIF^ZV!9*%cLasY5FHWTBFb}G=2H9nF>j+P(C+{#X)WF201gbtizffxZ^s7
zyz&3m2X9q0$9$UNi)CCoP17?km69|!Lw@Hw%H1cl{cV<{q+HX(lfR<uxwfgy!;(Mm
zw#TJQr6#CP(ww$M?0G)|%`In&09ogScSOdagr+OM!Bq>(x>eJ^`Hht4S2cZDx3_O;
z`q$r6&Mogw$k(5jn)`vazu|@(lmpcT#HsqP&aMIF=0cf)*`wWm^rIqJAJa5uY|8!@
znw~m!s-l0b>1orZDf$IXpMLu3itg8RC<LJo^SY+bKKpD%AJX*n>C+X>OZ#cgJMTR8
z^xhlKm@z}q$L6SqRai(#j5R$?j~gdFaf+sA&z7F#-ARds2<854ZC_kW?GF7<)AQ%g
zS2Pbd(p-3<5=qv4O_!FID*i%EFI>1#(NRs8mzOKLQqzkUFIF`5Y?_NMx=20wZ7iBR
z9u|VB)pSKgg`(GJ`cmB<TQz;zWtS=Y4Vw1aSBIvTFJG?gzohBUeC9KXzD3h3SFTj_
z?V7&w$}1Ipm!_+$s}+5>rfX_y6#YF-Pn<YW(bR`&Fu_*OA8ERwLE7s>nqIR;`tKu}
zZfa^$?)m*SnwFLp_56jV+whv1=GU5TZ*N!h3z}ZPe!ZgmHGSQ6(!XEV^!3+Yuj~(L
z`ncncQ}lb9zVXHz6|I}Ob<<5ZDSDzbd#kgvQ_&}A`b%FD`8Y+>U;gr!mHjkL-+Z$O
zAnz^Lt+$GN`M9?K$AA1s<$jK)Z@Wz-<$O)wamO9XexarVfq<g<eGQtgepNJHeu0kW
zuDkA1&t;na`qxEXe@@f?_HX~D>}xfB_uY3ZdX1*Pqvctvrnha|rtCLp`upGizM?xc
z{U87FABz5xrnhh3uIO7ded39-n$FV)G(Y&k57hHtH2uRL{!r21)b!4sI~Dz1O+WC!
z1B&JyZ8Sgm$xqbtN1A^4;fEFdkfwL-+NJ16G`(k!jE|3Nx~E6R`Cn*y-#!^hey!=r
zlP4?xeVTs!@y8YY2TlL{=Ra5UYnp!Y$tM;4wx*wY>M2FPr|GAkep=DFe)X`PefC)e
zyptFQ4jfSQ3EKX-=blsa6ixT_^(lIqrhotY-z)lTO`m!yR}`@3py`)hdP&i<HQnE@
zv=ZwRnjRb+RQ6#_A3P`{qpj(oAsJsT)$|*0aFxNbmTCI!x8GLu=QRD!JMSpER?|n0
z98vTdO~3cvdx~z=v{pZ?^_u>V;hD-lsp+9%i9e<3;fDK^{q34wQ&OVnZ+Q0F{kJv!
zgCEHF^?gmh{IaCyKF|G-q<@#DH%juX$36QaKU3j9tLg2(lkx2LnjY%tQ1-8Bx=)XH
zhc*4$Z$(~AkYUC;a%8`9KULFSe>z*!!#lc_eW6Eh6?wHl)4~6i0sA6Nf9VOy&vH#C
zTO@s}HN9@L$b)uGZ@lvtD*U9Thll$Vy+za3z0%&lrs*R?FDv`4o_k$k+cbTvCF9Gz
zp8v0iJnPc*tXa}u9`oo;7pw4otLZ1ZWjr{j>7QIC{rQNdztST8VZwOj&6=}L+@GT9
zYpzKti?cO-<}GI`x>(cJekpHT)4vREQ1<*52F=Wwwdz@?>9>caJexH={NfABeuJS!
zKHcQe&xyRdMbl@V*{<AwWdwbfrr&@2Wo7>@O|Q}E<>%yRhGqD$e(2HV!hcxPuP0wu
zjJ=wEtzX*1Q<`pjPR6_EG=1-DuPOJhYWhISR}_6j)5EX-QqkiksE0ND>-!Z5X!>WJ
zpHlQ>&;EyxDEcFse#HJ4MW3eW?R_sRdb*~!2BrTNdj6FyzGI;22le>(Nlk|vq`YlS
zyX7Y-A4@gu>E~By`mJwODf`u$zU=m-qMJ26{I=wOy{7ND?BmM*MoqVVL;A~?G=0Nn
z8PEPv(=8oal>2|t^sts^TQwcNC#>x6(e%<5sgE6+_U20uX!@ClpHc32X?nP3v7+~B
znyZF1ztr?c9)DiZ&ujXwPd=gOmo@$7Cq*9^()8QU$#{B5)1LnQo@cM+^#oBPz3G*8
zyryS8Q>?=OpZ+nGJ|9k+72?Tn290%pfeu7BHMKsz8a#@|7W{sUKqleYg=aT@A>gZ9
z>o(xB_lBCfg^lfXR=6qN@cH(-<@F755T9?aUR#Z|LBQ+UTkEWabq!bJe?uFbSPL7g
zYu508Q%!wcZMbo5b5kuyWz$}_tf3i~s#^<No7Xj2tJ+%|H>_)JuC>alYwP05QB8ey
zYrM6t9UB&E>YHnt8><mxS#xW3BmXz8R(G(AOOS01jccs34b@Fnq`Gy@;^xNMx~5iy
zrzpGw75>Hb)oU6Q@6yJGYwH#pi%VOpabj0&aC8>CA?a~RH4`nct~%{{3DcsYR<1}b
zZmr&+94>8d{d{|K15!;poy$mFT}x#{(;ACl$(jw~w_&aLYOcMyu2r!XHMG{PYHdKV
zEox*=rI;5r<NZloqQAPjp{Z?Eb8EA;xW2h9E)JMoE1hQ*D*qK){9h#hHG%1tVruRz
zp=Qftjy&ed;{tiilSi>UO4LKV&62QYNm#QqQ^J}hVa<}TW=UAHB&=By)+`B2+|QP<
zW=mMJB`nPSnAq78)@%uDwuCiX!kR5%&6cpl;T#ETj)XNw!kQyt&CyOItT_@EzAC_Y
z=15p`BrI_;SHhYrVa=7W=1N#|C9JvHrGzzC!kQ~#&6Tjk>H-Pt0txE^3F`t03p;3-
zgbO4rOmY<^VO=0$T_9lzZ=QrTPr{lfVa=1U=1ExdB&>N7);#S`!kQ;x2~jLz6-!vf
z5>~N<RV-l@OIXDcR<VSIsW($uEMe*Y5>|<XRU%=PNLVEjR*8gFB4L$CSS1n`v`1;^
z>i=iz8qv+I`sSv(4YhUaEV~&WY(O`PHq|y%V<ErRYPgo$m8D-dR$p7!REwQSF%8hC
z+Uh~AYmzWy*xcMyR^PCCHF|Zd;p%#kGzy7i5lAtjP`XcLlR90(L<xv%l{CfEf<v$;
zIfT-kUkD>d(j*I1f?E==t7}wZLD`x(*J`=d2)Wy2Ra9S%^ZeC#wl*VI6?L@@?Q1gx
zvoKUJ0yCwFaMHOH`cjdALR7Z5wlvo1aF=*_5xcY;)HL4{T`grToU}9)TI3-suA-r~
z$<#mvUN3PE%UZD8;u|jGF15AIHTV!nLz8t$^|jU4G>fDI-av*(&`TR@W4vcT3G+y6
z^(srtad|KrotMh$#=3Mi6{Tc9Q96yJ(kZO0ZmHf-jd)wE%DU>B`pR}Jm9*5gwp*&A
zD;wL_T9wV~(BM?*wn#xSQlx)_3~ZM*Z>W|!TvA<I+gK-D-8`05H`Qu)reNFZa1#Pr
zy|tvFuBoZo@&=1^Q7fccNm~>8#*&OOPq&z*Xu(VCQI@E>cr$OFu$E$o!?g^py!|1a
zWj#QpbG^L24mSu%X{-NB);6!Hvvli|htx2X0~pRuCgSI}mKwwv$H|KK4g5bvp*;q1
z{y<-TwZ?m*LR7LiPxf0=fF!)dKvNWN1JFkl`k_G})jmMEy@sLqtf1jR3DUNu22~nV
zWe~L<@!Mh07K64LwB4XCgL)0>Gib;l=14;3O0`a(L4^jD8dPael|d~Abr`h8psfaN
zH>k^?UW57!8ZyYjdYVq3K|zBG4JtK=E283~%Agj5It<!k&{l)C8`Nb`uR(nV4H;x%
zeMYCxprAqA_#?KZ22~nVWl)Pj9R_VNXsbcn4eBze*PuRwh76+8tkY*u(4aztN)4(s
zsLG%ggE|c2PBRI4t3lfh>N2R;pgx0!4B`$_oj!wt1{E4qYEY#?RR*;f)M3yTgSHy9
z-JmXmdJXC`XviQQ=g{dhC}>cjL8S&&8dPOai$NU*Z82!8LE8=LGN{*}K7)n~;-(dy
zK7)b=arP{>r3O_RRAo?$K^+EdF=(qn+YRb6sMnxAgN6*^p)Z|2gZQpmc!dU)8dPae
zl|j7GNqlq|w8fyU25mQ}%b;F^`V1N}h)0Zc`V8W?_H_CTDmAFmpeln}4C*jwi$Plr
z+HO#nLA?g`88l=N2N|6{gMtPX8dPdfr9o8&wHVZ4&=!NX8noS@E`xdv>N9A_ARc7U
z=`$#3P@zGk22~nVWl)Pj9R_VNXsbcn4eBze*PuRwh796Dfli-6L4yhnDmAFmpeln}
z4C*jwi$Plr+HO#nLA?g`88l=Nx9{on85A_A(4bO-Dh;YKsKuZTgSHs7)u8PLbs5xa
zP@h3V23g0O^cfU1sL-HNgDMTGGKjbSOD;PM+F}rt5epsCl70Gu_#Y0yLs4nle1oW$
zi7hoR@iEn)ps@`ZUV%a98{5(Q`?%Yv2KLzogOxJW+>Uleohf4alpE#x4E5i#pei62
zG==!J;For@5EL~b;f&t#*9|-7KW#?u_}h+xcqQ!s=&w6Tz!J(fnY;NgAYxY_b1))3
z8T*hhD8bD~SskOyWf>fGgIsMpi$WRhdgDzy<|;UrGdcLnbVFR_F_fFprz@Lak9}+0
z33u7mt1hWtTh~S!r!6&U#p~-XTfFeHx|-(JT4T3(;c9$RgwE-jrw@#8*)->UOcAzB
zs{Zt2TTOLS`dq^QygO~q?75>((62&YJ5%Lq^zJl{CfuENGvpafQ2joH6Z9Fi$aq*a
zNyzw2GuFw3m2mLZD0ibzCM<xvO61{j-FO0^xr=SY4esmFSM0=tA*$CFKDN<E8e7M@
z)bqB`qj+N5e8fqHsFg?DdqR9aA3uRxvFPcLl@sWE8o+kNS3d$WgzeoXk3Hd)xIOJ;
zJCRgj7AEdd0s3%5v>!ehc=rpr;+e-TBOyDG{04e4;-MukfjbrTqDjWaw3Vl>{~(;Y
z+!u4>JlPo!t*A&X&cP=9+C)EYI{%sTw4L&o#t>Yo-QDN6QxTuqo?q<UR^;7q*4Y(x
zcJpevK$4g6I)}se?^}4ve>?An-+5st3q6+N#MO$XuJCogGCpu`@AN0biT8cZqs~vU
zL(ZQQ-kf`FES9@6REp0brg!H#?@oWxc@%*-Pj(NCS4aitg^}SOU$^M;Rg^r_{@6vS
zmGgajbFHxJ5AlO4iAM@qPGM(!G_g0&p5GWM4s<TW3j-V3UV(juwGmy0G3>dwi@@jE
zR$U|IMTb<m;&SkPQovq?hn=4IbZ&%WO}aUU_H+c2+`ePG7qz(8)!S}sq5HKhtWR77
zU!PGEKL*d#gtQXdZ4B8cblgM8B4=sGQjIx<sP*|p`--{-PgA?=oLv#O+?xK=NQwUr
zxw#&hE;$@O75V->;Qff+DmmOfq;GU6?;H+v{t7&7lB^hqf90selRpOr;CP-v;Mq1g
zV4*0l2}Qv!z{dyR5@lD2GR&(ec{R}4sERFyqZP2hq1+?7P}C_Kc89E;gSK0l&qFGe
z1E0jP2keF{!N&*c5kv*=O}~eMyMCOQz*obH_OtMdao2gix`$^n{pss+P#uLx(BwSa
z$B5sNg7#kwtVSrSx1_UGw2wJLg3|e6N5B^=d~lhat<LF3$%S08KP$^tc&Cx4E5^=^
zgz8nI2Nr>iTY3V?(|BM*`dSQ6wunxAC8nh%?5?kmx-Era_f9s2KxZyo4&0A_Jd-Se
zcY~6XI=HO=e0Skw>>WMT#w|Y!C$m0#@WcOwT*ARY=Wq{(Uv=w6sZg}tE&j9Q6Lz!4
zAaNLN3?Dna6HmFJKY|Yy=nby6drZ__n<s~eknqjQ@rC%0^vAC(8pa2CP9C(q{x03g
zU-C|TZn@Kkua>&UhKGNJ!#n(phkVr|en4ev)Gkuhe#7{FLuCH9R5b11M6-S-`y`S&
z`IUIJIP6;dL@B?}aiM$7WcNCJaAji2``4a^^E)a3rukFaj~hIZH^e8p{PU;8Cm>xV
z@2~q~$@}qO*eOP1OzbIUOT=bh6c>%*xQp_gS4tjfI~E&>ovGh-mQ5afJT)2HVbS27
zW%;SekI=a^7^j<!vOu=Q;u@%JwsX7-5BQi&lCG=~<&7iq7zDt_iPI=QAIrVO6*v%t
z6GWACpZOKRDpn&bYH5LIJ)eQ({b)K7chw~Knml~ABXIA}cmN(^VA4Aig76UNJPc<K
zP{s2aHJjp!K$2@vI7L*|{eo=BRY&3wFHYbiNZwibaqNZu8aiS*KAgfT!+9&@4pN;b
z`5^}I!3PLCRv*g!0(FLqFTLTb7A@5H!bcKD`a7xrCgm&MWFrYH)RkFqBT|AwmF&tf
z*htl6bnjZ6lgf6V*t0%Mlt}xIxXtGe46Dx5fs`@7wGR{mq|0J&Ao(4XL<F(cJ^*0h
z%U3I}Jw**0Tkhvrgo+Q`+Z`$CY8{G{yb=kNy@C|f^KzU(^0)Mms>rylU_3q&gkU&Y
z?X`k7z7}=u$I4UXA6%4LYUS9@qhvzz;(pQgw=PP>d_GjxUY`|@yAuxW*%V*v{xdt^
zrXyAd2L7uK?ZF^%2ExOgq?f5Z>AA~WiVmQ7KB~mt$0+us*rfhW%Tw1b1d`ltg^#;H
z{{5+-{pW+&z#g$geiR)V_*X4Y?9_2<;4WPniy*}R861>Gy(*HJstD%|Rr?!5g%PI_
z?Ve*m5T8PTp3wOTgr%y4F2l~ua_4G)xzn5%b=KvFo#m65o)xUDsIz>Eiis6Ga1p$1
zsesU!U+z{-3cK~X`3@{lqCbg5q|^Jf;(7A#QBYF9Mf)J3iVhCsfn&RiaSz4h-htmT
zWHG@RE1EAouk_5&S!bVn;m7BH;*;kuD4I2U&fE*;6_*r#9v=^nZ)k65scx%XeRcgc
zYZ|XxUvurMrnME9EL>Lh+3=FcqQ&+_7so22mw#sIW#!91efkYo&McUIRn<A4yW$Ji
zZ?w)lt8mtO?`K_tmt*>C1ecEf8UgZh)ZGAi<E*?@-dQ{C?sucVdcgAdEc-D`6`o(i
zkF!IrPF{xT%T)65%)>Ng4sbr68=zlDfLGxs>;If^$O=E-3DCdaItlGd5O1pFywh*J
z10-wxn5yVgY<q$JUv1X{9#wU%XOaN}K2BP}a;??@f<{G26f3ECoiP)fz<^P#rWQ*u
zB!cot%_LxpHkcX9={Rky^j_QAinrF%tG)W&S_Q7sfRbRXEn@5Y(RzJkj7WU}S|#`Y
z*E(m<IhmnfueImP$*i;X+H0@<JZta0&e|IK6rj%v-AjO&awu>x)W@R*;&)u16X>ge
zG;}?nV+6<JITZI8AdT@XAdRux;GRLgbbn$1knUr=j{Jp%%eRrc@dB*}q|#SoRZjWQ
zN=BgtfF=mt4*+S5*8ypaMP;rmKLMn9TW@fmM(HURFmPt!5XFH&CNts#&)~~JQ7S2s
zwp4PhP}sz+0HnA|15Gxe9I7;wHLB1w6IwXGm-$*V2z(c1=EYgKYrn6U{C}2o69|Py
z&=c{0oewjeG^l|*%{joZoe@*w^8*n?NNJGmFAOMu70&PTVJ`G{&F?)kI_9r5*yctz
zzlC4)%`;&x;9UbiM!<);<owNlUFvy6lgHIjfJqq)OM{o%lo4_<xA8$P7qh`d7@BQ9
zOyO65n4k|^T_{{9Ad5fx`0(MC0?a!Fm@-zKT&{#i`7kHrX)e|U&c#B*mEzy59cvk|
zjhVfm{fdUgD_fQXX3xC{3lj3#o*>%wv%YGjQ<_HCT>=21q{{^T(oa_;=C&+pX-=Md
z>E-zEe8>l;PUKii>w=CY$+^w4ecb3giZn|Xv=#Mu-*{d}%avC-0%MtD_!5e5Q3T<h
zB^93+6~u!zM6*AQTE!t6*+?Q6EVvZAzU_;bt}MEOa_RwmJK)6>mW$u_p|jz-7UR_<
zfeKep+Av-|hp>4{8sK6@vG4mN`mldk@%Y$hqOvC?*zr6US3JD^i9z?^UJtrnN4}Hr
zOuB4zNB6!_okwJ&w{-6t(OI57@7LA6-MQ1dKNw-n*z(SU+33%C7@qm=4o>rP<mYPA
z{8G=LVo-IOclyGsd;MqW4SzNs+Bv`nHgVmC9t<+0h8~Y+4zv3=@ntadxSa48hGr?;
zJn|IhSB0ZK)4d7%!G!(0<b~0$X%mx;3Cx-&(@_jGXZY80Jsd#uxr7>4B~N;*z&#lY
z8@;$6i>;Xx+VZEe*qRw5*320>Y6nnTUMe58!yc&<3;JY$KnceS7SA$ET@7h*?wOV1
z_|m=a(4ORBGOH0v&K#}Hvw{OWIu1YyJ_39#G;ozZjR@|8c2+TPxjv56z<K&KN&+hf
zX6xf<4Ll1^5->SegBh*if1Fa42)`rsp%f351Bc=Pz~tO0Fa2Jsbw-|?K9xH1Jfn{x
zP4c(;q{3DX@X!IobcDSNPmVl4XR64r6qV<@&ARl%*G!If=Yq4ciS1=Lu>mv2t<g1+
z5I#?A-ST=Fz>(244I{8BR90WJz2ilCs{9-E?an+mQju_G&6v#HgeOdw2k?U_6c!X7
zOjdFd7bYSKH)0|eRvmIWg|@FKi`%94*AKx-lX|*?&O>`R_c>Tvv}(F4PQE{QeG(te
zW-IGuXk3`MhQB<>87<BxaKEZ_eDXpD4&}c4pitnTQ%b8!nu2YD=kxiVXP17smP)+G
zZ+Hcsc~N7bhJr4SejW(S!cD!U0e2&AcC;qkR8q=u^R3;EoBBr=Zhp_mBJIWfAa3&A
zfqNcasFnC_!fz{X>O*b#<@Z%g?{5755;x!8z4+yKMG?SZ{GNiF=|}L}iu(e<-@<(q
z?oi+({GTAu3>3gbfnFpBf%tvX(E^<hNOe@Et)bL^!V*fJ;{`evbd;JUpu0l4@5B8e
z_3Oa=sn)1CmV-iL0BI=yD~?hs6gHvcuQ-;8Lev^HZk54NQVpGELRmtJix?<oLgNOP
zFc8a5IWw0Ux6wfJOlXtAEi}*~6S~CU+6<I5p(_n;m4UiUXv*N$80dNv+GB8Q4Rn(U
zz1iT_8R#|>y58XKG|=59w1|ey_jxl2d{@YMq8@x84f|7|slrVfG%s9yr$=z-F*SH<
z@L}fQsmX`A1W#=~3`@4lhvBy|y*^9^Pdj`VPV<`}NIvzS0K-0&$J`AJdsZHEKQO&M
z%)`Kh(dP3se*h+8FonB*?1TPIl}~I|;PD8@Iw=jZb^0%_hC-#JG<XmGQ!nvfFL@r3
zVO)C(F!agjUL}F0ssuU+)^c+J2G*6LJt~pg68suA^!wqyK%i8*>7ca1nOgXwmX)=z
z&c9$ePTugVqt2lkKE2gZQGGa9mvt5B3m3O{z_8za9Hw5!TH2C}OrTM=8=VuaU@9MI
zj52o;6!0nBjYcnq`(yQ!=D786lz(Ip$s+5^uky|UpoPa;I`P><?Si&;XBwc<&t9CQ
zs;`rU7$ytJ7H6{HDDR#<&x@{{G2_Z&zGe@gg-<)ZCaf2=aLx<ieF7yuMxY{EIPl!Z
zycstywyW?z!xOk?*2{Ftal0pm@R?Vnh=;X9fKNHH36anhYU`xy0p0H$T69$KtBRPD
zf*sEj17zapH?_uR6&8q_chvKwTt-(KC?t+L1oeJ@&|2Het-@})jPPh@;`VHCz^E%L
z$lr5$PxB=DGAE4kawG|<{~>|K<3GpRkoe)`+e-Z?9xf36;hFDW{#U3B5IGg|iE3I-
zGYHJZc)VoHbIM9F`oD0@qr_|#`RfxK^E_=r@)Ok2DxXp@pQy~Q|MHHDx)P#g;-xC$
zlc;d4T5%;mN^&laRjmbHinw;z*tYZ{Qqq|z=l<xPbZ0smw$bndw0w%w0rMVl4$xO?
zPMPYNF>7D_8q~8XB0*ta{R@^q*;l6?sUlMQEY?>ez`qN%=fA1+;bQGY{sE6TNyMMZ
zB~{PGzU3`<22IDk9&|4|>AJQAUT@r_Yry?-0l$XfHV2L9A2G~KdhyHcJ({~=pWc3i
zRtB_(%O3J8vWwY|My<QHyFFXZMZX+*j&=`Wzj6x-3{Z)ciU5k)`}$I$2KJlIQQaSf
ztZ&|mkpdgw!f(dVZ2MKrc_L(so#_(#WW<ucm3kY9guM{1qLURdcOr~AaE$f_n@G*A
zf!W!GBSZO_PW2w_N++^+RxrJeV+PNPXXe6TPYDm(i`#R{qibTPVW*=n7_HgcIU!R@
zuZ+)OcKsC2Pbrh^cqvxAkltmbXjQ?zx9!M(^&Xe`;NhG(f)iZrRMotRTnm|n%}U{e
zU9OjE-m_Bl;SjYy59@%??3!1t^u?Idb|b$*Y>2W1Y5-g5qkv6hkXagUJOy;Z4p;Z)
z=+FdP^%V`(y&Exp1k$_U?dP5N9aicBhG65BLg7gJU*j<_IIhRK_k7rG^i{Rm(;K*N
zxm%Alhu5BjwfPG(GqDe`QP$h>)Fw!U!|V`CgavM<jW8>9IqC+~gZIX>Yo!p8as;$#
zILdw!DJPGmQG%1|-9d2(xwQ(XKD64Y1Ph%u0|One(dvQO!&KTz9f#b-vde}N_G_?s
zsNeDm_O{fuBDd<fvp+MtWJ+l8tRAVZ&8E7t4MVFx*pK8_%!uD)-It0ng;vzp>DGOG
zH`sJ^6pAyOr+|yr=l>x5K2x8DMdt(9)5T$clHm=Q`47RxE*rdWD=_9%OC4Jo&%=mi
zuc6#%qE(P1P`~9hpYYG32<K#zXN3lrvpvK!wdL04O4+o-v47dRp))DI^-bDth<F|I
z517Xb;?29T0rm!}XlL>qW;k><Gdtaz*+k7=D@6z1n%Qq7{97io_O`+6f%uU@4BlFw
z{SoKXj?G4WW;R~M4=44Yulnw7Sig9_BbR&GSqYIgn0o?GsAbk4_bnG;#Uwk!sXc6w
zr}^e!FNM91;~^6kCROp^N32d8fmnt};RpR?=io6A23-*SWDC0BtnxLfF|0*7{<7xD
z&XYAC&p_-aC^q*fE2WOO7g*`1UIC9=+ANJbs|-~OD>V@!$1{<#e2YkTp^BsEps_RV
zk*rwh*}&v}@S$u7s(k+NR%A5yHE%e2YL%y_R$1vG(3mnsS1Deer-6w>bs&<j<{9P3
zuLBU9W{WsOxfuSdamN<``Bt8MHUq2Qn8pU2xq*Il5}Dg7*5g->`-FcjqA;lU$nW(P
zHwnp|6`a7;vC`T0aqMVC6<YpeRycZYUG)&QP+>C=-GDbWSm78-Z2(wK>}ZE$TP!{U
zy?Y~n;oG*UfDqL@i+)UVo92V0FNV)PwXzX#3K<^1H6DB$b~sp`JP)n>8)pK>HaXpd
za(`T+xiLC^x0(GIj!suU#H{*yvg~0aa+#G{L#etyDDQZn4kjm$K+fYt&VD({6mo9h
zpter3<cv$b$=jl6vu^g5R7?(9=@Ce*F8y-Su1oJqrogMmO40o;Eum6h1;EjJ1KEIG
zFMg}{^dliyU;qvTa&sNpbRB84r}3p7xBEAi;rE@}t@O#lVy#q$n=~8u5x__93+9$e
z{9P&t;`41UClr7Q<G(4LKr7c9pZz)dt6=UViT|>d-bTXgY24*y`dV97`oEm`Y!u%3
z|Hk<D1arIaD`lVVm4dfYs}B%kv4dx`@^U)Q!TZbFO4Sh0*5)>tr)db{zDcdrzaYGO
z-^k>0zKB_}IN8D8ie}VL*|iCwq|!fSj!^il1jEY4h^?%ucajM#B$Y|^9{V%7&FDiY
z3$k&_ayQCy?N;mFor5q@93GHng|nV11<u<=?$l;V3Z{A|+VQ8M1Gt$c!usA;rbwA2
z#RO9HkdUAk%lSE;zsuh2SxFw&pBJGc+Q=P#(2wzoB_uW~RM2|yK<9$n@hj5Eq>K7R
z>R+Mi#xlR;K!9dzrMa(8i&4f$W42NUQ72Ot9CssJhn~hVq4^1|<uKgS_>2)aDRa%$
zvau4p1z;oOL}nNsVe_LM340X@l?7a@M4<k-4b_lqt}%>B6uNp3L?M9A)p2ajh9>E}
zuZF2_YeJ{%vA&(h=xgIe6gLc99No<XulO_UD9NydN@7D_?4Tgt!3&W4zEnjMelVI1
zA%}71FrLLhAEvR0uu=OVh+?HK!Kj1I-Em?fD{DS6`xWRfnN{yWr9=CCUvpNo4R34F
z1ow~V_;Y4e1*~-7dQs!Xv-e1fR%(Zv7UsZb_r)rjD1>mxU4@$0@rtsDziQ<TUG1l|
z-c0Z62vfg^A{jReQBnG0P><ueX>62EN?@P)6yCO>?6pJt_wV1kbNr4;UAU4td+V0h
z%YWY0h2o8Ejc3m*iCeMX1hD-7bZPwfxA1<}{5ZCaS0e*dvDqF_$A_T1y{+PQvZ1QH
z|DUw#9%EY1l(zPlgaf&^(4~858%(8v>#q5<+>B(WGfny&-x|uUmdrdhe!H8QE%3$Z
zWM)e|JCm7l5{MuFc6O#WGjSWQlV7m>oh-!pVu$4^8aZ@WG~YP%aJ=2?I2fQQvkPfI
zuyJ<t;1L{B1eK_WNEx^aBzvUqwS$I7%8+&44Z;g-#rTvazx?_yo+%dw9M_kF!pj*Q
zM^zt4R5^I7H%Jo&{m`J@*Ik7sJfW|<nl0JwX|c@BlCq*F)TN)bQq`b$xUjdgN4TxT
z?R#;w*GTm)&iW{K408&Sb-x~rVqOvLej|w9Z)~z-c1|Rbj*K$>5)!E1$sr|0XN55v
zjh~aYsycgjz5QXmjcLP+aeEuA6$g)@O=aey{B-Q1@-?xe@nU`uv#}RC$7c@WZ0vdT
z=%?eEb9FZ6Ay@%Ee}yJa6%`h{1JUmNB?)_1o&8aaU9Pq-77hkF$7A9d>ijH^0(S}=
zq;7$yzr)vzGcvi|XmE@S0Cq3>O<ye3<P4qJf<Xa-HFVvt!$%SZq;JJCRBA)fY!91e
zbnlMX_^qp7lCJi0)ZP)rZsFdoUFdC5E4Cw%jh56~vF(AK>~5|7!Ej*kx}Hy<uUe@;
zu%X#+!yuVMueP8X7@~`PX~I6I(#`6MFl?=5!WzYt>6=qf8o9#|Ij?`Zg){g>AM};S
zK)~Pr4_t+FG^r2te(HXsF|OleB0GsMkLUw<?eI;-vz*ogq{ewSex*WWH#E9=l>5wW
z?*!{20x4vA;nZ8l`DQ-BzKY;Cq5g}`ll)4;eiaZb4)M}XJ&F#2Vvu-lR(xz7j+`ID
zC%!2y_BX6EHu`!p$J>pRPLp`&_Nevm{nmH4Mk}Ahk%g-Cai@_zh+6V=tpDIumc0;f
z!1vi{Fm6s)QS`HkDl0{AJ$QF^^6P+zM8u0@WFk8mFU7rsBYMPd?`BIkXfgQj=KJ&b
zz1_Ky$2%_@ehtA-A#P)LgWL%iN~7X~Z%4ZaMn;d{rwJmOj#GcD6s+`2FcIz3{SX1X
z%Lfn5w+FuFoFexqnkjA&NvXdo1>_b@Z?v-C6wQsGiDo;4n9{)T`8_;2Jq!Kl8W~%e
z804F2kNJy8U96_86yJ?eyQ2)HiPe$ewU(<x8^tR+Vtua<!%%W2hV<#<BB?!fh+?Jo
zAypJLBBG9R3qV`FXYfg~(c&>oNiIU@#A-L%IRzI~eScj!#UK1hJ|erD)`&)+7U|MO
z`|HX`pR0%H`6wo>;dGvKSAdNaxU2uzTdJRxaLKwru4bnEv_skD)Oyz=QCM==N9Lx0
z59)0i%KC1UPMi*|J7BTm=6i6fzQ3biH0N_{U}Stef%q^k|0C>D`cuM@Spj$_e{oSW
zT;u|6F0fL8R7Dp7TyaEMqhKHjlU?w}#|)?@wDh+mAL-txy)AjP9=^uZ-QMR}>yKwO
z;Y1cwRFEX_yq4UvYvtPm@Zv}jAsutihiQDc&3VAN7paPM&V!u%K~;lf;ep@753~qj
zrB|S)_&E#rZMXy^`UoaspiN{K!c-aO!eI6C1FT+h#fN4(_)6m~zUsmQ7rkrvR3ngl
z8aXatJZs}R7`c!s1xGFQhyW57Y8B<pphO8(Iw^~E3tq>R=YEl-1O?T37#_$8BHV#g
zsI{k`!84QNF>WxaZ^eA{7JzbEbn<iH#!7>xk$#>8{k2ti4D{Dl@&}=mBt3-T#1YP}
z3%L^1l>uUMb{&keMLu*^0B!gZYg}?X!IeBuhT2jW=l~;J>m2YnfUFRzIW+FU<2pQc
zA6#zNhVj7qv1==G`_WL{Tza#(0pV<}i?~{K2uh8zNV6ffEx(4v$Ccj4>npk#*DP{T
z4_KoZEA<^DCtPxAK&?G|-5?v<Aaf-U)Lm+E8pc;ZHmpI2%x?cgI~3+Fi%t&<=sTjA
zyDa(4;R@Mj$$yM;&;1_jN^JXG%#fSrjgT>(om-X2)>aaE**-D0mvTqT$=!oAo!zpt
z5sz0)e*!a{-+Jel7C3+F3LZWh7T~jj!!6Dge@>w-yU=F~@#XM#_aDQ#V2{iy3s}L=
z1j?!oY8u%#q9N2<vV-zGh$$g2`lq-7@8ofS*Wq_+x!OrY@cRKa?cyZD#%m7yHcbE<
z8)nxvUJ#hLu%(qA@8+*qyb!z6^B2MA-69x@;-DLBL}RO%j_caz!%@)uHZe+Nyg4yO
z#mUft%cf!zv6-yT!mYOP>{&=85DFZIzD0RL0e;KDO_orA=P_~1C=^%)Na<bxq;&5B
zQj7Q+%z`!a5kMOHoPj<7q;$0*m+mG&O7{Suqa+RbF;%*y2BPm##ob|`7}T+&B}M}v
z-R)dzaA`nXkqQOwGtfRmN8god$21X;%6ttV<?>?_y4m1fFu45&_qj5c%c%z9YOr#q
zg}p*u23iM5W!?@bEb<K++-S4`m0+TQ5`dJ;B?jWR!-{(bkk-s4Sl-rrv;xvv{S6>3
z-NO%d(>)Oo&?uJ(pz#7-3uuBsHv^g|P&u|hl}k0C3c)>ZaPJ!2X@{ycPbkm{=vbk<
z(cu2mK>dJJzNxS;Rn9j9Qu$s3q;dBGQo6BN5LBru0cok-4@l$w5s*qX2E9dN%mt+7
zcd>z1n$R_XH0~{cjuT0r1f=ciMML+N2`$BDx`ti~s8V8lAJABVegR1NJr3x2!95R1
zW4r=LrP>QfQ#%C0X^iE7l%EYq>3#@E={5p7LHK<LNckOx@j!9o0V(b@1D$0;7a81j
z26wx`-EE+E4YU#?%!!iPT@Y@PK$`(+8jl+2MFYKOpivNgvcxz7&`AO%4DL&SP8Qr^
z1NE9v1W0WK1Lyz_gravKwhLq)n|fgb0T5cXU|=k@Dnye3geK{Pl8c5SYoCBOi7LZy
zs)42%&V`n8x{u!s3h#vhPA=x?K$dcpoNoovU|7Y)e$ID89>Wsl8zPU1k`P%{OrZq^
z-yiLyF;}4l23sQ%_FRA0w<rZxXGsqS1--lcOrh9!Cf*%>4AP*PUBHKkIS!U(qvi8u
z2g4u5EH)Uo46pWKE^A48s)jUl`>?dlC30hBT!hp`@$XD-@zL<%4j+b`{k|_4e4md7
zHe2wH*Wrlm$TQ3ej(p%0&$%3$WqG09T(n)~r6Ih<MVJ=#cmd|m1(-K|7^J?e*|2uY
zC*Ou$%-EnC&Bas{U}(LkmrHY&57U4rv8vP0XXvv-9xq$~zrEtrLmtJ>F8^4!GT8zT
zyvvv6QF2}>VhiQ0maAM7y2b7ALD<|<)M^mqb6Qp==O*bz(oa#V#*3hc!$0EOCCif(
zjno&x+lUK)vEFquBFXB9FisqpDz;p?jN!2CE0%;YNz_kiisUH{-zP8>QWmvKMFff?
z>F@+E1{nnH4g+Gvg|cwXip(inQ;UCvGtE6}-gDyd4^Sr@i>WnuM;Bt6a6gBeCLFvt
z$`!LIlE7jABLBcwI2`Ty&8GJ%W>ZAEIOtY6w550^ojLK?euOJEn7cm4=~Ell1LW-E
z0W!v#)yF;Pc=!p&P2`7bJZ`?PLV?rqA4&|MI{fFz9}1j{|4<jC6!rgbYdz|22ej5>
zJ$uGBmyh#i7*<+f<f}~vmj;{g-+fa7#8vpNP`vm5$9q?>Zv0o_yMi>VGyj!0{&Gi=
zQw@QONfcn_`7l@Dsd1Pko(vj5s+}zW$3%CzoYPl8?h-J7y{*`@oO3L_u-G}r2k3>T
zPOCx)ue=p5Jq1mY92EA#9e8QdvTp~~9$XRJ|CC<nvAAS9y}18?`H=TQuP!*}n40=p
zM>dzXSZ}4)w*hqYD8!4p0O^YC9AizS-u|tu?deXhmFkCjA^jHXTh@0jE<w-Fj^!lK
zU9*slo(HYe{UAg~moaP86fZ%x4PFU)H&Mr`w_@+Qs}jH^Yvb8f6-}}=;jCWU?+c+M
zNs7;zmHocJe5_;pLOTZI_Wn&&k-bb$QKmKflLz}b4~}$rFov6g@Sq!|UUpF{bt8Vb
zRLVyzdegH`Fp9O~Jr9L+l?<7bMvro!!YZfeJ}un1yd35d7vm;iYea_x7U(V(36&^Q
zR~F06rX!q76)Venb%$_CkM4C;E>|9!BB(5TO3JPD(O`^K-FdLTNxzLQ437)fhzzij
zW{(z^6GdeyFD?s~?yfH965MCe(y=w4$X<q3qRA1M;NdX8R}z_nAn3I!sN;$VJ{(R*
z&K^!43D+D5VS~6%DH54bl_Nh~9d+-o?0`8|5eczLCuDT$le!gg>$@MS8vHKoy<twl
zW=iV=xNBN91}9@%DXx%U=MTmtSjQrkCuE07hT;&r7#g5Kj0!x$?jxSPUN+%W6m709
z&iS%UKBiNn1~ytG5Xj8{lg!LY)-MVp0K3HWI4q3i4#q#HYPBj7nX|_gFHThL(m>{m
zp+u&mJdtS`XKz8ZHo_A2QEc}#bZ_xF$(m-RZa~6)feEw*>|RyTAeIqTx@~Wzz7HX=
zwci+pksvoo#n6IF+16d#=mkjDhU2DxaKW{z`dKXd!bU#%d3=)?x*6SqwgT8djR$eg
zV@O;()n~?xl%k2&Jih`vsoYOPTv*Chtks?9?AR>QhG2b>AiCE3QCNyfjMy2Fvg3Q$
zXQhEt9i@|vlj=SE1~POHXeB)uy#{v|N$<TCPfKo?73LzyTu^Q<(oVx^)J~dObHoV*
zig|3LH$y77KV;6Xq>n4~u;tQjTgNfI+1bf(kJAM@bU?V68v9*FaZOFG!D95Xa=5cO
zrg~2gvics|?mDHQeTF1fvv<YIXqed3OO8dm95;BcG^w%FFmks_Lp$_mfaTMKLjmMF
z9UA+u+z`_poo<8ry`Us{lGFaWd#iX}I*b{0R1gcb0#gBmD*fP#7>aV&{*|r#&`viA
zz9jOA=XN7FmYG=*%bXoXzLq1@WuNOun3J>`EXA{p+>(^xI`<K_Z#RQrD3`=P?o<us
z68Pt{G{RRKtKV2prm!RUlQ4fGVQ-ynZ|B}immub0vjYH?yy@6(NY0{LuZVlfIF-VP
zcX9fv_n9G$jE-U|dm7C3n3C_S4mV;QH?ZCsI1_OPx0-J}dU_Twh12}`%jlF4N0gfb
z%Kuf*CtsoGlk4f^VFyW315-{2V=*^;!j#eN$py*9&0#L}hEE7jYX9;j;WNWu9}S90
z?FbG`n6xnL{sj~YFfLbtCroB|dtlV0cEk)!YRB{B(GxTjm<fDxe$3kOguvBjQ2CTg
zSICR3gpUdZMg_+PN~(fQB%H_>IIb%EZo|#@`-!-*AOS7&4E*N^8Vc0nKf^+Sh4`<l
z&Z_|F+U5;_bT#V726w-K9y8FOp~F&$6So$SrZET5QJ@F~t}wWEgIjHIHyK>N!94>=
zSN-T6M)?gHx)U%mDvl;;nnoQU)#MW<l>2BJy4c{p0Z2LDWN^PW5YIGJ&i@NY*Fax4
zxP5>)FAD``pa(m-1f*$n0@4-m{eX16nD1nzs{*8S%K&NUj{sq55Bz=xC@j#cfHVfr
zGt(IOAlku=0i?JpgX6hm8sl6*nzsuL?h1oj2?&djNR1|P;{{p|2n$)jZ3LuTehWys
z{K?=30BO4K08%bIA53HLB(Dj=Wf`D}0<8s9ArSt_N|(;85DD{(GW_T8sH=#I<BUup
zN~EEMYkiJp-wYDZg`$!xh*CU|Us={B`-RXHnTfH#M3jy5{}Y>ud9-*+S{mHwONS4I
z9%NX0{>wXCgRtPkK1|4e<>zLB0GceWi2T=oikV%2`HBzITKH{MTSv0p&~Vm=b*f?O
zW<|f+@+`?Yv4*YDflq$9i!~T%EjWL^&^HZ5Su$LnVe4jvtB8ePh>=B?j}ISySb(|R
zhq)I|n11@cEAviAeF6HJ>B_>zvH5@3Y4W}gX`K&lkyhcP*`zZUK5;k^29<A~{D0wp
BhBN>G

literal 0
HcmV?d00001


From 07eda3d71f9936496dc474083d9f548b9cead3df Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 18:49:25 +0200
Subject: [PATCH 018/136] Added tag v7-3-655 for changeset 0d3238b54963

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 911a325b98..b1223d1b0f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1991,3 +1991,4 @@ ece544e85821a6118da55dad1538ea4c3625bd1c v7-3-651
 5edf3c51aa93110e57fcd0428c30e5bed149df34 v7-3-652
 fd0c7452fa51118d8f6557b34b4cc96e830ef6c7 v7-3-653
 73557eda70271b49015265b7147562b63a7a094d v7-3-654
+0d3238b54963c4b1358a1f33221f75e067c1613f v7-3-655

From 8c950049fd64ec87d4480651d7c313974dbed867 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 18:54:48 +0200
Subject: [PATCH 019/136] updated for version 7.3.656 Problem:    Internal
 error in :pyeval. Solution:   Handle failed object conversion. (ZyX)

---
 src/if_python.c  | 8 ++++++--
 src/if_python3.c | 4 ++++
 src/version.c    | 2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/if_python.c b/src/if_python.c
index 1740979ac7..836bf1b3f1 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -1025,8 +1025,8 @@ static int CurrentSetattr(PyObject *, char *, PyObject *);
 
 static PySequenceMethods BufferAsSeq = {
     (PyInquiry)		BufferLength,	    /* sq_length,    len(x)   */
-    (binaryfunc)	0, /* BufferConcat, */	     /* sq_concat,    x+y      */
-    (PyIntArgFunc)	0, /* BufferRepeat, */	     /* sq_repeat,    x*n      */
+    (binaryfunc)	0,		    /* BufferConcat, sq_concat, x+y */
+    (PyIntArgFunc)	0,		    /* BufferRepeat, sq_repeat, x*n */
     (PyIntArgFunc)	BufferItem,	    /* sq_item,      x[i]     */
     (PyIntIntArgFunc)	BufferSlice,	    /* sq_slice,     x[i:j]   */
     (PyIntObjArgProc)	BufferAssItem,	    /* sq_ass_item,  x[i]=v   */
@@ -1787,6 +1787,10 @@ do_pyeval (char_u *str, typval_T *rettv)
 	case VAR_DICT: ++rettv->vval.v_dict->dv_refcount; break;
 	case VAR_LIST: ++rettv->vval.v_list->lv_refcount; break;
 	case VAR_FUNC: func_ref(rettv->vval.v_string);    break;
+	case VAR_UNKNOWN:
+	    rettv->v_type = VAR_NUMBER;
+	    rettv->vval.v_number = 0;
+	    break;
     }
 }
 
diff --git a/src/if_python3.c b/src/if_python3.c
index a62971e886..57257e643e 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -1817,6 +1817,10 @@ do_py3eval (char_u *str, typval_T *rettv)
 	case VAR_DICT: ++rettv->vval.v_dict->dv_refcount; break;
 	case VAR_LIST: ++rettv->vval.v_list->lv_refcount; break;
 	case VAR_FUNC: func_ref(rettv->vval.v_string);    break;
+	case VAR_UNKNOWN:
+	    rettv->v_type = VAR_NUMBER;
+	    rettv->vval.v_number = 0;
+	    break;
     }
 }
 
diff --git a/src/version.c b/src/version.c
index 9deec1739c..0124df521b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    656,
 /**/
     655,
 /**/

From b8f0a817401721bdccb7baeb740a887245d4e8c4 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 18:54:48 +0200
Subject: [PATCH 020/136] Added tag v7-3-656 for changeset a2f61b2b8e77

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b1223d1b0f..5f7c495adf 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1992,3 +1992,4 @@ ece544e85821a6118da55dad1538ea4c3625bd1c v7-3-651
 fd0c7452fa51118d8f6557b34b4cc96e830ef6c7 v7-3-653
 73557eda70271b49015265b7147562b63a7a094d v7-3-654
 0d3238b54963c4b1358a1f33221f75e067c1613f v7-3-655
+a2f61b2b8e770bb8d233ce50c8c7508508578a8b v7-3-656

From 8d41f92290cfe0c083f7df474ea11849111c959b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 19:03:56 +0200
Subject: [PATCH 021/136] updated for version 7.3.657 Problem:    Python
 bindings silently truncate string values containing NUL. Solution:   Fail
 when a string contains NUL. (ZyX)

---
 src/if_python.c  |  8 ++++++--
 src/if_python3.c | 17 +++++++++++------
 src/version.c    |  2 ++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/if_python.c b/src/if_python.c
index 836bf1b3f1..385905e24f 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -191,6 +191,7 @@ struct PyMethodDef { Py_ssize_t a; };
 # define PyRun_SimpleString dll_PyRun_SimpleString
 # define PyRun_String dll_PyRun_String
 # define PyString_AsString dll_PyString_AsString
+# define PyString_AsStringAndSize dll_PyString_AsStringAndSize
 # define PyString_FromString dll_PyString_FromString
 # define PyString_FromStringAndSize dll_PyString_FromStringAndSize
 # define PyString_Size dll_PyString_Size
@@ -288,6 +289,7 @@ static PyObject*(*dll_PyModule_GetDict)(PyObject *);
 static int(*dll_PyRun_SimpleString)(char *);
 static PyObject *(*dll_PyRun_String)(char *, int, PyObject *, PyObject *);
 static char*(*dll_PyString_AsString)(PyObject *);
+static int(*dll_PyString_AsStringAndSize)(PyObject *, char **, int *);
 static PyObject*(*dll_PyString_FromString)(const char *);
 static PyObject*(*dll_PyString_FromStringAndSize)(const char *, PyInt);
 static PyInt(*dll_PyString_Size)(PyObject *);
@@ -406,6 +408,7 @@ static struct
     {"PyRun_SimpleString", (PYTHON_PROC*)&dll_PyRun_SimpleString},
     {"PyRun_String", (PYTHON_PROC*)&dll_PyRun_String},
     {"PyString_AsString", (PYTHON_PROC*)&dll_PyString_AsString},
+    {"PyString_AsStringAndSize", (PYTHON_PROC*)&dll_PyString_AsStringAndSize},
     {"PyString_FromString", (PYTHON_PROC*)&dll_PyString_FromString},
     {"PyString_FromStringAndSize", (PYTHON_PROC*)&dll_PyString_FromStringAndSize},
     {"PyString_Size", (PYTHON_PROC*)&dll_PyString_Size},
@@ -578,14 +581,15 @@ static PyTypeObject RangeType;
 static int initialised = 0;
 #define PYINITIALISED initialised
 
-/* Add conversion from PyInt? */
 #define DICTKEY_GET(err) \
     if (!PyString_Check(keyObject)) \
     { \
 	PyErr_SetString(PyExc_TypeError, _("only string keys are allowed")); \
 	return err; \
     } \
-    key = (char_u *) PyString_AsString(keyObject);
+    if (PyString_AsStringAndSize(keyObject, (char **) &key, NULL) == -1) \
+	return err;
+
 #define DICTKEY_UNREF
 #define DICTKEY_DECL
 
diff --git a/src/if_python3.c b/src/if_python3.c
index 57257e643e..36ae8eb778 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -172,6 +172,7 @@ static void init_structs(void);
 # define PyUnicode_AsEncodedString py3_PyUnicode_AsEncodedString
 # undef PyBytes_AsString
 # define PyBytes_AsString py3_PyBytes_AsString
+# define PyBytes_AsStringAndSize py3_PyBytes_AsStringAndSize
 # undef PyBytes_FromString
 # define PyBytes_FromString py3_PyBytes_FromString
 # define PyFloat_FromDouble py3_PyFloat_FromDouble
@@ -273,6 +274,7 @@ static int (*py3_PyImport_AppendInittab)(const char *name, PyObject* (*initfunc)
 static char* (*py3__PyUnicode_AsString)(PyObject *unicode);
 static PyObject* (*py3_PyUnicode_AsEncodedString)(PyObject *unicode, const char* encoding, const char* errors);
 static char* (*py3_PyBytes_AsString)(PyObject *bytes);
+static int (*py3_PyBytes_AsStringAndSize)(PyObject *bytes, char **buffer, int *length);
 static PyObject* (*py3_PyBytes_FromString)(char *str);
 static PyObject* (*py3_PyFloat_FromDouble)(double num);
 static double (*py3_PyFloat_AsDouble)(PyObject *);
@@ -379,6 +381,7 @@ static struct
     {"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab},
     {"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString},
     {"PyBytes_AsString", (PYTHON_PROC*)&py3_PyBytes_AsString},
+    {"PyBytes_AsStringAndSize", (PYTHON_PROC*)&py3_PyBytes_AsStringAndSize},
     {"PyBytes_FromString", (PYTHON_PROC*)&py3_PyBytes_FromString},
     {"PyFloat_FromDouble", (PYTHON_PROC*)&py3_PyFloat_FromDouble},
     {"PyFloat_AsDouble", (PYTHON_PROC*)&py3_PyFloat_AsDouble},
@@ -544,17 +547,20 @@ static int py3initialised = 0;
 
 #define PYINITIALISED py3initialised
 
-/* Add conversion from PyInt? */
+#define DICTKEY_DECL PyObject *bytes = NULL;
+
 #define DICTKEY_GET(err) \
     if (PyBytes_Check(keyObject)) \
-	key = (char_u *) PyBytes_AsString(keyObject); \
+    { \
+	if (PyBytes_AsStringAndSize(keyObject, (char **) &key, NULL) == -1) \
+	    return err; \
+    } \
     else if (PyUnicode_Check(keyObject)) \
     { \
 	bytes = PyString_AsBytes(keyObject); \
 	if (bytes == NULL) \
 	    return err; \
-	key = (char_u *) PyBytes_AsString(bytes); \
-	if (key == NULL) \
+	if (PyBytes_AsStringAndSize(bytes, (char **) &key, NULL) == -1) \
 	    return err; \
     } \
     else \
@@ -562,12 +568,11 @@ static int py3initialised = 0;
 	PyErr_SetString(PyExc_TypeError, _("only string keys are allowed")); \
 	return err; \
     }
+
 #define DICTKEY_UNREF \
     if (bytes != NULL) \
 	Py_XDECREF(bytes);
 
-#define DICTKEY_DECL PyObject *bytes = NULL;
-
 /*
  * Include the code shared with if_python.c
  */
diff --git a/src/version.c b/src/version.c
index 0124df521b..3e0ac40f49 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    657,
 /**/
     656,
 /**/

From 3fda39417eb4505832b530a239dcd0fa77f10cb3 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 19:03:56 +0200
Subject: [PATCH 022/136] Added tag v7-3-657 for changeset 3958b0e672d6

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5f7c495adf..85a5ff148e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1993,3 +1993,4 @@ fd0c7452fa51118d8f6557b34b4cc96e830ef6c7 v7-3-653
 73557eda70271b49015265b7147562b63a7a094d v7-3-654
 0d3238b54963c4b1358a1f33221f75e067c1613f v7-3-655
 a2f61b2b8e770bb8d233ce50c8c7508508578a8b v7-3-656
+3958b0e672d676a310d756bff1b9c629a7b0142f v7-3-657

From fa6de2bb62f835137fb2f441f0c9f09b5183ce1a Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 19:09:11 +0200
Subject: [PATCH 023/136] updated for version 7.3.658 Problem:    NUL bytes
 truncate strings when converted from Python. Solution:   Handle truncation as
 an error. (ZyX)

---
 src/if_py_both.h | 14 ++++++++++----
 src/if_python3.c |  5 +++--
 src/version.c    |  2 ++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/if_py_both.h b/src/if_py_both.h
index 3ab18516eb..0031003eda 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -2530,8 +2530,10 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict)
 #if PY_MAJOR_VERSION >= 3
     else if (PyBytes_Check(obj))
     {
-	char_u	*result = (char_u *) PyBytes_AsString(obj);
+	char_u	*result;
 
+	if (PyString_AsStringAndSize(obj, (char **) &result, NULL) == -1)
+	    return -1;
 	if (result == NULL)
 	    return -1;
 
@@ -2549,7 +2551,8 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict)
 	if (bytes == NULL)
 	    return -1;
 
-	result = (char_u *) PyBytes_AsString(bytes);
+	if(PyString_AsStringAndSize(bytes, (char **) &result, NULL) == -1)
+	    return -1;
 	if (result == NULL)
 	    return -1;
 
@@ -2572,7 +2575,8 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict)
 	if (bytes == NULL)
 	    return -1;
 
-	result=(char_u *) PyString_AsString(bytes);
+	if(PyString_AsStringAndSize(bytes, (char **) &result, NULL) == -1)
+	    return -1;
 	if (result == NULL)
 	    return -1;
 
@@ -2587,8 +2591,10 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict)
     }
     else if (PyString_Check(obj))
     {
-	char_u	*result = (char_u *) PyString_AsString(obj);
+	char_u	*result;
 
+	if(PyString_AsStringAndSize(obj, (char **) &result, NULL) == -1)
+	    return -1;
 	if (result == NULL)
 	    return -1;
 
diff --git a/src/if_python3.c b/src/if_python3.c
index 36ae8eb778..0c10f8dbc7 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -85,6 +85,7 @@ static void init_structs(void);
 #define PyString_AsString(obj) PyBytes_AsString(obj)
 #define PyString_Size(obj) PyBytes_GET_SIZE(bytes)
 #define PyString_FromString(repr) PyUnicode_FromString(repr)
+#define PyString_AsStringAndSize(obj, buffer, len) PyBytes_AsStringAndSize(obj, buffer, len)
 
 #if defined(DYNAMIC_PYTHON3) || defined(PROTO)
 
@@ -552,7 +553,7 @@ static int py3initialised = 0;
 #define DICTKEY_GET(err) \
     if (PyBytes_Check(keyObject)) \
     { \
-	if (PyBytes_AsStringAndSize(keyObject, (char **) &key, NULL) == -1) \
+	if (PyString_AsStringAndSize(keyObject, (char **) &key, NULL) == -1) \
 	    return err; \
     } \
     else if (PyUnicode_Check(keyObject)) \
@@ -560,7 +561,7 @@ static int py3initialised = 0;
 	bytes = PyString_AsBytes(keyObject); \
 	if (bytes == NULL) \
 	    return err; \
-	if (PyBytes_AsStringAndSize(bytes, (char **) &key, NULL) == -1) \
+	if (PyString_AsStringAndSize(bytes, (char **) &key, NULL) == -1) \
 	    return err; \
     } \
     else \
diff --git a/src/version.c b/src/version.c
index 3e0ac40f49..62bc81957f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    658,
 /**/
     657,
 /**/

From c6a77c4fa67d0e8caa74a9d1514817b753bdc4b0 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 19:09:11 +0200
Subject: [PATCH 024/136] Added tag v7-3-658 for changeset 15cdcb8ddcfb

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 85a5ff148e..d644424f20 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1994,3 +1994,4 @@ fd0c7452fa51118d8f6557b34b4cc96e830ef6c7 v7-3-653
 0d3238b54963c4b1358a1f33221f75e067c1613f v7-3-655
 a2f61b2b8e770bb8d233ce50c8c7508508578a8b v7-3-656
 3958b0e672d676a310d756bff1b9c629a7b0142f v7-3-657
+15cdcb8ddcfb848c929cc37e239d5da8fe48a8d9 v7-3-658

From bb507fd8056d5e966342b0517df5f10c1710068c Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 19:17:42 +0200
Subject: [PATCH 025/136] updated for version 7.3.659 Problem:    Recent Python
 changes are not tested. Solution:   Add tests for Python bindings. (ZyX)

---
 src/testdir/test86.in | 54 +++++++++++++++++++++++++++++++++++--------
 src/testdir/test86.ok | 12 ++++++++--
 src/testdir/test87.in | 54 +++++++++++++++++++++++++++++++++++--------
 src/testdir/test87.ok | 12 ++++++++--
 src/version.c         |  2 ++
 5 files changed, 110 insertions(+), 24 deletions(-)

diff --git a/src/testdir/test86.in b/src/testdir/test86.in
index 395ba96c47..93eb400853 100644
--- a/src/testdir/test86.in
+++ b/src/testdir/test86.in
@@ -176,28 +176,62 @@ STARTTEST
 :else
 :   $put ='[0.0, 0.0]'
 :endif
+:let messages=[]
+:py <<EOF
+d=vim.bindeval('{}')
+m=vim.bindeval('messages')
+try:
+    d['abc']
+except Exception as e:
+    m.extend([e.__class__.__name__])
+
+try:
+    d['abc']="\0"
+except Exception as e:
+    m.extend([e.__class__.__name__])
+
+try:
+    d['abc']=vim
+except Exception as e:
+    m.extend([e.__class__.__name__])
+
+try:
+    d['']=1
+except Exception as e:
+    m.extend([e.__class__.__name__])
+
+try:
+    d['a\0b']=1
+except Exception as e:
+    m.extend([e.__class__.__name__])
+
+try:
+    d[b'a\0b']=1
+except Exception as e:
+    m.extend([e.__class__.__name__])
+EOF
+:$put =messages
 :"
 :" pyeval()
 :let l=pyeval('range(3)')
 :$put =string(l)
 :let d=pyeval('{"a": "b", "c": 1, "d": ["e"]}')
 :$put =sort(items(d))
-:try
-:   let undef=pyeval('undefined_name')
-:catch
-:   $put =v:exception[:13]
-:endtry
-:try
-:   let vim=pyeval('vim')
-:catch
-:   $put =v:exception[:13]
-:endtry
 :if has('float')
 :   let f=pyeval('0.0')
 :   $put =string(f)
 :else
 :   $put ='0.0'
 :endif
+:" Invalid values:
+:for e in ['"\0"', '{"\0": 1}', 'undefined_name', 'vim']
+:   try
+:      let v=pyeval(e)
+:   catch
+:      let toput=e.":\t".v:exception[:13]
+:      $put =toput
+:   endtry
+:endfor
 :endfun
 :"
 :call Test()
diff --git a/src/testdir/test86.ok b/src/testdir/test86.ok
index ebf9f88b0b..94f36e9703 100644
--- a/src/testdir/test86.ok
+++ b/src/testdir/test86.ok
@@ -38,10 +38,18 @@ Vim(put):E684:
 Vim(python):E725:
 Vim(python):E117:
 [0.0, 0.0]
+IndexError
+TypeError
+TypeError
+ValueError
+TypeError
+TypeError
 [0, 1, 2]
 ['a', 'b']
 ['c', 1]
 ['d', ['e']]
-Vim(let):E858:
-Vim(let):E859:
 0.0
+"\0":	Vim(let):E859:
+{"\0": 1}:	Vim(let):E859:
+undefined_name:	Vim(let):E858:
+vim:	Vim(let):E859:
diff --git a/src/testdir/test87.in b/src/testdir/test87.in
index 8e48605bed..312763c806 100644
--- a/src/testdir/test87.in
+++ b/src/testdir/test87.in
@@ -176,28 +176,62 @@ STARTTEST
 :else
 :   $put ='[0.0, 0.0]'
 :endif
+:let messages=[]
+:py3 <<EOF
+d=vim.bindeval('{}')
+m=vim.bindeval('messages')
+try:
+    d['abc']
+except Exception as e:
+    m.extend([e.__class__.__name__])
+
+try:
+    d['abc']="\0"
+except Exception as e:
+    m.extend([e.__class__.__name__])
+
+try:
+    d['abc']=vim
+except Exception as e:
+    m.extend([e.__class__.__name__])
+
+try:
+    d['']=1
+except Exception as e:
+    m.extend([e.__class__.__name__])
+
+try:
+    d['a\0b']=1
+except Exception as e:
+    m.extend([e.__class__.__name__])
+
+try:
+    d[b'a\0b']=1
+except Exception as e:
+    m.extend([e.__class__.__name__])
+EOF
+:$put =messages
 :"
 :" py3eval()
 :let l=py3eval('[0, 1, 2]')
 :$put =string(l)
 :let d=py3eval('{"a": "b", "c": 1, "d": ["e"]}')
 :$put =sort(items(d))
-:try
-:   let undef=py3eval('undefined_name')
-:catch
-:   $put =v:exception[:13]
-:endtry
-:try
-:   let vim=py3eval('vim')
-:catch
-:   $put =v:exception[:13]
-:endtry
 :if has('float')
 :   let f=py3eval('0.0')
 :   $put =string(f)
 :else
 :   $put ='0.0'
 :endif
+:" Invalid values:
+:for e in ['"\0"', '{"\0": 1}', 'undefined_name', 'vim']
+:   try
+:      let v=py3eval(e)
+:   catch
+:      let toput=e.":\t".v:exception[:13]
+:      $put =toput
+:   endtry
+:endfor
 :endfun
 :"
 :call Test()
diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok
index bcc4872bd7..4eab845302 100644
--- a/src/testdir/test87.ok
+++ b/src/testdir/test87.ok
@@ -38,10 +38,18 @@ Vim(put):E684:
 Vim(py3):E725:
 Vim(py3):E117:
 [0.0, 0.0]
+IndexError
+TypeError
+TypeError
+ValueError
+TypeError
+TypeError
 [0, 1, 2]
 ['a', 'b']
 ['c', 1]
 ['d', ['e']]
-Vim(let):E860:
-Vim(let):E861:
 0.0
+"\0":	Vim(let):E861:
+{"\0": 1}:	Vim(let):E861:
+undefined_name:	Vim(let):E860:
+vim:	Vim(let):E861:
diff --git a/src/version.c b/src/version.c
index 62bc81957f..06afdf2cc5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    659,
 /**/
     658,
 /**/

From 7f97fb3b0dcd1fd2d014af3c53d1cbdbba412fd7 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 5 Sep 2012 19:17:42 +0200
Subject: [PATCH 026/136] Added tag v7-3-659 for changeset e75da4a3225d

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d644424f20..03b08530d7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1995,3 +1995,4 @@ fd0c7452fa51118d8f6557b34b4cc96e830ef6c7 v7-3-653
 a2f61b2b8e770bb8d233ce50c8c7508508578a8b v7-3-656
 3958b0e672d676a310d756bff1b9c629a7b0142f v7-3-657
 15cdcb8ddcfb848c929cc37e239d5da8fe48a8d9 v7-3-658
+e75da4a3225d48e59ee321411134cf9999348b7d v7-3-659

From 6517945b46bc36290b405b9f416e058555ad3e57 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Sep 2012 18:19:46 +0200
Subject: [PATCH 027/136] updated for version 7.3.660 Problem:    ":help !"
 jumps to help for ":!". Solution:   Adjust check for tag header line. (Andy
 Wokula)

---
 src/tag.c     | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/tag.c b/src/tag.c
index 4f2426b90c..34e9c4ff27 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1797,7 +1797,7 @@ line_read_in:
 	     */
 	    if (state == TS_START)
 	    {
-		if (STRNCMP(lbuf, "!_TAG_", 6) <= 0)
+		if (STRNCMP(lbuf, "!_TAG_", 6) == 0)
 		{
 		    /*
 		     * Read header line.
diff --git a/src/version.c b/src/version.c
index 06afdf2cc5..3851b3f889 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    660,
 /**/
     659,
 /**/

From b0abec0519a7218113d14a3629ea0e0fa5b2ec3b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Sep 2012 18:19:46 +0200
Subject: [PATCH 028/136] Added tag v7-3-660 for changeset 8fdadfccd184

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 03b08530d7..d887a90ad6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1996,3 +1996,4 @@ a2f61b2b8e770bb8d233ce50c8c7508508578a8b v7-3-656
 3958b0e672d676a310d756bff1b9c629a7b0142f v7-3-657
 15cdcb8ddcfb848c929cc37e239d5da8fe48a8d9 v7-3-658
 e75da4a3225d48e59ee321411134cf9999348b7d v7-3-659
+8fdadfccd184b7de73811a3a18dc8815b7eb3434 v7-3-660

From b9b0f25c07782eff7549df6bc9982d7694d2de2b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Sep 2012 20:21:43 +0200
Subject: [PATCH 029/136] updated for version 7.3.661 Problem:    SEGV in
 Python code. Solution:   Initialize len to zero.  Use the right function
 depending on 	    version. (Maxim Philippov)

---
 src/if_py_both.h |  2 +-
 src/if_python.c  | 14 +++++++++++---
 src/if_python3.c | 13 ++++++++++---
 src/version.c    |  2 ++
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/if_py_both.h b/src/if_py_both.h
index 0031003eda..5e12638f5e 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -74,7 +74,7 @@ static struct PyMethodDef OutputMethods[] = {
     static PyObject *
 OutputWrite(PyObject *self, PyObject *args)
 {
-    Py_ssize_t len;
+    Py_ssize_t len = 0;
     char *str = NULL;
     int error = ((OutputObject *)(self))->error;
 
diff --git a/src/if_python.c b/src/if_python.c
index 385905e24f..a20aba0f32 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -44,8 +44,6 @@
 # undef _XOPEN_SOURCE	/* pyconfig.h defines it as well. */
 #endif
 
-#define PY_SSIZE_T_CLEAN
-
 #include <Python.h>
 #if defined(MACOS) && !defined(MACOS_X_UNIX)
 # include "macglue.h"
@@ -54,6 +52,10 @@
 #undef main /* Defined in python.h - aargh */
 #undef HAVE_FCNTL_H /* Clash with os_win32.h */
 
+#if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02050000
+# define PY_SSIZE_T_CLEAN
+#endif
+
 static void init_structs(void);
 
 #define PyBytes_FromString PyString_FromString
@@ -358,8 +360,15 @@ static struct
     PYTHON_PROC *ptr;
 } python_funcname_table[] =
 {
+#ifndef PY_SSIZE_T_CLEAN
     {"PyArg_Parse", (PYTHON_PROC*)&dll_PyArg_Parse},
     {"PyArg_ParseTuple", (PYTHON_PROC*)&dll_PyArg_ParseTuple},
+    {"Py_BuildValue", (PYTHON_PROC*)&dll_Py_BuildValue},
+#else
+    {"_PyArg_Parse_SizeT", (PYTHON_PROC*)&dll_PyArg_Parse},
+    {"_PyArg_ParseTuple_SizeT", (PYTHON_PROC*)&dll_PyArg_ParseTuple},
+    {"_Py_BuildValue_SizeT", (PYTHON_PROC*)&dll_Py_BuildValue},
+#endif
     {"PyMem_Free", (PYTHON_PROC*)&dll_PyMem_Free},
     {"PyMem_Malloc", (PYTHON_PROC*)&dll_PyMem_Malloc},
     {"PyDict_SetItemString", (PYTHON_PROC*)&dll_PyDict_SetItemString},
@@ -422,7 +431,6 @@ static struct
     {"PySys_SetArgv", (PYTHON_PROC*)&dll_PySys_SetArgv},
     {"PyType_Type", (PYTHON_PROC*)&dll_PyType_Type},
     {"PyType_Ready", (PYTHON_PROC*)&dll_PyType_Ready},
-    {"Py_BuildValue", (PYTHON_PROC*)&dll_Py_BuildValue},
     {"Py_FindMethod", (PYTHON_PROC*)&dll_Py_FindMethod},
 # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02050000 \
 	&& SIZEOF_SIZE_T != SIZEOF_INT
diff --git a/src/if_python3.c b/src/if_python3.c
index 0c10f8dbc7..43ed0e2a5f 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -42,8 +42,6 @@
 # undef _DEBUG
 #endif
 
-#define PY_SSIZE_T_CLEAN
-
 #ifdef F_BLANK
 # undef F_BLANK
 #endif
@@ -66,6 +64,10 @@
 #undef main /* Defined in python.h - aargh */
 #undef HAVE_FCNTL_H /* Clash with os_win32.h */
 
+#if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02050000
+# define PY_SSIZE_T_CLEAN
+#endif
+
 static void init_structs(void);
 
 /* The "surrogateescape" error handler is new in Python 3.1 */
@@ -328,7 +330,13 @@ static struct
     {"PySys_SetArgv", (PYTHON_PROC*)&py3_PySys_SetArgv},
     {"Py_SetPythonHome", (PYTHON_PROC*)&py3_Py_SetPythonHome},
     {"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize},
+#ifndef PY_SSIZE_T_CLEAN
     {"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
+    {"Py_BuildValue", (PYTHON_PROC*)&py3_Py_BuildValue},
+#else
+    {"_PyArg_ParseTuple_SizeT", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
+    {"_Py_BuildValue_SizeT", (PYTHON_PROC*)&py3_Py_BuildValue},
+#endif
     {"PyMem_Free", (PYTHON_PROC*)&py3_PyMem_Free},
     {"PyMem_Malloc", (PYTHON_PROC*)&py3_PyMem_Malloc},
     {"PyList_New", (PYTHON_PROC*)&py3_PyList_New},
@@ -364,7 +372,6 @@ static struct
     {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter},
     {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong},
     {"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New},
-    {"Py_BuildValue", (PYTHON_PROC*)&py3_Py_BuildValue},
     {"PyType_Ready", (PYTHON_PROC*)&py3_PyType_Ready},
     {"PyDict_SetItemString", (PYTHON_PROC*)&py3_PyDict_SetItemString},
     {"PyLong_AsLong", (PYTHON_PROC*)&py3_PyLong_AsLong},
diff --git a/src/version.c b/src/version.c
index 3851b3f889..4b13506475 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    661,
 /**/
     660,
 /**/

From 80aa5934378b46b47b3f29a7b8e83c152cc124dd Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Sep 2012 20:21:43 +0200
Subject: [PATCH 030/136] Added tag v7-3-661 for changeset 5e909c379a1e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d887a90ad6..f1923558c8 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1997,3 +1997,4 @@ a2f61b2b8e770bb8d233ce50c8c7508508578a8b v7-3-656
 15cdcb8ddcfb848c929cc37e239d5da8fe48a8d9 v7-3-658
 e75da4a3225d48e59ee321411134cf9999348b7d v7-3-659
 8fdadfccd184b7de73811a3a18dc8815b7eb3434 v7-3-660
+5e909c379a1e87491bfa95ba1a37b39d0725933b v7-3-661

From 88d5f3b3bb8505738f8a1dde0071d5e3aff45b25 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 18 Sep 2012 16:36:32 +0200
Subject: [PATCH 031/136] updated for version 7.3.662 Problem:    Can't build
 Ruby interface with Ruby 1.9.3. Solution:   Add missing functions. (V.
 Ondruch)

---
 .hgignore     |  2 ++
 src/if_ruby.c | 10 +++++++++-
 src/version.c |  2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.hgignore b/.hgignore
index 0451da43ed..6ca02cb6a5 100644
--- a/.hgignore
+++ b/.hgignore
@@ -33,6 +33,7 @@ src/auto/pathdef.c
 *.res
 *.RES
 src/pathdef.c
+src/perl.c
 src/Obj*/pathdef.c
 gvimext.dll
 gvimext.lib
@@ -43,6 +44,7 @@ gvimext.lib
 *.mo
 *.swp
 *~
+src/po/vim.pot
 
 # Generated by "make test"
 src/po/*.ck 
diff --git a/src/if_ruby.c b/src/if_ruby.c
index ab4ac69972..dd1ba47009 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -178,6 +178,9 @@ static void ruby_vim_init(void);
 #define rb_hash_new			dll_rb_hash_new
 #define rb_inspect			dll_rb_inspect
 #define rb_int2inum			dll_rb_int2inum
+#define rb_fix2int			dll_rb_fix2int
+#define rb_num2int			dll_rb_num2int
+#define rb_num2uint			dll_rb_num2uint
 #define rb_lastline_get			dll_rb_lastline_get
 #define rb_lastline_set			dll_rb_lastline_set
 #define rb_load_protect			dll_rb_load_protect
@@ -268,7 +271,9 @@ static VALUE (*dll_rb_hash_aset) (VALUE, VALUE, VALUE);
 static VALUE (*dll_rb_hash_new) (void);
 static VALUE (*dll_rb_inspect) (VALUE);
 static VALUE (*dll_rb_int2inum) (long);
-static VALUE (*dll_rb_int2inum) (long);
+static long (*dll_rb_fix2int) (VALUE);
+static long (*dll_rb_num2int) (VALUE);
+static unsigned long (*dll_rb_num2uint) (VALUE);
 static VALUE (*dll_rb_lastline_get) (void);
 static void (*dll_rb_lastline_set) (VALUE);
 static void (*dll_rb_load_protect) (VALUE, int, int*);
@@ -377,6 +382,9 @@ static struct
     {"rb_hash_new", (RUBY_PROC*)&dll_rb_hash_new},
     {"rb_inspect", (RUBY_PROC*)&dll_rb_inspect},
     {"rb_int2inum", (RUBY_PROC*)&dll_rb_int2inum},
+    {"rb_fix2int", (RUBY_PROC*)&dll_rb_fix2int},
+    {"rb_num2int", (RUBY_PROC*)&dll_rb_num2int},
+    {"rb_num2uint", (RUBY_PROC*)&dll_rb_num2uint},
     {"rb_lastline_get", (RUBY_PROC*)&dll_rb_lastline_get},
     {"rb_lastline_set", (RUBY_PROC*)&dll_rb_lastline_set},
     {"rb_load_protect", (RUBY_PROC*)&dll_rb_load_protect},
diff --git a/src/version.c b/src/version.c
index 4b13506475..a6e3ec38ce 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    662,
 /**/
     661,
 /**/

From f410d4d8d4491b99d14f6d8c0c72a07d6fb703bf Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 18 Sep 2012 16:36:32 +0200
Subject: [PATCH 032/136] Added tag v7-3-662 for changeset 87afa95a2992

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f1923558c8..f562645d66 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1998,3 +1998,4 @@ a2f61b2b8e770bb8d233ce50c8c7508508578a8b v7-3-656
 e75da4a3225d48e59ee321411134cf9999348b7d v7-3-659
 8fdadfccd184b7de73811a3a18dc8815b7eb3434 v7-3-660
 5e909c379a1e87491bfa95ba1a37b39d0725933b v7-3-661
+87afa95a2992a31b1937def0e1db4a193b0ab32f v7-3-662

From 404f0c6aa53bf5dc6ae626cc95ae236de8d2b0a4 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 18 Sep 2012 16:47:07 +0200
Subject: [PATCH 033/136] updated for version 7.3.663 Problem:    End of color
 scheme name not clear in E185. (Aaron Lewis) Solution:   Put the name in
 single quotes.

---
 src/ex_docmd.c | 2 +-
 src/version.c  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 2257c551ca..ebc8b98d11 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -6466,7 +6466,7 @@ ex_colorscheme(eap)
 #endif
     }
     else if (load_colors(eap->arg) == FAIL)
-	EMSG2(_("E185: Cannot find color scheme %s"), eap->arg);
+	EMSG2(_("E185: Cannot find color scheme '%s'"), eap->arg);
 }
 
     static void
diff --git a/src/version.c b/src/version.c
index a6e3ec38ce..43d11611bd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    663,
 /**/
     662,
 /**/

From 0f1ec6285e0174dfe9a83afd30204491dd2aab6e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 18 Sep 2012 16:47:07 +0200
Subject: [PATCH 034/136] Added tag v7-3-663 for changeset 2a200527131f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f562645d66..b8d2d15c67 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1999,3 +1999,4 @@ e75da4a3225d48e59ee321411134cf9999348b7d v7-3-659
 8fdadfccd184b7de73811a3a18dc8815b7eb3434 v7-3-660
 5e909c379a1e87491bfa95ba1a37b39d0725933b v7-3-661
 87afa95a2992a31b1937def0e1db4a193b0ab32f v7-3-662
+2a200527131fac8f50487790ec201badbccdaf0e v7-3-663

From d40b6dc0418aeec5082c38154e9778a20d569172 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 18 Sep 2012 18:03:37 +0200
Subject: [PATCH 035/136] updated for version 7.3.664 Problem:    Buffer
 overflow in unescaping text. (Raymond Ko) Solution:   Limit check for
 multi-byte character to 4 bytes.

---
 src/mbyte.c   | 14 ++++++++++----
 src/version.c |  2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/mbyte.c b/src/mbyte.c
index ca3204f214..33e894e88c 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -3793,13 +3793,15 @@ mb_charlen_len(str, len)
 mb_unescape(pp)
     char_u **pp;
 {
-    static char_u	buf[MB_MAXBYTES + 1];
-    int			n, m = 0;
+    static char_u	buf[6];
+    int			n;
+    int			m = 0;
     char_u		*str = *pp;
 
     /* Must translate K_SPECIAL KS_SPECIAL KE_FILLER to K_SPECIAL and CSI
-     * KS_EXTRA KE_CSI to CSI. */
-    for (n = 0; str[n] != NUL && m <= MB_MAXBYTES; ++n)
+     * KS_EXTRA KE_CSI to CSI.
+     * Maximum length of a utf-8 character is 4 bytes. */
+    for (n = 0; str[n] != NUL && m < 4; ++n)
     {
 	if (str[n] == K_SPECIAL
 		&& str[n + 1] == KS_SPECIAL
@@ -3836,6 +3838,10 @@ mb_unescape(pp)
 	    *pp = str + n + 1;
 	    return buf;
 	}
+
+	/* Bail out quickly for ASCII. */
+	if (buf[0] < 128)
+	    break;
     }
     return NULL;
 }
diff --git a/src/version.c b/src/version.c
index 43d11611bd..d8ada6990e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    664,
 /**/
     663,
 /**/

From 2d2a62e9693e0ecfa9240ee73311ca15d2953337 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 18 Sep 2012 18:03:37 +0200
Subject: [PATCH 036/136] Added tag v7-3-664 for changeset f86619764a1e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b8d2d15c67..3dbb27aee2 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2000,3 +2000,4 @@ e75da4a3225d48e59ee321411134cf9999348b7d v7-3-659
 5e909c379a1e87491bfa95ba1a37b39d0725933b v7-3-661
 87afa95a2992a31b1937def0e1db4a193b0ab32f v7-3-662
 2a200527131fac8f50487790ec201badbccdaf0e v7-3-663
+f86619764a1e0338ef9e14c653a5909847304b8b v7-3-664

From b0407a2775c9c89e372cf0f66fa6260b1f8d7262 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 18 Sep 2012 18:27:12 +0200
Subject: [PATCH 037/136] updated for version 7.3.665 Problem:    MSVC 11 is
 not supported. Solution:   Recognize MSVC 11. (Raymond Ko)

---
 src/Make_mvc.mak | 7 +++++--
 src/version.c    | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 20b306d19c..afc3994750 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -395,6 +395,9 @@ MSVCVER = 10.0
 !if "$(_NMAKE_VER)" == "10.00.30319.01"
 MSVCVER = 10.0
 !endif
+!if "$(_NMAKE_VER)" == "11.00.50727.1"
+MSVCVER = 11.0
+!endif
 !endif
 
 # Abort bulding VIM if version of VC is unrecognised.
@@ -409,7 +412,7 @@ MSVCVER = 10.0
 !endif
 
 # Convert processor ID to MVC-compatible number
-!if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0")
+!if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0") && ("$(MSVCVER)" != "10.0") && ("$(MSVCVER)" != "11.0")
 !if "$(CPUNR)" == "i386"
 CPUARG = /G3
 !elseif "$(CPUNR)" == "i486"
@@ -443,7 +446,7 @@ OPTFLAG = /O2
 OPTFLAG = /Ox
 !endif
 
-!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
+!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0")
 # Use link time code generation if not worried about size
 !if "$(OPTIMIZE)" != "SPACE"
 OPTFLAG = $(OPTFLAG) /GL
diff --git a/src/version.c b/src/version.c
index d8ada6990e..0452d92bbc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    665,
 /**/
     664,
 /**/

From 109a341dcda27d8cfa67237c0b8e6efd9d8a57f7 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 18 Sep 2012 18:27:12 +0200
Subject: [PATCH 038/136] Added tag v7-3-665 for changeset 35939e1e25ff

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 3dbb27aee2..f03e3f594b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2001,3 +2001,4 @@ e75da4a3225d48e59ee321411134cf9999348b7d v7-3-659
 87afa95a2992a31b1937def0e1db4a193b0ab32f v7-3-662
 2a200527131fac8f50487790ec201badbccdaf0e v7-3-663
 f86619764a1e0338ef9e14c653a5909847304b8b v7-3-664
+35939e1e25ff5a3862b83248f8039971c81936d0 v7-3-665

From 99470dd07097538950606e211b1f22ba2a503c55 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 18 Sep 2012 22:00:08 +0200
Subject: [PATCH 039/136] updated for version 7.3.666 Problem:    With MSVC 11
 Win32.mak is not found. Solution:   Add the SDK_INCLUDE_DIR variable.
 (Raymond Ko)

---
 src/Make_mvc.mak | 12 ++++++++++--
 src/version.c    |  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index afc3994750..357b677f0e 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1,7 +1,7 @@
 # Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
 # and Win64, using the Microsoft Visual C++ compilers. Known to work with
 # VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
-# VC9 (VS2008), and VC10 (VS2010).
+# VC9 (VS2008), VC10 (VS2010) and VC11 (VS2012)
 #
 # To build using other Windows compilers, see INSTALLpc.txt
 #
@@ -15,6 +15,9 @@
 # This will build the console version of Vim with no additional interfaces.
 # To add features, define any of the following:
 #
+# 	For MSVC 11 you need to specify where the Win32.mak file is, e.g.:
+# 	   SDK_INCLUDE_DIR="C:\Program Files\Microsoft SDKs\Windows\v7.1\Include"
+#
 #	!!!!  After changing features do "nmake clean" first  !!!!
 #
 #       Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is BIG)
@@ -227,7 +230,12 @@ MAKEFLAGS_GVIMEXT = DEBUG=yes
 
 # Get all sorts of useful, standard macros from the Platform SDK.
 
+!ifdef SDK_INCLUDE_DIR
+!include $(SDK_INCLUDE_DIR)\Win32.mak
+!else
 !include <Win32.mak>
+!endif
+
 
 # Flag to turn on Win64 compatibility warnings for VC7.x and VC8.
 WP64CHECK = /Wp64
@@ -911,7 +919,7 @@ LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB)  user32.lib $(SNIFF_LIB) \
 
 # Report link time code generation progress if used. 
 !ifdef NODEBUG
-!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0")
+!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0") || ("$(MSVCVER)" == "10.0") || ("$(MSVCVER)" == "11.0")
 !if "$(OPTIMIZE)" != "SPACE"
 LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
 !endif
diff --git a/src/version.c b/src/version.c
index 0452d92bbc..95404c4519 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    666,
 /**/
     665,
 /**/

From 58a38e76a8e415c13578df49fc08f6bdaacabda7 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 18 Sep 2012 22:00:08 +0200
Subject: [PATCH 040/136] Added tag v7-3-666 for changeset 1e22adc6176e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f03e3f594b..6c67aaa372 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2002,3 +2002,4 @@ e75da4a3225d48e59ee321411134cf9999348b7d v7-3-659
 2a200527131fac8f50487790ec201badbccdaf0e v7-3-663
 f86619764a1e0338ef9e14c653a5909847304b8b v7-3-664
 35939e1e25ff5a3862b83248f8039971c81936d0 v7-3-665
+1e22adc6176ec07f52102f383a9c3c414d43f9c2 v7-3-666

From a1a8054cd6c98268e3955959c41c4b03728d2c84 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 21 Sep 2012 12:42:44 +0200
Subject: [PATCH 041/136] updated for version 7.3.667 Problem:    Unused
 variables in Perl interface. Solution:   Adjust #ifdefs.

---
 .hgignore      |  2 +-
 src/if_perl.xs | 10 ++++++++--
 src/version.c  |  2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.hgignore b/.hgignore
index 6ca02cb6a5..1d089e292a 100644
--- a/.hgignore
+++ b/.hgignore
@@ -32,8 +32,8 @@ src/auto/pathdef.c
 *.suo
 *.res
 *.RES
+src/if_perl.c
 src/pathdef.c
-src/perl.c
 src/Obj*/pathdef.c
 gvimext.dll
 gvimext.lib
diff --git a/src/if_perl.xs b/src/if_perl.xs
index 4dc80beaa5..56e0eb3a1a 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -315,6 +315,9 @@ static STRLEN* (*Perl_Tna_ptr)(register PerlInterpreter*);
 static void (*Perl_sv_free2)(pTHX_ SV*);
 static void (*Perl_sys_init)(int* argc, char*** argv);
 static void (*Perl_sys_term)(void);
+static void (*Perl_call_list)(pTHX_ I32, AV*);
+# if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
+# else
 static SV** (*Perl_ISv_ptr)(register PerlInterpreter*);
 static SV*** (*Perl_Istack_max_ptr)(register PerlInterpreter*);
 static SV*** (*Perl_Istack_base_ptr)(register PerlInterpreter*);
@@ -326,16 +329,19 @@ static I32** (*Perl_Imarkstack_ptr_ptr)(register PerlInterpreter*);
 static I32** (*Perl_Imarkstack_max_ptr)(register PerlInterpreter*);
 static SV*** (*Perl_Istack_sp_ptr)(register PerlInterpreter*);
 static OP** (*Perl_Iop_ptr)(register PerlInterpreter*);
-static void (*Perl_call_list)(pTHX_ I32, AV*);
 static I32* (*Perl_Iscopestack_ix_ptr)(register PerlInterpreter*);
 static AV** (*Perl_Iunitcheckav_ptr)(register PerlInterpreter*);
+# endif
 #endif
 
+#if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
+#else
 static GV** (*Perl_Idefgv_ptr)(register PerlInterpreter*);
 static GV** (*Perl_Ierrgv_ptr)(register PerlInterpreter*);
 static SV* (*Perl_Isv_yes_ptr)(register PerlInterpreter*);
-static void (*boot_DynaLoader)_((pTHX_ CV*));
 static perl_key* (*Perl_Gthr_key_ptr)_((pTHX));
+#endif
+static void (*boot_DynaLoader)_((pTHX_ CV*));
 
 /*
  * Table of name to function pointer of perl.
diff --git a/src/version.c b/src/version.c
index 95404c4519..4c93e3a398 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    667,
 /**/
     666,
 /**/

From 603841e80c7048a97b6b7dab21a7aa3053f34dd4 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 21 Sep 2012 12:42:44 +0200
Subject: [PATCH 042/136] Added tag v7-3-667 for changeset cd36c0fed43e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 6c67aaa372..d9cab3fd93 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2003,3 +2003,4 @@ e75da4a3225d48e59ee321411134cf9999348b7d v7-3-659
 f86619764a1e0338ef9e14c653a5909847304b8b v7-3-664
 35939e1e25ff5a3862b83248f8039971c81936d0 v7-3-665
 1e22adc6176ec07f52102f383a9c3c414d43f9c2 v7-3-666
+cd36c0fed43e63a94d6e87b5c5c0b4d95628da27 v7-3-667

From f2f35ba4fd1bf82c404c1f0b51f2a87ffe57afc9 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 21 Sep 2012 12:50:51 +0200
Subject: [PATCH 043/136] updated for version 7.3.668 Problem:    Building with
 Perl loaded dynamically  still uses static library. Solution:   Adjust use of
 PL_thr_key. (Ken Takata)

---
 src/if_perl.xs | 7 ++++++-
 src/version.c  | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/if_perl.xs b/src/if_perl.xs
index 56e0eb3a1a..f0baabff63 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -155,7 +155,7 @@ typedef int perl_key;
 # define Perl_set_context dll_Perl_set_context
 # if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
 # define Perl_sv_2bool_flags dll_Perl_sv_2bool_flags
-# define Perl_xs_apiversion_bootcheck dll_Perl_xs_apiversion_bootcheck 
+# define Perl_xs_apiversion_bootcheck dll_Perl_xs_apiversion_bootcheck
 # else
 # define Perl_sv_2bool dll_Perl_sv_2bool
 # endif
@@ -225,6 +225,9 @@ typedef int perl_key;
 # define Perl_call_list dll_Perl_call_list
 # define Perl_Iscopestack_ix_ptr dll_Perl_Iscopestack_ix_ptr
 # define Perl_Iunitcheckav_ptr dll_Perl_Iunitcheckav_ptr
+# if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
+#  define PL_thr_key *dll_PL_thr_key
+# endif
 
 /*
  * Declare HANDLE for perl.dll and function pointers.
@@ -335,6 +338,7 @@ static AV** (*Perl_Iunitcheckav_ptr)(register PerlInterpreter*);
 #endif
 
 #if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
+static perl_key* dll_PL_thr_key;
 #else
 static GV** (*Perl_Idefgv_ptr)(register PerlInterpreter*);
 static GV** (*Perl_Ierrgv_ptr)(register PerlInterpreter*);
@@ -453,6 +457,7 @@ static struct {
 # endif
 #endif
 #if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
+    {"PL_thr_key", (PERL_PROC*)&dll_PL_thr_key},
 #else
     {"Perl_Idefgv_ptr", (PERL_PROC*)&Perl_Idefgv_ptr},
     {"Perl_Ierrgv_ptr", (PERL_PROC*)&Perl_Ierrgv_ptr},
diff --git a/src/version.c b/src/version.c
index 4c93e3a398..61e9c0bb1a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    668,
 /**/
     667,
 /**/

From 4a70c1de40cd0f02f78bf938af42e0980f607afe Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 21 Sep 2012 12:50:51 +0200
Subject: [PATCH 044/136] Added tag v7-3-668 for changeset dde6d0216a08

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d9cab3fd93..d7026ec0b7 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2004,3 +2004,4 @@ f86619764a1e0338ef9e14c653a5909847304b8b v7-3-664
 35939e1e25ff5a3862b83248f8039971c81936d0 v7-3-665
 1e22adc6176ec07f52102f383a9c3c414d43f9c2 v7-3-666
 cd36c0fed43e63a94d6e87b5c5c0b4d95628da27 v7-3-667
+dde6d0216a08a5554f3c351e519134c386d14232 v7-3-668

From 40645d72b2ff7f7346f88cb7fc65509391babe5a Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 21 Sep 2012 13:26:49 +0200
Subject: [PATCH 045/136] updated for version 7.3.669 Problem:    When building
 with Cygwin loading Python dynamically fails. Solution:   Use DLLLIBRARY
 instead of INSTSONAME. (Ken Takata)

---
 src/auto/configure | 8 ++++++++
 src/configure.in   | 8 ++++++++
 src/version.c      | 2 ++
 3 files changed, 18 insertions(+)

diff --git a/src/auto/configure b/src/auto/configure
index bc46074392..d0c935867b 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5330,6 +5330,7 @@ __:
 	@echo "python_LIBS='$(LIBS)'"
 	@echo "python_SYSLIBS='$(SYSLIBS)'"
 	@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
+	@echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
 	@echo "python_INSTSONAME='$(INSTSONAME)'"
 eof
 	    	    eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
@@ -5350,6 +5351,9 @@ eof
 fi
 
 
+	if test "X$python_DLLLIBRARY" != "X"; then
+	  python_INSTSONAME="$python_DLLLIBRARY"
+	fi
 	PYTHON_LIBS="${vi_cv_path_python_plibs}"
 	if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
 	  PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
@@ -5633,6 +5637,7 @@ __:
 	@echo "python3_BASEMODLIBS='$(BASEMODLIBS)'"
 	@echo "python3_LIBS='$(LIBS)'"
 	@echo "python3_SYSLIBS='$(SYSLIBS)'"
+	@echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
 	@echo "python3_INSTSONAME='$(INSTSONAME)'"
 eof
                     eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
@@ -5645,6 +5650,9 @@ eof
 fi
 
 
+      if test "X$python3_DLLLIBRARY" != "X"; then
+	python3_INSTSONAME="$python3_DLLLIBRARY"
+      fi
       PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
       if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
diff --git a/src/configure.in b/src/configure.in
index 2ff0f90a1a..5c14fc0c5c 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -889,6 +889,7 @@ __:
 	@echo "python_LIBS='$(LIBS)'"
 	@echo "python_SYSLIBS='$(SYSLIBS)'"
 	@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
+	@echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
 	@echo "python_INSTSONAME='$(INSTSONAME)'"
 eof
 	    dnl -- delete the lines from make about Entering/Leaving directory
@@ -909,6 +910,9 @@ eof
 	    fi
 	])
 
+	if test "X$python_DLLLIBRARY" != "X"; then
+	  python_INSTSONAME="$python_DLLLIBRARY"
+	fi
 	PYTHON_LIBS="${vi_cv_path_python_plibs}"
 	if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
 	  PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME=\\\"${vi_cv_path_python_pfx}\\\""
@@ -1082,6 +1086,7 @@ __:
 	@echo "python3_BASEMODLIBS='$(BASEMODLIBS)'"
 	@echo "python3_LIBS='$(LIBS)'"
 	@echo "python3_SYSLIBS='$(SYSLIBS)'"
+	@echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
 	@echo "python3_INSTSONAME='$(INSTSONAME)'"
 eof
           dnl -- delete the lines from make about Entering/Leaving directory
@@ -1094,6 +1099,9 @@ eof
           vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
       ])
 
+      if test "X$python3_DLLLIBRARY" != "X"; then
+	python3_INSTSONAME="$python3_DLLLIBRARY"
+      fi
       PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
       if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
diff --git a/src/version.c b/src/version.c
index 61e9c0bb1a..6ac25907c2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    669,
 /**/
     668,
 /**/

From 3a2707bb5b2de827df60b44714ea3b84dbf72fb8 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 21 Sep 2012 13:26:49 +0200
Subject: [PATCH 046/136] Added tag v7-3-669 for changeset 2b3b7b483708

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index d7026ec0b7..b8cdce3971 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2005,3 +2005,4 @@ f86619764a1e0338ef9e14c653a5909847304b8b v7-3-664
 1e22adc6176ec07f52102f383a9c3c414d43f9c2 v7-3-666
 cd36c0fed43e63a94d6e87b5c5c0b4d95628da27 v7-3-667
 dde6d0216a08a5554f3c351e519134c386d14232 v7-3-668
+2b3b7b48370848149c8b831b2b7aee9b7f4f88bb v7-3-669

From 40376d61ffbb29f0f83fd83fed2d5215e7845a2c Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 21 Sep 2012 13:43:14 +0200
Subject: [PATCH 047/136] updated for version 7.3.670 Problem:    Python:
 memory leaks when there are exceptions. Solution:   Add DICTKEY_UNREF in the
 right places. (ZyX)

---
 src/if_py_both.h | 6 ++++--
 src/version.c    | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/if_py_both.h b/src/if_py_both.h
index 5e12638f5e..c8a7fca7f8 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -799,14 +799,14 @@ DictionaryItem(PyObject *self, PyObject *keyObject)
 
     di = dict_find(((DictionaryObject *) (self))->dict, key, -1);
 
+    DICTKEY_UNREF
+
     if (di == NULL)
     {
 	PyErr_SetString(PyExc_IndexError, _("no such key in dictionary"));
 	return NULL;
     }
 
-    DICTKEY_UNREF
-
     return ConvertToPyObject(&di->di_tv);
 }
 
@@ -835,6 +835,7 @@ DictionaryAssItem(PyObject *self, PyObject *keyObject, PyObject *valObject)
 
 	if (di == NULL)
 	{
+	    DICTKEY_UNREF
 	    PyErr_SetString(PyExc_IndexError, _("no such key in dictionary"));
 	    return -1;
 	}
@@ -859,6 +860,7 @@ DictionaryAssItem(PyObject *self, PyObject *keyObject, PyObject *valObject)
 
 	if (dict_add(d, di) == FAIL)
 	{
+	    DICTKEY_UNREF
 	    vim_free(di);
 	    PyErr_SetVim(_("failed to add key to dictionary"));
 	    return -1;
diff --git a/src/version.c b/src/version.c
index 6ac25907c2..4fb2743957 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    670,
 /**/
     669,
 /**/

From c1bda30587bd5f44fae0a83314177831f0641d84 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 21 Sep 2012 13:43:14 +0200
Subject: [PATCH 048/136] Added tag v7-3-670 for changeset 2bf8c00741f7

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b8cdce3971..27838a4db5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2006,3 +2006,4 @@ f86619764a1e0338ef9e14c653a5909847304b8b v7-3-664
 cd36c0fed43e63a94d6e87b5c5c0b4d95628da27 v7-3-667
 dde6d0216a08a5554f3c351e519134c386d14232 v7-3-668
 2b3b7b48370848149c8b831b2b7aee9b7f4f88bb v7-3-669
+2bf8c00741f7f07d9b58596764236a92eaeca862 v7-3-670

From 23eb14c8e3d5d8bec24b00a2a27b0d3e85e2182b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 21 Sep 2012 13:46:06 +0200
Subject: [PATCH 049/136] updated for version 7.3.671 Problem:    More Python
 code can be shared between Python 2 and 3. Solution:   Move code to
 if_py_both.h. (ZyX)

---
 src/if_py_both.h | 25 +++++++++++++++++++
 src/if_python.c  | 25 -------------------
 src/if_python3.c | 64 ++++++++++++++----------------------------------
 src/version.c    |  2 ++
 4 files changed, 45 insertions(+), 71 deletions(-)

diff --git a/src/if_py_both.h b/src/if_py_both.h
index c8a7fca7f8..0909981c22 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -71,6 +71,31 @@ static struct PyMethodDef OutputMethods[] = {
 /* Output buffer management
  */
 
+    static int
+OutputSetattr(PyObject *self, char *name, PyObject *val)
+{
+    if (val == NULL)
+    {
+	PyErr_SetString(PyExc_AttributeError, _("can't delete OutputObject attributes"));
+	return -1;
+    }
+
+    if (strcmp(name, "softspace") == 0)
+    {
+	if (!PyInt_Check(val))
+	{
+	    PyErr_SetString(PyExc_TypeError, _("softspace must be an integer"));
+	    return -1;
+	}
+
+	((OutputObject *)(self))->softspace = PyInt_AsLong(val);
+	return 0;
+    }
+
+    PyErr_SetString(PyExc_AttributeError, _("invalid attribute"));
+    return -1;
+}
+
     static PyObject *
 OutputWrite(PyObject *self, PyObject *args)
 {
diff --git a/src/if_python.c b/src/if_python.c
index a20aba0f32..3c72b260c2 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -951,31 +951,6 @@ OutputGetattr(PyObject *self, char *name)
     return Py_FindMethod(OutputMethods, self, name);
 }
 
-    static int
-OutputSetattr(PyObject *self, char *name, PyObject *val)
-{
-    if (val == NULL)
-    {
-	PyErr_SetString(PyExc_AttributeError, _("can't delete OutputObject attributes"));
-	return -1;
-    }
-
-    if (strcmp(name, "softspace") == 0)
-    {
-	if (!PyInt_Check(val))
-	{
-	    PyErr_SetString(PyExc_TypeError, _("softspace must be an integer"));
-	    return -1;
-	}
-
-	((OutputObject *)(self))->softspace = PyInt_AsLong(val);
-	return 0;
-    }
-
-    PyErr_SetString(PyExc_AttributeError, _("invalid attribute"));
-    return -1;
-}
-
 /***************/
 
     static int
diff --git a/src/if_python3.c b/src/if_python3.c
index 43ed0e2a5f..6dc75517c6 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -88,6 +88,9 @@ static void init_structs(void);
 #define PyString_Size(obj) PyBytes_GET_SIZE(bytes)
 #define PyString_FromString(repr) PyUnicode_FromString(repr)
 #define PyString_AsStringAndSize(obj, buffer, len) PyBytes_AsStringAndSize(obj, buffer, len)
+#define PyInt_Check(obj) PyLong_Check(obj)
+#define PyInt_FromLong(i) PyLong_FromLong(i)
+#define PyInt_AsLong(obj) PyLong_AsLong(obj)
 
 #if defined(DYNAMIC_PYTHON3) || defined(PROTO)
 
@@ -586,6 +589,11 @@ static int py3initialised = 0;
  */
 #include "if_py_both.h"
 
+#define GET_ATTR_STRING(name, nameobj) \
+    char	*name = ""; \
+    if(PyUnicode_Check(nameobj)) \
+        name = _PyUnicode_AsString(nameobj)
+
 #define PY3OBJ_DELETED(obj) (obj->ob_base.ob_refcnt<=0)
 
     static void
@@ -923,9 +931,7 @@ ex_py3file(exarg_T *eap)
     static PyObject *
 OutputGetattro(PyObject *self, PyObject *nameobj)
 {
-    char *name = "";
-    if (PyUnicode_Check(nameobj))
-	name = _PyUnicode_AsString(nameobj);
+    GET_ATTR_STRING(name, nameobj);
 
     if (strcmp(name, "softspace") == 0)
 	return PyLong_FromLong(((OutputObject *)(self))->softspace);
@@ -936,30 +942,9 @@ OutputGetattro(PyObject *self, PyObject *nameobj)
     static int
 OutputSetattro(PyObject *self, PyObject *nameobj, PyObject *val)
 {
-    char *name = "";
-    if (PyUnicode_Check(nameobj))
-	name = _PyUnicode_AsString(nameobj);
+    GET_ATTR_STRING(name, nameobj);
 
-    if (val == NULL)
-    {
-	PyErr_SetString(PyExc_AttributeError, _("can't delete OutputObject attributes"));
-	return -1;
-    }
-
-    if (strcmp(name, "softspace") == 0)
-    {
-	if (!PyLong_Check(val))
-	{
-	    PyErr_SetString(PyExc_TypeError, _("softspace must be an integer"));
-	    return -1;
-	}
-
-	((OutputObject *)(self))->softspace = PyLong_AsLong(val);
-	return 0;
-    }
-
-    PyErr_SetString(PyExc_AttributeError, _("invalid attribute"));
-    return -1;
+    return OutputSetattr(self, name, val);
 }
 
 /***************/
@@ -1091,9 +1076,7 @@ BufferGetattro(PyObject *self, PyObject*nameobj)
 {
     BufferObject *this = (BufferObject *)(self);
 
-    char *name = "";
-    if (PyUnicode_Check(nameobj))
-	name = _PyUnicode_AsString(nameobj);
+    GET_ATTR_STRING(name, nameobj);
 
     if (CheckBuffer(this))
 	return NULL;
@@ -1257,9 +1240,7 @@ RangeDestructor(PyObject *self)
     static PyObject *
 RangeGetattro(PyObject *self, PyObject *nameobj)
 {
-    char *name = "";
-    if (PyUnicode_Check(nameobj))
-	name = _PyUnicode_AsString(nameobj);
+    GET_ATTR_STRING(name, nameobj);
 
     if (strcmp(name, "start") == 0)
 	return Py_BuildValue("n", ((RangeObject *)(self))->start - 1);
@@ -1430,10 +1411,7 @@ WindowGetattro(PyObject *self, PyObject *nameobj)
 {
     WindowObject *this = (WindowObject *)(self);
 
-    char *name = "";
-    if (PyUnicode_Check(nameobj))
-	name = _PyUnicode_AsString(nameobj);
-
+    GET_ATTR_STRING(name, nameobj);
 
     if (CheckWindow(this))
 	return NULL;
@@ -1461,10 +1439,7 @@ WindowGetattro(PyObject *self, PyObject *nameobj)
     static int
 WindowSetattro(PyObject *self, PyObject *nameobj, PyObject *val)
 {
-    char *name = "";
-
-    if (PyUnicode_Check(nameobj))
-	name = _PyUnicode_AsString(nameobj);
+    GET_ATTR_STRING(name, nameobj);
 
     return WindowSetattr(self, name, val);
 }
@@ -1508,9 +1483,7 @@ static PyTypeObject CurrentType;
     static PyObject *
 CurrentGetattro(PyObject *self UNUSED, PyObject *nameobj)
 {
-    char *name = "";
-    if (PyUnicode_Check(nameobj))
-	name = _PyUnicode_AsString(nameobj);
+    GET_ATTR_STRING(name, nameobj);
 
     if (strcmp(name, "buffer") == 0)
 	return (PyObject *)BufferNew(curbuf);
@@ -1681,9 +1654,8 @@ FunctionDestructor(PyObject *self)
 FunctionGetattro(PyObject *self, PyObject *nameobj)
 {
     FunctionObject	*this = (FunctionObject *)(self);
-    char	*name = "";
-    if (PyUnicode_Check(nameobj))
-	name = _PyUnicode_AsString(nameobj);
+
+    GET_ATTR_STRING(name, nameobj);
 
     if (strcmp(name, "name") == 0)
 	return PyUnicode_FromString((char *)(this->name));
diff --git a/src/version.c b/src/version.c
index 4fb2743957..3e054b7c6a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    671,
 /**/
     670,
 /**/

From 48530684e0f0d72fee9d34d709cd608940722464 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 21 Sep 2012 13:46:06 +0200
Subject: [PATCH 050/136] Added tag v7-3-671 for changeset 530f5a903031

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 27838a4db5..5f77d03135 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2007,3 +2007,4 @@ cd36c0fed43e63a94d6e87b5c5c0b4d95628da27 v7-3-667
 dde6d0216a08a5554f3c351e519134c386d14232 v7-3-668
 2b3b7b48370848149c8b831b2b7aee9b7f4f88bb v7-3-669
 2bf8c00741f7f07d9b58596764236a92eaeca862 v7-3-670
+530f5a9030315f984e096794938c61f9d3562e22 v7-3-671

From 2f54401a8d5dd4837f60b53764b955b577f9b3bd Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 21 Sep 2012 14:00:35 +0200
Subject: [PATCH 051/136] updated for version 7.3.672 Problem:    Not possible
 to lock/unlock lists in Python interface. Solution:   Add .locked and .scope
 attributes. (ZyX)

---
 src/if_py_both.h      | 76 +++++++++++++++++++++++++++++++++++++++++++
 src/if_python.c       | 27 +++++++++++++--
 src/if_python3.c      | 70 +++++++++++++++++++++++++++++++++++++--
 src/testdir/test86.in | 36 ++++++++++++++++++++
 src/testdir/test86.ok | 10 ++++++
 src/testdir/test87.in | 35 ++++++++++++++++++++
 src/testdir/test87.ok | 10 ++++++
 src/version.c         |  2 ++
 8 files changed, 261 insertions(+), 5 deletions(-)

diff --git a/src/if_py_both.h b/src/if_py_both.h
index 0909981c22..0a1ef1b9e6 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -807,6 +807,44 @@ pymap_to_tv(PyObject *obj, typval_T *tv, PyObject *lookupDict)
     return 0;
 }
 
+    static PyInt
+DictionarySetattr(DictionaryObject *self, char *name, PyObject *val)
+{
+    if (val == NULL)
+    {
+	PyErr_SetString(PyExc_AttributeError, _("Cannot delete DictionaryObject attributes"));
+	return -1;
+    }
+
+    if (strcmp(name, "locked") == 0)
+    {
+	if (self->dict->dv_lock == VAR_FIXED)
+	{
+	    PyErr_SetString(PyExc_TypeError, _("Cannot modify fixed dictionary"));
+	    return -1;
+	}
+	else
+	{
+	    if (!PyBool_Check(val))
+	    {
+		PyErr_SetString(PyExc_TypeError, _("Only boolean objects are allowed"));
+		return -1;
+	    }
+
+	    if (val == Py_True)
+		self->dict->dv_lock = VAR_LOCKED;
+	    else
+		self->dict->dv_lock = 0;
+	}
+	return 0;
+    }
+    else
+    {
+	PyErr_SetString(PyExc_AttributeError, _("Cannot set this attribute"));
+	return -1;
+    }
+}
+
     static PyInt
 DictionaryLength(PyObject *self)
 {
@@ -1271,6 +1309,44 @@ ListConcatInPlace(PyObject *self, PyObject *obj)
     return self;
 }
 
+    static int
+ListSetattr(ListObject *self, char *name, PyObject *val)
+{
+    if (val == NULL)
+    {
+	PyErr_SetString(PyExc_AttributeError, _("Cannot delete DictionaryObject attributes"));
+	return -1;
+    }
+
+    if (strcmp(name, "locked") == 0)
+    {
+	if (self->list->lv_lock == VAR_FIXED)
+	{
+	    PyErr_SetString(PyExc_TypeError, _("Cannot modify fixed list"));
+	    return -1;
+	}
+	else
+	{
+	    if (!PyBool_Check(val))
+	    {
+		PyErr_SetString(PyExc_TypeError, _("Only boolean objects are allowed"));
+		return -1;
+	    }
+
+	    if (val == Py_True)
+		self->list->lv_lock = VAR_LOCKED;
+	    else
+		self->list->lv_lock = 0;
+	}
+	return 0;
+    }
+    else
+    {
+	PyErr_SetString(PyExc_AttributeError, _("Cannot set this attribute"));
+	return -1;
+    }
+}
+
 static struct PyMethodDef ListMethods[] = {
     {"extend", (PyCFunction)ListConcatInPlace, METH_O, ""},
     { NULL,	    NULL,		0,	    NULL }
diff --git a/src/if_python.c b/src/if_python.c
index 3c72b260c2..c194598b71 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -163,6 +163,7 @@ struct PyMethodDef { Py_ssize_t a; };
 # define PyInt_FromLong dll_PyInt_FromLong
 # define PyLong_AsLong dll_PyLong_AsLong
 # define PyLong_FromLong dll_PyLong_FromLong
+# define PyBool_Type (*dll_PyBool_Type)
 # define PyInt_Type (*dll_PyInt_Type)
 # define PyLong_Type (*dll_PyLong_Type)
 # define PyList_GetItem dll_PyList_GetItem
@@ -221,6 +222,8 @@ struct PyMethodDef { Py_ssize_t a; };
 #  define _PyObject_NextNotImplemented (*dll__PyObject_NextNotImplemented)
 # endif
 # define _Py_NoneStruct (*dll__Py_NoneStruct)
+# define _Py_ZeroStruct (*dll__Py_ZeroStruct)
+# define _Py_TrueStruct (*dll__Py_TrueStruct)
 # define PyObject_Init dll__PyObject_Init
 # define PyObject_GetIter dll_PyObject_GetIter
 # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000
@@ -263,6 +266,7 @@ static long(*dll_PyInt_AsLong)(PyObject *);
 static PyObject*(*dll_PyInt_FromLong)(long);
 static long(*dll_PyLong_AsLong)(PyObject *);
 static PyObject*(*dll_PyLong_FromLong)(long);
+static PyTypeObject* dll_PyBool_Type;
 static PyTypeObject* dll_PyInt_Type;
 static PyTypeObject* dll_PyLong_Type;
 static PyObject*(*dll_PyList_GetItem)(PyObject *, PyInt);
@@ -320,6 +324,8 @@ static PyObject* (*dll_PyObject_GetIter)(PyObject *);
 static iternextfunc dll__PyObject_NextNotImplemented;
 # endif
 static PyObject* dll__Py_NoneStruct;
+static PyObject* _Py_ZeroStruct;
+static PyObject* dll__Py_TrueStruct;
 # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000
 static int (*dll_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *);
 # endif
@@ -389,6 +395,7 @@ static struct
     {"PyInt_FromLong", (PYTHON_PROC*)&dll_PyInt_FromLong},
     {"PyLong_AsLong", (PYTHON_PROC*)&dll_PyLong_AsLong},
     {"PyLong_FromLong", (PYTHON_PROC*)&dll_PyLong_FromLong},
+    {"PyBool_Type", (PYTHON_PROC*)&dll_PyBool_Type},
     {"PyInt_Type", (PYTHON_PROC*)&dll_PyInt_Type},
     {"PyLong_Type", (PYTHON_PROC*)&dll_PyLong_Type},
     {"PyList_GetItem", (PYTHON_PROC*)&dll_PyList_GetItem},
@@ -449,6 +456,8 @@ static struct
     {"_PyObject_NextNotImplemented", (PYTHON_PROC*)&dll__PyObject_NextNotImplemented},
 # endif
     {"_Py_NoneStruct", (PYTHON_PROC*)&dll__Py_NoneStruct},
+    {"_Py_ZeroStruct", (PYTHON_PROC*)&dll__Py_ZeroStruct},
+    {"_Py_TrueStruct", (PYTHON_PROC*)&dll__Py_TrueStruct},
 # if defined(PY_VERSION_HEX) && PY_VERSION_HEX >= 0x02020000
     {"PyType_IsSubtype", (PYTHON_PROC*)&dll_PyType_IsSubtype},
 # endif
@@ -1563,6 +1572,10 @@ PythonMod_Init(void)
     PyDict_SetItemString(dict, "buffers", (PyObject *)(void *)&TheBufferList);
     PyDict_SetItemString(dict, "current", (PyObject *)(void *)&TheCurrent);
     PyDict_SetItemString(dict, "windows", (PyObject *)(void *)&TheWindowList);
+    PyDict_SetItemString(dict, "VAR_LOCKED",    PyInt_FromLong(VAR_LOCKED));
+    PyDict_SetItemString(dict, "VAR_FIXED",     PyInt_FromLong(VAR_FIXED));
+    PyDict_SetItemString(dict, "VAR_SCOPE",     PyInt_FromLong(VAR_SCOPE));
+    PyDict_SetItemString(dict, "VAR_DEF_SCOPE", PyInt_FromLong(VAR_DEF_SCOPE));
 
     if (PyErr_Occurred())
 	return -1;
@@ -1629,7 +1642,7 @@ static PyTypeObject DictionaryType = {
     (destructor)  DictionaryDestructor,
     (printfunc)   0,
     (getattrfunc) DictionaryGetattr,
-    (setattrfunc) 0,
+    (setattrfunc) DictionarySetattr,
     (cmpfunc)     0,
     (reprfunc)    0,
 
@@ -1656,6 +1669,13 @@ DictionaryDestructor(PyObject *self)
     static PyObject *
 DictionaryGetattr(PyObject *self, char *name)
 {
+    DictionaryObject	*this = ((DictionaryObject *) (self));
+
+    if (strcmp(name, "locked") == 0)
+	return PyInt_FromLong(this->dict->dv_lock);
+    else if (strcmp(name, "scope") == 0)
+	return PyInt_FromLong(this->dict->dv_scope);
+
     return Py_FindMethod(DictionaryMethods, self, name);
 }
 
@@ -1687,7 +1707,7 @@ static PyTypeObject ListType = {
     (destructor)  ListDestructor,
     (printfunc)   0,
     (getattrfunc) ListGetattr,
-    (setattrfunc) 0,
+    (setattrfunc) ListSetattr,
     (cmpfunc)     0,
     (reprfunc)    0,
 
@@ -1714,6 +1734,9 @@ ListDestructor(PyObject *self)
     static PyObject *
 ListGetattr(PyObject *self, char *name)
 {
+    if (strcmp(name, "locked") == 0)
+	return PyInt_FromLong(((ListObject *)(self))->list->lv_lock);
+
     return Py_FindMethod(ListMethods, self, name);
 }
 
diff --git a/src/if_python3.c b/src/if_python3.c
index 6dc75517c6..302be7ece6 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -161,7 +161,6 @@ static void init_structs(void);
 # define PyRun_String py3_PyRun_String
 # define PySys_SetObject py3_PySys_SetObject
 # define PySys_SetArgv py3_PySys_SetArgv
-# define PyType_Type (*py3_PyType_Type)
 # define PyType_Ready py3_PyType_Ready
 #undef Py_BuildValue
 # define Py_BuildValue py3_Py_BuildValue
@@ -170,6 +169,8 @@ static void init_structs(void);
 # define Py_Finalize py3_Py_Finalize
 # define Py_IsInitialized py3_Py_IsInitialized
 # define _Py_NoneStruct (*py3__Py_NoneStruct)
+# define _Py_FalseStruct (*py3__Py_FalseStruct)
+# define _Py_TrueStruct (*py3__Py_TrueStruct)
 # define _PyObject_NextNotImplemented (*py3__PyObject_NextNotImplemented)
 # define PyModule_AddObject py3_PyModule_AddObject
 # define PyImport_AppendInittab py3_PyImport_AppendInittab
@@ -184,8 +185,10 @@ static void init_structs(void);
 # define PyFloat_FromDouble py3_PyFloat_FromDouble
 # define PyFloat_AsDouble py3_PyFloat_AsDouble
 # define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr
+# define PyType_Type (*py3_PyType_Type)
 # define PySlice_Type (*py3_PySlice_Type)
 # define PyFloat_Type (*py3_PyFloat_Type)
+# define PyBool_Type (*py3_PyBool_Type)
 # define PyErr_NewException py3_PyErr_NewException
 # ifdef Py_DEBUG
 #  define _Py_NegativeRefcount py3__Py_NegativeRefcount
@@ -245,7 +248,6 @@ static PyObject* (*py3_PyList_GetItem)(PyObject *, Py_ssize_t);
 static PyObject* (*py3_PyImport_ImportModule)(const char *);
 static PyObject* (*py3_PyImport_AddModule)(const char *);
 static int (*py3_PyErr_BadArgument)(void);
-static PyTypeObject* py3_PyType_Type;
 static PyObject* (*py3_PyErr_Occurred)(void);
 static PyObject* (*py3_PyModule_GetDict)(PyObject *);
 static int (*py3_PyList_SetItem)(PyObject *, Py_ssize_t, PyObject *);
@@ -275,6 +277,8 @@ static void (*py3_PyErr_Clear)(void);
 static PyObject*(*py3__PyObject_Init)(PyObject *, PyTypeObject *);
 static iternextfunc py3__PyObject_NextNotImplemented;
 static PyObject* py3__Py_NoneStruct;
+static PyObject* py3__Py_FalseStruct;
+static PyObject* py3__Py_TrueStruct;
 static int (*py3_PyModule_AddObject)(PyObject *m, const char *name, PyObject *o);
 static int (*py3_PyImport_AppendInittab)(const char *name, PyObject* (*initfunc)(void));
 static char* (*py3__PyUnicode_AsString)(PyObject *unicode);
@@ -288,8 +292,10 @@ static PyObject* (*py3_PyObject_GenericGetAttr)(PyObject *obj, PyObject *name);
 static PyObject* (*py3_PyModule_Create2)(struct PyModuleDef* module, int module_api_version);
 static PyObject* (*py3_PyType_GenericAlloc)(PyTypeObject *type, Py_ssize_t nitems);
 static PyObject* (*py3_PyType_GenericNew)(PyTypeObject *type, PyObject *args, PyObject *kwds);
+static PyTypeObject* py3_PyType_Type;
 static PyTypeObject* py3_PySlice_Type;
 static PyTypeObject* py3_PyFloat_Type;
+static PyTypeObject* py3_PyBool_Type;
 static PyObject* (*py3_PyErr_NewException)(char *name, PyObject *base, PyObject *dict);
 static PyObject* (*py3_PyCapsule_New)(void *, char *, PyCapsule_Destructor);
 static void* (*py3_PyCapsule_GetPointer)(PyObject *, char *);
@@ -363,7 +369,6 @@ static struct
     {"PyImport_ImportModule", (PYTHON_PROC*)&py3_PyImport_ImportModule},
     {"PyImport_AddModule", (PYTHON_PROC*)&py3_PyImport_AddModule},
     {"PyErr_BadArgument", (PYTHON_PROC*)&py3_PyErr_BadArgument},
-    {"PyType_Type", (PYTHON_PROC*)&py3_PyType_Type},
     {"PyErr_Occurred", (PYTHON_PROC*)&py3_PyErr_Occurred},
     {"PyModule_GetDict", (PYTHON_PROC*)&py3_PyModule_GetDict},
     {"PyList_SetItem", (PYTHON_PROC*)&py3_PyList_SetItem},
@@ -386,6 +391,8 @@ static struct
     {"Py_IsInitialized", (PYTHON_PROC*)&py3_Py_IsInitialized},
     {"_PyObject_NextNotImplemented", (PYTHON_PROC*)&py3__PyObject_NextNotImplemented},
     {"_Py_NoneStruct", (PYTHON_PROC*)&py3__Py_NoneStruct},
+    {"_Py_FalseStruct", (PYTHON_PROC*)&py3__Py_FalseStruct},
+    {"_Py_TrueStruct", (PYTHON_PROC*)&py3__Py_TrueStruct},
     {"PyErr_Clear", (PYTHON_PROC*)&py3_PyErr_Clear},
     {"PyObject_Init", (PYTHON_PROC*)&py3__PyObject_Init},
     {"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject},
@@ -400,8 +407,10 @@ static struct
     {"PyModule_Create2", (PYTHON_PROC*)&py3_PyModule_Create2},
     {"PyType_GenericAlloc", (PYTHON_PROC*)&py3_PyType_GenericAlloc},
     {"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew},
+    {"PyType_Type", (PYTHON_PROC*)&py3_PyType_Type},
     {"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type},
     {"PyFloat_Type", (PYTHON_PROC*)&py3_PyFloat_Type},
+    {"PyBool_Type", (PYTHON_PROC*)&py3_PyBool_Type},
     {"PyErr_NewException", (PYTHON_PROC*)&py3_PyErr_NewException},
 # ifdef Py_DEBUG
     {"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount},
@@ -1534,6 +1543,28 @@ static PyMappingMethods DictionaryAsMapping = {
     /* mp_ass_subscript */ (objobjargproc) DictionaryAssItem,
 };
 
+    static PyObject *
+DictionaryGetattro(PyObject *self, PyObject *nameobj)
+{
+    DictionaryObject	*this = ((DictionaryObject *) (self));
+
+    GET_ATTR_STRING(name, nameobj);
+
+    if (strcmp(name, "locked") == 0)
+	return PyLong_FromLong(this->dict->dv_lock);
+    else if (strcmp(name, "scope") == 0)
+	return PyLong_FromLong(this->dict->dv_scope);
+
+    return PyObject_GenericGetAttr(self, nameobj);
+}
+
+    static int
+DictionarySetattro(PyObject *self, PyObject *nameobj, PyObject *val)
+{
+    GET_ATTR_STRING(name, nameobj);
+    return DictionarySetattr((DictionaryObject *) self, name, val);
+}
+
 static PyTypeObject DictionaryType;
 
     static void
@@ -1625,6 +1656,24 @@ ListAsSubscript(PyObject *self, PyObject *idxObject, PyObject *obj)
     }
 }
 
+    static PyObject *
+ListGetattro(PyObject *self, PyObject *nameobj)
+{
+    GET_ATTR_STRING(name, nameobj);
+
+    if (strcmp(name, "locked") == 0)
+	return PyLong_FromLong(((ListObject *) (self))->list->lv_lock);
+
+    return PyObject_GenericGetAttr(self, nameobj);
+}
+
+    static int
+ListSetattro(PyObject *self, PyObject *nameobj, PyObject *val)
+{
+    GET_ATTR_STRING(name, nameobj);
+    return ListSetattr((ListObject *) self, name, val);
+}
+
     static void
 ListDestructor(PyObject *self)
 {
@@ -1713,6 +1762,7 @@ static struct PyModuleDef vimmodule;
 PyMODINIT_FUNC Py3Init_vim(void)
 {
     PyObject *mod;
+    PyObject *tmp;
     /* The special value is removed from sys.path in Python3_Init(). */
     static wchar_t *(argv[2]) = {L"/must>not&exist/foo", NULL};
 
@@ -1744,6 +1794,16 @@ PyMODINIT_FUNC Py3Init_vim(void)
     Py_INCREF((PyObject *)(void *)&TheWindowList);
     PyModule_AddObject(mod, "windows", (PyObject *)(void *)&TheWindowList);
 
+#define ADD_INT_CONSTANT(name, value) \
+    tmp = PyLong_FromLong(value); \
+    Py_INCREF(tmp); \
+    PyModule_AddObject(mod, name, tmp)
+
+    ADD_INT_CONSTANT("VAR_LOCKED",     VAR_LOCKED);
+    ADD_INT_CONSTANT("VAR_FIXED",      VAR_FIXED);
+    ADD_INT_CONSTANT("VAR_SCOPE",      VAR_SCOPE);
+    ADD_INT_CONSTANT("VAR_DEF_SCOPE",  VAR_DEF_SCOPE);
+
     if (PyErr_Occurred())
 	return NULL;
 
@@ -1899,6 +1959,8 @@ init_structs(void)
     vim_memset(&DictionaryType, 0, sizeof(DictionaryType));
     DictionaryType.tp_name = "vim.dictionary";
     DictionaryType.tp_basicsize = sizeof(DictionaryObject);
+    DictionaryType.tp_getattro = DictionaryGetattro;
+    DictionaryType.tp_setattro = DictionarySetattro;
     DictionaryType.tp_dealloc = DictionaryDestructor;
     DictionaryType.tp_as_mapping = &DictionaryAsMapping;
     DictionaryType.tp_flags = Py_TPFLAGS_DEFAULT;
@@ -1909,6 +1971,8 @@ init_structs(void)
     ListType.tp_name = "vim.list";
     ListType.tp_dealloc = ListDestructor;
     ListType.tp_basicsize = sizeof(ListObject);
+    ListType.tp_getattro = ListGetattro;
+    ListType.tp_setattro = ListSetattro;
     ListType.tp_as_sequence = &ListAsSeq;
     ListType.tp_as_mapping = &ListAsMapping;
     ListType.tp_flags = Py_TPFLAGS_DEFAULT;
diff --git a/src/testdir/test86.in b/src/testdir/test86.in
index 93eb400853..1309643d8b 100644
--- a/src/testdir/test86.in
+++ b/src/testdir/test86.in
@@ -211,6 +211,41 @@ except Exception as e:
     m.extend([e.__class__.__name__])
 EOF
 :$put =messages
+:unlet messages
+:" locked and scope attributes
+:let d={} | let dl={} | lockvar dl
+:for s in split("d dl v: g:")
+:    let name=tr(s, ':', 's')
+:    execute 'py '.name.'=vim.bindeval("'.s.'")'
+:    let toput=s.' : '.join(map(['locked', 'scope'], 'v:val.":".pyeval(name.".".v:val)'), ';')
+:    $put =toput
+:endfor
+:silent! let d.abc=1
+:silent! let dl.abc=1
+:py d.locked=True
+:py dl.locked=False
+:silent! let d.def=1
+:silent! let dl.def=1
+:put ='d:'.string(d)
+:put ='dl:'.string(dl)
+:unlet d dl
+:
+:let l=[] | let ll=[] | lockvar ll
+:for s in split("l ll")
+:    let name=tr(s, ':', 's')
+:    execute 'py '.name.'=vim.bindeval("'.s.'")'
+:    let toput=s.' : locked:'.pyeval(name.'.locked')
+:    $put =toput
+:endfor
+:silent! call extend(l, [0])
+:silent! call extend(ll, [0])
+:py l.locked=True
+:py ll.locked=False
+:silent! call extend(l, [1])
+:silent! call extend(ll, [1])
+:put ='l:'.string(l)
+:put ='ll:'.string(ll)
+:unlet l ll
 :"
 :" pyeval()
 :let l=pyeval('range(3)')
@@ -240,6 +275,7 @@ EOF
 :call garbagecollect(1)
 :"
 :/^start:/,$wq! test.out
+:call getchar()
 ENDTEST
 
 start:
diff --git a/src/testdir/test86.ok b/src/testdir/test86.ok
index 94f36e9703..5ef8689a24 100644
--- a/src/testdir/test86.ok
+++ b/src/testdir/test86.ok
@@ -44,6 +44,16 @@ TypeError
 ValueError
 TypeError
 TypeError
+d : locked:0;scope:0
+dl : locked:1;scope:0
+v: : locked:2;scope:1
+g: : locked:0;scope:2
+d:{'abc': 1}
+dl:{'def': 1}
+l : locked:0
+ll : locked:1
+l:[0]
+ll:[1]
 [0, 1, 2]
 ['a', 'b']
 ['c', 1]
diff --git a/src/testdir/test87.in b/src/testdir/test87.in
index 312763c806..1d7ccedd51 100644
--- a/src/testdir/test87.in
+++ b/src/testdir/test87.in
@@ -211,6 +211,41 @@ except Exception as e:
     m.extend([e.__class__.__name__])
 EOF
 :$put =messages
+:unlet messages
+:" locked and scope attributes
+:let d={} | let dl={} | lockvar dl
+:for s in split("d dl v: g:")
+:    let name=tr(s, ':', 's')
+:    execute 'py3 '.name.'=vim.bindeval("'.s.'")'
+:    let toput=s.' : '.join(map(['locked', 'scope'], 'v:val.":".py3eval(name.".".v:val)'), ';')
+:    $put =toput
+:endfor
+:silent! let d.abc=1
+:silent! let dl.abc=1
+:py3 d.locked=True
+:py3 dl.locked=False
+:silent! let d.def=1
+:silent! let dl.def=1
+:put ='d:'.string(d)
+:put ='dl:'.string(dl)
+:unlet d dl
+:
+:let l=[] | let ll=[] | lockvar ll
+:for s in split("l ll")
+:    let name=tr(s, ':', 's')
+:    execute 'py3 '.name.'=vim.bindeval("'.s.'")'
+:    let toput=s.' : locked:'.py3eval(name.'.locked')
+:    $put =toput
+:endfor
+:silent! call extend(l, [0])
+:silent! call extend(ll, [0])
+:py3 l.locked=True
+:py3 ll.locked=False
+:silent! call extend(l, [1])
+:silent! call extend(ll, [1])
+:put ='l:'.string(l)
+:put ='ll:'.string(ll)
+:unlet l ll
 :"
 :" py3eval()
 :let l=py3eval('[0, 1, 2]')
diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok
index 4eab845302..4c0bb799d7 100644
--- a/src/testdir/test87.ok
+++ b/src/testdir/test87.ok
@@ -44,6 +44,16 @@ TypeError
 ValueError
 TypeError
 TypeError
+d : locked:0;scope:0
+dl : locked:1;scope:0
+v: : locked:2;scope:1
+g: : locked:0;scope:2
+d:{'abc': 1}
+dl:{'def': 1}
+l : locked:0
+ll : locked:1
+l:[0]
+ll:[1]
 [0, 1, 2]
 ['a', 'b']
 ['c', 1]
diff --git a/src/version.c b/src/version.c
index 3e054b7c6a..cd50417553 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    672,
 /**/
     671,
 /**/

From cf1a9898a40d1c7d3f11d65ac307359e80b8a30a Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 21 Sep 2012 14:00:35 +0200
Subject: [PATCH 052/136] Added tag v7-3-672 for changeset fd6ef931aa77

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5f77d03135..104a0ed275 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2008,3 +2008,4 @@ dde6d0216a08a5554f3c351e519134c386d14232 v7-3-668
 2b3b7b48370848149c8b831b2b7aee9b7f4f88bb v7-3-669
 2bf8c00741f7f07d9b58596764236a92eaeca862 v7-3-670
 530f5a9030315f984e096794938c61f9d3562e22 v7-3-671
+fd6ef931aa77239804860b74ed2362b29c1a6d4a v7-3-672

From dfba2a34f826755566d8a3bd83822b5afda369af Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 21 Sep 2012 14:54:30 +0200
Subject: [PATCH 053/136] Updated runtime files.

---
 runtime/doc/autocmd.txt         |   5 +-
 runtime/doc/diff.txt            |  12 +-
 runtime/doc/eval.txt            |  13 +-
 runtime/doc/hebrew.txt          |   2 +-
 runtime/doc/if_pyth.txt         |  20 +
 runtime/doc/indent.txt          |   4 +-
 runtime/doc/intro.txt           |   4 +-
 runtime/doc/todo.txt            |  75 ++-
 runtime/doc/usr_41.txt          |   2 +-
 runtime/doc/visual.txt          |   2 +-
 runtime/filetype.vim            |   6 +-
 runtime/ftplugin/changelog.vim  |   6 +-
 runtime/ftplugin/zimbu.vim      |  55 ++-
 runtime/indent/zimbu.vim        |   4 +-
 runtime/scripts.vim             |   5 +-
 runtime/syntax/cl.vim           | 132 ++---
 runtime/syntax/css.vim          | 350 +++++++++----
 runtime/syntax/hgcommit.vim     |  14 +-
 runtime/syntax/progress.vim     | 116 ++---
 runtime/tutor/tutor.vim         |  10 +-
 runtime/tutor/tutor.zh_cn.utf-8 | 851 +++++++++++++++++++++++++++++++
 runtime/tutor/tutor.zh_tw.utf-8 | 852 ++++++++++++++++++++++++++++++++
 22 files changed, 2256 insertions(+), 284 deletions(-)
 create mode 100644 runtime/tutor/tutor.zh_cn.utf-8
 create mode 100644 runtime/tutor/tutor.zh_tw.utf-8

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index a8bff07c56..32cad6764b 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.3.  Last change: 2012 Jul 10
+*autocmd.txt*   For Vim version 7.3.  Last change: 2012 Sep 05
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -263,8 +263,10 @@ Name			triggered by ~
 	Startup and exit
 |VimEnter|		after doing all the startup stuff
 |GUIEnter|		after starting the GUI successfully
+|GUIFailed|		after starting the GUI failed
 |TermResponse|		after the terminal response to |t_RV| is received
 
+|QuitPre|			when using `:quit`, before deciding whether to quit
 |VimLeavePre|		before exiting Vim, before writing the viminfo file
 |VimLeave|		before exiting Vim, after writing the viminfo file
 
@@ -312,6 +314,7 @@ Name			triggered by ~
 |SessionLoadPost|	after loading a session file
 
 |MenuPopup|		just before showing the popup menu
+|CompleteDone|		after Insert mode completion is done
 
 |User|			to be used in combination with ":doautocmd"
 
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 0e03a57fe1..036dc5e136 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.3.  Last change: 2012 Aug 08
+*diff.txt*      For Vim version 7.3.  Last change: 2012 Sep 05
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -86,16 +86,16 @@ diff mode.  You could use a construct like this: >
 While already in Vim you can start diff mode in three ways.
 
 							*E98*
-:diffsplit {filename}					*:diffs* *:diffsplit*
+:diffs[plit] {filename}					*:diffs* *:diffsplit*
 		Open a new window on the file {filename}.  The options are set
 		as for "vimdiff" for the current and the newly opened window.
 		Also see 'diffexpr'.
 
 							*:difft* *:diffthis*
-:diffthis	Make the current window part of the diff windows.  This sets
+:difft[his]	Make the current window part of the diff windows.  This sets
 		the options like for "vimdiff".
 
-:diffpatch {patchfile}				 *E816* *:diffp* *:diffpatch*
+:diffp[atch] {patchfile}				 *E816* *:diffp* *:diffpatch*
 		Use the current buffer, patch it with the diff found in
 		{patchfile} and open a buffer on the result.  The options are
 		set as for "vimdiff".
@@ -123,9 +123,9 @@ Since the option values are remembered with the buffer, you can edit another
 file for a moment and come back to the same file and be in diff mode again.
 
 							*:diffo* *:diffoff*
-:diffoff	Switch off diff mode for the current window.
+:diffo[ff]	Switch off diff mode for the current window.
 
-:diffoff!	Switch off diff mode for the current window and in all windows
+:diffo[ff]!	Switch off diff mode for the current window and in all windows
 		in the current tab page where 'diff' is set.
 
 The ":diffoff" command resets the relevant options to their default value.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 2ae65ff82b..12ea9c897e 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 Aug 02
+*eval.txt*	For Vim version 7.3.  Last change: 2012 Sep 05
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -759,7 +759,7 @@ of a |List| is different from the original |List|.  When using "is" without
 a |List| or a |Dictionary| it is equivalent to using "equal", using "isnot"
 equivalent to using "not equal".  Except that a different type means the
 values are different: "4 == '4'" is true, "4 is '4'" is false and "0 is []" is
-false and not a error. "is#"/"isnot#" and "is?"/"isnot?" can be used to match
+false and not an error. "is#"/"isnot#" and "is?"/"isnot?" can be used to match
 and ignore case.
 
 When comparing a String with a Number, the String is converted to a Number,
@@ -4635,8 +4635,8 @@ pyeval({expr})						*pyeval()*
 		Numbers and strings are returned as they are (strings are 
 		copied though).
 		Lists are represented as Vim |List| type.
-		Dictionaries are represented as Vim |Dictionary| type with 
-		keys converted to strings.
+		Dictionaries are represented as Vim |Dictionary| type, 
+		non-string keys result in error.
 		{only available when compiled with the |+python| feature}
 
 							*E726* *E727*
@@ -5253,8 +5253,9 @@ setreg({regname}, {value} [,{options}])
 
 		If {options} contains no register settings, then the default
 		is to use character mode unless {value} ends in a <NL>.
-		Setting the '=' register is not possible.
-		Returns zero for success, non-zero for failure.
+		Setting the '=' register is not possible, but you can use >
+			:let @= = var_expr
+<		Returns zero for success, non-zero for failure.
 
 		Examples: >
 			:call setreg(v:register, @*)
diff --git a/runtime/doc/hebrew.txt b/runtime/doc/hebrew.txt
index 589d12c33f..8f264e67e2 100644
--- a/runtime/doc/hebrew.txt
+++ b/runtime/doc/hebrew.txt
@@ -93,7 +93,7 @@ Details
       This is also the keymap when 'keymap=hebrew' is set.  The advantage of
       'keymap' is that it works properly when using UTF8, e.g. it inserts the
       correct characters; 'hkmap' does not.  The 'keymap' keyboard can also
-      insert niqud and te`amim.  To see what those mappings are,look at the
+      insert niqud and te`amim.  To see what those mappings are, look at the
       keymap file 'hebrew.vim' etc.
 
 
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 4bdacf66f2..92840d40ec 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -159,6 +159,26 @@ vim.bindeval(str)					*python-bindeval*
 	   vimlist or vimdictionary python type that are connected to original 
 	   list or dictionary. Thus modifications to these objects imply 
 	   modifications of the original.
+
+	   Additionally, vimlist and vimdictionary type have read-write 
+	   `.locked` attribute that returns
+	     Value           Meaning ~
+	     zero            Variable is not locked
+	     vim.VAR_LOCKED  Variable is locked, but can be unlocked
+	     vim.VAR_FIXED   Variable is locked and can’t be unlocked
+	   integer constants. If variable is not fixed, you can do 
+	   `var.locked=True` to lock it and `var.locked=False` to unlock. 
+	   There is no recursive locking like |:lockvar|! does. There is also 
+	   no way to lock a specific key or check whether it is locked (in any 
+	   case these locks are ignored by anything except |:let|: |extend()| 
+	   does not care, neither does python interface).
+
+	   Vimdictionary type also supports `.scope` attribute which is one of
+	     Value              Meaning ~
+	     zero               Dictionary is not a scope one
+	     vim.VAR_DEF_SCOPE  Function-local or global scope dictionary
+	     vim.VAR_SCOPE      Other scope dictionary
+
 	2. if expression evaluates to a function reference, then it returns 
 	   callable vimfunction object. Use self keyword argument to assign 
 	   |self| object for dictionary functions.
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index ce02178d70..6a43896c00 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 7.3.  Last change: 2011 Sep 02
+*indent.txt*    For Vim version 7.3.  Last change: 2012 Aug 30
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -540,7 +540,7 @@ The examples below assume a 'shiftwidth' of 4.
 								*cino-star*
 	*N    Vim searches for unclosed comments at most N lines away.  This
 	      limits the time needed to search for the start of a comment.
-	      If your /* */ comments stop indenting afer N lines this is the
+	      If your /* */ comments stop indenting after N lines this is the
 	      value you will want to change.
 	      (default 70 lines).
 
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 6682ba6aa7..c643ab8dbf 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -1,4 +1,4 @@
-*intro.txt*     For Vim version 7.3.  Last change: 2011 May 15
+*intro.txt*     For Vim version 7.3.  Last change: 2012 Sep 05
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -394,6 +394,8 @@ CTRL-{char}	{char} typed as a control character; that is, typing {char}
 							*quotecommandquote*
 "command"	A reference to a command that you can type is enclosed in
 		double quotes.
+`command`		New style command, this distinguishes it from other
+		quoted text and strings.
 
 					*key-notation* *key-codes* *keycodes*
 These names for keys are used in the documentation.  They can also be used
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index e1efea17a5..e3e6bbbffc 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 Aug 15
+*todo.txt*      For Vim version 7.3.  Last change: 2012 Sep 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -36,6 +36,9 @@ not be repeated below, unless there is extra information.
 
 Go through more coverity reports.
 
+Ruby problem, patch in issue 49. (Sep 19)
+Also in email from Ondruch?
+
 Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
 
 GTK: problem with 'L' in 'guioptions' changing the window width.
@@ -43,12 +46,35 @@ GTK: problem with 'L' in 'guioptions' changing the window width.
 
 Checking runtime scripts: Thilo Six, 2012 Jun 6.
 
+Crash with 1023 byte directory name. (Danek Duvall, 2012 Sep 19)
+
+Patch for SGR mouse with older xterm. (Hayaki Saito, 2012 Sep 19)
+
+Patch for crash with an autocommand. (ZyX, 2012 Sep 6, second one)
+Also patch for garbage, but use vim_strncpy() instead.
+
+Patch to fix crash on Win32 when setting 'encoding'. (Jiri Sedlak, 2012 Sep
+12)
+
+Patch to update example using empty(). (ZyX, 2012 Sep 13)
+
 Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
 
+Updated French and Esperanto files. (Dominique Pelle, 2012 Aug 19)
+
+When showing diffs filler lines may be hidden at first.
+Patch by Christian Brabandt, 2012 Sep 6.
+
+Patch for memory leaks on exception. (ZyX, 2012 Sep 9)
+
 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.
 
+mouse_sgr is not ordered alphabetically in :version output.
+Docs list mouse_urxvt as normal feature, should be big. (Hayaki Saito, 2012
+Aug 16)
+
 ":gundo" command: global undo.  Undoes changes spread over multiple files in
 the order they were made.  Also ":gredo".  Both with a count.  Useful when
 tests fail after making changes and you forgot in which files.
@@ -57,27 +83,45 @@ 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)
 
+Patch for IME handling, adds 'imactivatefunc' and 'imstatusfunc' option.
+(Yukihiro Nakadaira, 2012 Aug 16)
+Patch to improve IME handling. (Yasuhiro Matsumoto, 2012 Jul 18)
+
 Issue 54: document behavior of -complete, also expands arg.
 
+Patch for if_lua. (Luis Carvalho, 2012 Aug 26, update Aug 29, another Aug 30,
+then Sep 1)
+
 Issue 72: 'autochdir' causes problems for :vimgrep.
 
 MS-Windows: Crash opening very long file name starting with "\\".
 (Christian Brock, 2012 Jun 29)
 
+Win32: patch for current directory, "loading iof conv". (Ken Takata, 2012 Sep
+15)
+
 Syntax update problem in one buffer opened in two windows, bottom window is
 not correctly updated. (Paul Harris, 2012 Feb 27)
 
+Patch to add assignments in cscope. (Uli Meis, Estabrooks, 2012 Sep 1)
+Alternate patch by Gary Johnson, Sep 4.
+
 Patch to add getsid(). (Tyru, 2011 Oct 2)  Do we want this?  Update Oct 4.
 Or use expand('<sid>')?
 
-Patch to improve IME handling. (Yasuhiro Matsumoto, 2012 Jul 18)
-
 Patch for :tabcloseleft, after closing a tab go to left tab. (William Bowers,
 2012 Aug 4)
 
+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.
+
 Crash in autocmd that unloads buffers in a BufUnload event. (Andrew Pimlott,
 2012 Aug 11)  Disallow :new when BufUnload is being handled?
 
+MS-Windows ACL support doesn't work well.  Patch from Ken Takata, 2012 Aug 29.
+Update Aug 31.
+
 MS-Windows resizing problems:
 - Windows window on screen positioning: Patch by Yukihiro Nakadaira, 2012 Jun
   20.  Uses getWindowRect() instead of GetWindowPlacement()
@@ -94,6 +138,9 @@ The input map for CTRL-O in mswin.vim causes problems after CTRL-X CTRL-O.
 Suggestion for another map. (Philip Mat, 2012 Jun 18)
 But use "gi" instead of "a".  Or use CTRL-\ CTRL-O.
 
+Patch to support user name completion on MS-Windows. (Yasuhiro Matsumoto, 2012
+Aug 16)
+
 URXVT:
 - will get stuck if byte sequence does not containe expected semicolon.
 - Use urxvt mouse support also in xterm.  Explanations:
@@ -108,17 +155,23 @@ Do give the prompt? Quit with an error?
 
 Patch for 'backupcopy' default behavior for symlinks on Windows. (David Pope,
 2012 Mar 21, update Mar 31)
+With fix for memory leak: Ken Takata, 2012 Aug 24
 
 Patch to list user digraphs. (Christian Brabandt, 2012 Apr 14)
 
 Patch for input method status. (Hirohito Higashi, 2012 Apr 18)
 
+Patch to print the result of a :python command. (Maxim Philippov
+<philippovmi@gmail.com>, 2012 Aug 16)  Update Aug 17.
+
 Problem with winfixheight and resizing. (Yukihiro Nakadaira, 2011 Sep 17)
 Patch Sep 18.
 
 Patch for IME problems. Remove hacking code for old IM. (Yukihiro Nakadaira,
 2012 Jul 20)
 
+/[^\n] does match at a line break.  Expected to do the same as /.
+
 Patch for has('unnamedplus') docs. (Tony Mechelynck, 2011 Sep 27)
 And one for gui_x11.txt.
 
@@ -162,9 +215,6 @@ Patch to add ":py3do". (Lilydjwg, 2012 Apr 7)
 
 Plugin for Modeleasy. (Massimiliano Tripoli, 2011 Nov 29)
 
-When using remote-silent the -R flag is not passed on. (Axel Bender, 2012 May
-31)
-
 Updated syntax file for ssh_config, maintainer doesn't respond.
 (Leonard Ehrenfried, 2011 Sep 26)
 
@@ -725,10 +775,6 @@ Support a 'systemencoding' option (for Unix).  It specifies the encoding of
 file names. (Kikuchan, 2010 Oct 5).  Useful on a latin1 or double-byte Asian
 system when 'encoding' is "utf-8".
 
-Win32: A --remote command that has a directory name starting with a ( doesn't
-work, the backslash is removed, assuming that it escapes the (. (Valery
-Kondakoff, 2009 May 13)
-
 Win32 GUI: Changing manifest helps for dpi changes (Joe Castro, 2009 Mar 27)
 
 Win32 GUI: last message from startup doesn't show up when there is an echoerr
@@ -914,6 +960,15 @@ escaping characters where the backslash is not removed later.  Asked Chris for
 an alternate solution, also for src/ex_getln.c.
 This also fails when the file or directory name contains "%". (Thoml, 2008
 July 7)
+Using --remote-silent while the current directory has a # in the name does not
+work, the # needs to be escaped. (Tramblay Bruno, 2012 Sep 15)
+
+When using remote-silent the -R flag is not passed on. (Axel Bender, 2012 May
+31)
+
+Win32: A --remote command that has a directory name starting with a ( doesn't
+work, the backslash is removed, assuming that it escapes the (. (Valery
+Kondakoff, 2009 May 13)
 
 Problem with 'langmap' being used on the rhs of a mapping. (Nikolai Weibull,
 2008 May 14)
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 77f7d1c350..1a4ae3d1b3 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1681,7 +1681,7 @@ in your plugin file!
 HEADER
 
 You will probably add new corrections to the plugin and soon have several
-versions laying around.  And when distributing this file, people will want to
+versions lying around.  And when distributing this file, people will want to
 know who wrote this wonderful plugin and where they can send remarks.
 Therefore, put a header at the top of your plugin: >
 
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index 6d85075efa..6905c21803 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -66,7 +66,7 @@ position.
 			lines as used for the last Visual operation, but at
 			the current cursor position, multiplied by [count].
 			When the previous Visual operation was on a block both
-			the width and height of the block are multipiled by
+			the width and height of the block are multiplied by
 			[count].
 			When there was no previous Visual operation [count]
 			characters are selected.  This is like moving the
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 45cf6309a4..6f6bc812ad 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 Aug 02
+" Last Change:	2012 Sep 06
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -1772,6 +1772,10 @@ func! SetFileTypeSH(name)
     " Some .sh scripts contain #!/bin/tcsh.
     call SetFileTypeShell("tcsh")
     return
+  elseif a:name =~ '\<zsh\>'
+    " Some .sh scripts contain #!/bin/zsh.
+    call SetFileTypeShell("zsh")
+    return
   elseif a:name =~ '\<ksh\>'
     let b:is_kornshell = 1
     if exists("b:is_bash")
diff --git a/runtime/ftplugin/changelog.vim b/runtime/ftplugin/changelog.vim
index dafcbe20ff..ee83c79175 100644
--- a/runtime/ftplugin/changelog.vim
+++ b/runtime/ftplugin/changelog.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:         generic Changelog file
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2011-05-02
+" Latest Revision:  2012-08-23
 " Variables:
 "   g:changelog_timeformat (deprecated: use g:changelog_dateformat instead) -
 "       description: the timeformat used in ChangeLog entries.
@@ -106,10 +106,10 @@ if &filetype == 'changelog'
 
   function! s:passwd_field(line, field)
     let fields = split(a:line, ':', 1)
-    if len(fields) < field
+    if len(fields) < a:field
       return ""
     endif
-    return fields[field - 1]
+    return fields[a:field - 1]
   endfunction
 
   function! s:capitalize(word)
diff --git a/runtime/ftplugin/zimbu.vim b/runtime/ftplugin/zimbu.vim
index 85b57f464f..ff281202e0 100644
--- a/runtime/ftplugin/zimbu.vim
+++ b/runtime/ftplugin/zimbu.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	Zimbu
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 May 18
+" Last Change:	2012 Sep 08
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -34,7 +34,7 @@ setlocal errorformat^=%f\ line\ %l\ col\ %c:\ %m,ERROR:\ %m
 
 " When the matchit plugin is loaded, this makes the % command skip parens and
 " braces in comments.
-let b:match_words = '\(^\s*\)\@<=\(MODULE\|CLASS\|INTERFACE\|BITS\|ENUM\|SHARED\|FUNC\|REPLACE\|DEFINE\|PROC\|EQUAL\|MAIN\|IF\|GENERATE_IF\|WHILE\|REPEAT\|WITH\|DO\|FOR\|SWITCH\|TRY\)\>\|{\s*$:\(^\s*\)\@<=\(ELSE\|ELSEIF\|GENERATE_ELSE\|GENERATE_ELSEIF\|CATCH\|FINALLY\)\>:\(^\s*\)\@<=}\|\<UNTIL\>'
+let b:match_words = '\(^\s*\)\@<=\(MODULE\|CLASS\|INTERFACE\|BITS\|ENUM\|SHARED\|FUNC\|REPLACE\|DEFINE\|PROC\|EQUAL\|MAIN\|IF\|GENERATE_IF\|WHILE\|REPEAT\|WITH\|DO\|FOR\|SWITCH\|TRY\)\>\|{\s*$:\(^\s*\)\@<=\(ELSE\|ELSEIF\|GENERATE_ELSE\|GENERATE_ELSEIF\|CATCH\|FINALLY\)\>:\(^\s*\)\@<=\(}\|\<UNTIL\>\)'
 
 let b:match_skip = 's:comment\|string\|zimbuchar'
 
@@ -43,12 +43,36 @@ setlocal et sts=2 sw=2
 
 " Does replace when a dot, space or closing brace is typed.
 func! GCUpperDot(what)
-  let col = col(".") - strlen(a:what)
-  if v:char != ' ' && v:char != "\r" && v:char != "\x1b" && v:char != '.' && v:char != ')' && v:char != '}'
+  if v:char != ' ' && v:char != "\r" && v:char != "\x1b" && v:char != '.' && v:char != ')' && v:char != '}' && v:char != ','
     " no space or dot after the typed text
     let g:got_char = v:char
     return a:what
   endif
+  return GCUpperCommon(a:what)
+endfunc
+
+" Does not replace when a dot is typed.
+func! GCUpper(what)
+  if v:char != ' ' && v:char != "\r" && v:char != "\x1b" && v:char != ')' && v:char != ','
+    " no space or other "terminating" character after the typed text
+    let g:got_char = v:char
+    return a:what
+  endif
+  return GCUpperCommon(a:what)
+endfunc
+
+" Only replaces when a space is typed.
+func! GCUpperSpace(what)
+  if v:char != ' '
+    " no space after the typed text
+    let g:got_char = v:char
+    return a:what
+  endif
+  return GCUpperCommon(a:what)
+endfunc
+
+func! GCUpperCommon(what)
+  let col = col(".") - strlen(a:what)
   if col > 1 && getline('.')[col - 2] != ' '
     " no space before the typed text
     let g:got_char = 999
@@ -64,34 +88,15 @@ func! GCUpperDot(what)
   return toupper(a:what)
 endfunc
 
-" Does not replace when a dot is typed.
-func! GCUpper(what)
-  if v:char != ' ' && v:char != "\r" && v:char != "\x1b" && v:char != ')'
-    " no space after the typed text
-    let g:got_char = v:char
-    return a:what
-  endif
-  return GCUpperDot(a:what)
-endfunc
-
-" Only replaces when a space is typed.
-func! GCUpperSpace(what)
-  if v:char != ' '
-    " no space after the typed text
-    let g:got_char = v:char
-    return a:what
-  endif
-  return GCUpperDot(a:what)
-endfunc
-
 iabbr <buffer> <expr> alias GCUpperSpace("alias")
 iabbr <buffer> <expr> arg GCUpperDot("arg")
-iabbr <buffer> <expr> bad GCUpper("bad")
 iabbr <buffer> <expr> break GCUpper("break")
 iabbr <buffer> <expr> case GCUpperSpace("case")
 iabbr <buffer> <expr> catch GCUpperSpace("catch")
 iabbr <buffer> <expr> check GCUpperDot("check")
 iabbr <buffer> <expr> class GCUpperSpace("class")
+iabbr <buffer> <expr> interface GCUpperSpace("interface")
+iabbr <buffer> <expr> implements GCUpperSpace("implements")
 iabbr <buffer> <expr> shared GCUpperSpace("shared")
 iabbr <buffer> <expr> continue GCUpper("continue")
 iabbr <buffer> <expr> default GCUpper("default")
diff --git a/runtime/indent/zimbu.vim b/runtime/indent/zimbu.vim
index 8df0eebe6f..9565b10843 100644
--- a/runtime/indent/zimbu.vim
+++ b/runtime/indent/zimbu.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Zimbu
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2011 Jun 19
+" Last Change:	2012 Sep 08
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -101,7 +101,7 @@ func GetZimbuIndent(lnum)
     endwhile
   endif
 
-  if prevline =~ '^\s*\(IF\|\|ELSEIF\|ELSE\|GENERATE_IF\|\|GENERATE_ELSEIF\|GENERATE_ELSE\|WHILE\|REPEAT\|TRY\|CATCH\|FINALLY\|FOR\|DO\|SWITCH\|CASE\|DEFAULT\|FUNC\|VIRTUAL\|ABSTRACT\|DEFINE\|REPLACE\|FINAL\|PROC\|MAIN\|NEW\|ENUM\|CLASS\|BITS\|MODULE\|SHARED\)\>'
+  if prevline =~ '^\s*\(IF\|\|ELSEIF\|ELSE\|GENERATE_IF\|\|GENERATE_ELSEIF\|GENERATE_ELSE\|WHILE\|REPEAT\|TRY\|CATCH\|FINALLY\|FOR\|DO\|SWITCH\|CASE\|DEFAULT\|FUNC\|VIRTUAL\|ABSTRACT\|DEFINE\|REPLACE\|FINAL\|PROC\|MAIN\|NEW\|ENUM\|CLASS\|INTERFACE\|BITS\|MODULE\|SHARED\)\>'
     let plindent += &sw
   endif
   if thisline =~ '^\s*\(}\|ELSEIF\>\|ELSE\>\|CATCH\|FINALLY\|GENERATE_ELSEIF\>\|GENERATE_ELSE\>\|UNTIL\>\)'
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
index 75275785fb..bb5a492512 100644
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types in scripts
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2010 Sep 22
+" Last change:	2012 Aug 30
 
 " This file is called by an autocommand for every file that has just been
 " loaded into a buffer.  It checks if the type of file can be recognized by
@@ -198,7 +198,8 @@ else
     " - "=== ", line of "=", "---", "+++ " (SVK diff)
     " - "=== ", "--- ", "+++ " (bzr diff, common case)
     " - "=== (removed|added|renamed|modified)" (bzr diff, alternative)
-  elseif s:line1 =~ '^\(diff\>\|Only in \|\d\+\(,\d\+\)\=[cda]\d\+\>\|# It was generated by makepatch \|Index:\s\+\f\+\r\=$\|===== \f\+ \d\+\.\d\+ vs edited\|==== //\f\+#\d\+\)'
+    " - "# HG changeset patch" in first line (Mercurial export format)
+  elseif s:line1 =~ '^\(diff\>\|Only in \|\d\+\(,\d\+\)\=[cda]\d\+\>\|# It was generated by makepatch \|Index:\s\+\f\+\r\=$\|===== \f\+ \d\+\.\d\+ vs edited\|==== //\f\+#\d\+\|# HG changeset patch\)'
 	\ || (s:line1 =~ '^--- ' && s:line2 =~ '^+++ ')
 	\ || (s:line1 =~ '^\* looking for ' && s:line2 =~ '^\* comparing to ')
 	\ || (s:line1 =~ '^\*\*\* ' && s:line2 =~ '^--- ')
diff --git a/runtime/syntax/cl.vim b/runtime/syntax/cl.vim
index 343d2601d1..ccea2ee5ce 100644
--- a/runtime/syntax/cl.vim
+++ b/runtime/syntax/cl.vim
@@ -1,25 +1,25 @@
 " Vim syntax file
-" Language:		CL
-"			(pronounced alphabetically, and NOT known as Clever)
-"			(CL was created by Multibase, http://www.mbase.com.au)
+" Language:				CL
+" 					(pronounced alphabetically, and NOT known as Clever)
+" 					(CL was created by Multibase, http://www.mbase.com.au)
 " Filename extensions:	*.ent
-"			*.eni
+"					*.eni
 " Maintainer:		Philip Uren	<philuSPAX@ieee.org> Remove SPAX spam block
-" Version:              4
-" Last Change:		May 11 2012
+" Version:              5
+" Last Change:		Aug 16 2012
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 if version < 600
-    syntax clear
+	syntax clear
 elseif exists("b:current_syntax")
-    finish
+	finish
 endif
 
 if version >= 600
-    setlocal iskeyword=@,48-57,_,-,
+	setlocal iskeyword=@,48-57,_,-,
 else
-    set iskeyword=@,48-57,_,-,
+	set iskeyword=@,48-57,_,-,
 endif
 
 syn case ignore
@@ -27,87 +27,87 @@ syn case ignore
 syn sync lines=300
 
 "If/else/elsif/endif and while/wend mismatch errors
-syn match   clifError	    "\<wend\>"
-syn match   clifError	    "\<elsif\>"
-syn match   clifError	    "\<else\>"
-syn match   clifError	    "\<endif\>"
+syn match	clifError	"\<wend\>"
+syn match	clifError	"\<elsif\>"
+syn match	clifError	"\<else\>"
+syn match	clifError	"\<endif\>"
 
-syn match   clSpaceError    "\s\+$"
+syn match	clSpaceError	"\s\+$"
 
 " If and while regions
-syn region  clLoop	transparent matchgroup=clWhile start="\<while\>" matchgroup=clWhile end="\<wend\>" contains=ALLBUT,clBreak,clProcedure
-syn region  clIf	transparent matchgroup=clConditional start="\<if\>" matchgroup=clConditional end="\<endif\>"   contains=ALLBUT,clBreak,clProcedure
+syn region	clLoop		transparent matchgroup=clWhile start="\<while\>" matchgroup=clWhile end="\<wend\>" contains=ALLBUT,clBreak,clProcedure
+syn region	clIf		transparent matchgroup=clConditional start="\<if\>" matchgroup=clConditional end="\<endif\>"   contains=ALLBUT,clBreak,clProcedure
 
 " Make those TODO notes and debugging stand out!
-syn keyword clTodo	contained   TODO BUG DEBUG FIX
-syn match   clNeedsWork	contained   "NEED[S]*\s\s*WORK"
-syn keyword clDebug	contained   debug
+syn keyword	clTodo		contained	TODO BUG DEBUG FIX
+syn match	clNeedsWork	contained	"NEED[S]*\s\s*WORK"
+syn keyword	clDebug		contained	debug
 
-syn match   clComment	"#.*$"	    contains=clTodo,clNeedsWork
-syn region  clProcedure	oneline	    start="^\s*[{}]" end="$"
-syn match   clInclude	"^\s*include\s.*"
+syn match	clComment	"#.*$"		contains=clTodo,clNeedsWork,@Spell
+syn region	clProcedure	oneline		start="^\s*[{}]" end="$"
+syn match	clInclude	"^\s*include\s.*"
 
 " We don't put "debug" in the clSetOptions;
 " we contain it in clSet so we can make it stand out.
-syn keyword clSetOptions    transparent aauto abort align convert E fill fnum goback hangup justify null_exit output rauto rawprint rawdisplay repeat skip tab trim
-syn match   clSet	"^\s*set\s.*" contains=clSetOptions,clDebug
+syn keyword	clSetOptions	transparent aauto abort align convert E fill fnum goback hangup justify null_exit output rauto rawprint rawdisplay repeat skip tab trim
+syn match	clSet		"^\s*set\s.*" contains=clSetOptions,clDebug
 
-syn match   clPreProc	"^\s*#P.*"
+syn match	clPreProc	"^\s*#P.*"
 
-syn keyword clConditional   else elsif
-syn keyword clWhile	continue endloop
+syn keyword	clConditional	else elsif
+syn keyword	clWhile		continue endloop
 " 'break' needs to be a region so we can sync on it above.
-syn region  clBreak	oneline start="^\s*break" end="$"
+syn region	clBreak		oneline start="^\s*break" end="$"
 
-syn match   clOperator	"[!;|)(:.><+*=-]"
+syn match	clOperator	"[!;|)(:.><+*=-]"
 
-syn match   clNumber	"\<\d\+\(u\=l\=\|lu\|f\)\>"
+syn match	clNumber	"\<\d\+\(u\=l\=\|lu\|f\)\>"
 
-syn region  clString	matchgroup=clQuote  start=+"+ end=+"+	skip=+\\"+
-syn region  clString	matchgroup=clQuote  start=+'+ end=+'+	skip=+\\'+
+syn region	clString	matchgroup=clQuote	start=+"+ end=+"+	skip=+\\"+ contains=@Spell
+syn region	clString	matchgroup=clQuote	start=+'+ end=+'+	skip=+\\'+ contains=@Spell
 
-syn keyword clReserved	ERROR EXIT INTERRUPT LOCKED LREPLY MODE MCOL MLINE MREPLY NULL REPLY V1 V2 V3 V4 V5 V6 V7 V8 V9 ZERO BYPASS GOING_BACK AAUTO ABORT ABORT ALIGN BIGE CONVERT FNUM GOBACK HANGUP JUSTIFY NEXIT OUTPUT RAUTO RAWDISPLAY RAWPRINT REPEAT SKIP TAB TRIM LCOUNT PCOUNT PLINES SLINES SCOLS MATCH LMATCH
+syn keyword	clReserved	ERROR EXIT INTERRUPT LOCKED LREPLY MODE MCOL MLINE MREPLY NULL REPLY V1 V2 V3 V4 V5 V6 V7 V8 V9 ZERO BYPASS GOING_BACK AAUTO ABORT ABORT ALIGN BIGE CONVERT FNUM GOBACK HANGUP JUSTIFY NEXIT OUTPUT RAUTO RAWDISPLAY RAWPRINT REPEAT SKIP TAB TRIM LCOUNT PCOUNT PLINES SLINES SCOLS MATCH LMATCH
 
-syn keyword clFunction	asc asize chr name random slen srandom day getarg getcgi getenv lcase scat sconv sdel skey smult srep substr sword trim ucase match
+syn keyword	clFunction	asc asize chr name random slen srandom day getarg getcgi getenv lcase scat sconv sdel skey smult srep substr sword trim ucase match
 
-syn keyword clStatement	clear clear_eol clear_eos close copy create unique with where empty define define ldefine delay_form delete escape exit_block exit_do exit_process field fork format get getfile getnext getprev goto head join maintain message no_join on_eop on_key on_exit on_delete openin openout openapp pause popenin popenout popenio print put range read redisplay refresh restart_block screen select sleep text unlock write and not or do
+syn keyword	clStatement	clear clear_eol clear_eos close copy create unique with where empty define define ldefine delay_form delete escape exit_block exit_do exit_process field fork format get getfile getnext getprev goto head join maintain message no_join on_eop on_key on_exit on_delete openin openout openapp pause popenin popenout popenio print put range read redisplay refresh restart_block screen select sleep text unlock write and not or do
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
 " For version 5.8 and later: only when an item doesn't have highlighting yet
-if  version >= 508 || !exists("did_cl_syntax_inits")
-    if	version < 508
-	let did_cl_syntax_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
+if	version >= 508 || !exists("did_cl_syntax_inits")
+	if	version < 508
+		let did_cl_syntax_inits = 1
+		command -nargs=+ HiLink hi link <args>
+	else
+		command -nargs=+ HiLink hi def link <args>
+	endif
 
-    HiLink clifError	Error
-    HiLink clSpaceError	Error
-    HiLink clWhile	Repeat
-    HiLink clConditional    Conditional
-    HiLink clDebug	Debug
-    HiLink clNeedsWork	Todo
-    HiLink clTodo	Todo
-    HiLink clComment	Comment
-    HiLink clProcedure	Procedure
-    HiLink clBreak	Procedure
-    HiLink clInclude	Include
-    HiLink clSetOption	Statement
-    HiLink clSet	Identifier
-    HiLink clPreProc	PreProc
-    HiLink clOperator	Operator
-    HiLink clNumber	Number
-    HiLink clString	String
-    HiLink clQuote	Delimiter
-    HiLink clReserved	Identifier
-    HiLink clFunction	Function
-    HiLink clStatement	Statement
+	HiLink clifError	Error
+	HiLink clSpaceError	Error
+	HiLink clWhile		Repeat
+	HiLink clConditional	Conditional
+	HiLink clDebug		Debug
+	HiLink clNeedsWork	Todo
+	HiLink clTodo		Todo
+	HiLink clComment	Comment
+	HiLink clProcedure	Procedure
+	HiLink clBreak		Procedure
+	HiLink clInclude	Include
+	HiLink clSetOption	Statement
+	HiLink clSet		Identifier
+	HiLink clPreProc	PreProc
+	HiLink clOperator	Operator
+	HiLink clNumber		Number
+	HiLink clString		String
+	HiLink clQuote		Delimiter
+	HiLink clReserved	Identifier
+	HiLink clFunction	Function
+	HiLink clStatement	Statement
 
-    delcommand HiLink
+	delcommand HiLink
 endif
 
 let b:current_syntax = "cl"
 
-" vim: ts=8 sw=4
+" vim: ts=8 sw=8
diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim
index c2c83570ab..324dce3cc8 100644
--- a/runtime/syntax/css.vim
+++ b/runtime/syntax/css.vim
@@ -1,10 +1,11 @@
 " Vim syntax file
-" Language:	Cascading Style Sheets
-" Maintainer:	Claudio Fleiner <claudio@fleiner.com>
-" URL:		http://www.fleiner.com/vim/syntax/css.vim
-" Last Change:	2011 Dec 14
-" CSS2 by Nikolai Weibull
-" Full CSS2, HTML4 support by Yeti
+" Language:     Cascading Style Sheets
+" Previous Contributor List:
+"               Claudio Fleiner <claudio@fleiner.com> (Maintainer)
+"               Yeti            (Add full CSS2, HTML4 support)
+"               Nikolai Weibull (Add CSS2 support)
+" Maintainer:   Jules Wang      <w.jq0722@gmail.com>
+" Last Change:  2012 Aug 21
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -19,6 +20,7 @@ endif
 
 syn case ignore
 
+" All HTML4 tags
 syn keyword cssTagName abbr acronym address applet area a b base
 syn keyword cssTagName basefont bdo big blockquote body br button
 syn keyword cssTagName caption center cite code col colgroup dd del
@@ -27,32 +29,51 @@ syn keyword cssTagName frameset h1 h2 h3 h4 h5 h6 head hr html img i
 syn keyword cssTagName iframe img input ins isindex kbd label legend li
 syn keyword cssTagName link map menu meta noframes noscript ol optgroup
 syn keyword cssTagName option p param pre q s samp script select small
-syn keyword cssTagName span strike strong style sub sup tbody td
+syn keyword cssTagName span strike strong style sub sup table tbody td
 syn keyword cssTagName textarea tfoot th thead title tr tt ul u var
-syn match cssTagName "\<table\>"
+syn keyword cssTagName object
+
+" HTML5 new tags 5*6=30
+syn keyword cssTagName article aside audio bdi canvas command
+syn keyword cssTagName datalist details embed figcaption figure footer
+syn keyword cssTagName header hgroup keygen mark meter nav
+syn keyword cssTagName output progress rt rp ruby section
+syn keyword cssTagName source summary time track video wbr
+
+" Tags not supported in HTML5
+syn keyword cssDeprecated acronym applet basefont big center dir
+syn keyword cssDeprecated font frame frameset noframes strike tt
+
+"syn match cssTagName "\<table\>"
 syn match cssTagName "\*"
 
-syn match cssTagName "@page\>" nextgroup=cssDefinition
-
-syn match cssSelectorOp "[+>.]"
-syn match cssSelectorOp2 "[~|]\?=" contained
+" selectors
+syn match cssSelectorOp "[,>+]"
+syn match cssSelectorOp2 "[~|^$*]\?=" contained
+" FIXME: add HTML5 attribute
 syn region cssAttributeSelector matchgroup=cssSelectorOp start="\[" end="]" transparent contains=cssUnicodeEscape,cssSelectorOp2,cssStringQ,cssStringQQ
 
+" .class and #id
+syn match cssClassName "\.[A-Za-z][A-Za-z0-9_-]\+"
+
 try
 syn match cssIdentifier "#[A-Za-zÀ-ÿ_@][A-Za-zÀ-ÿ0-9_@-]*"
 catch /^.*/
 syn match cssIdentifier "#[A-Za-z_@][A-Za-z0-9_@-]*"
 endtry
 
+syn match cssTagName "@page\>" nextgroup=cssDefinition
+" FIXME: use cssVendor here
+syn match cssTagName "@\(-\(webkit\|moz\|o\|ms\)-\)\=keyframes\>" nextgroup=cssDefinition
 
 syn match cssMedia "@media\>" nextgroup=cssMediaType skipwhite skipnl
 syn keyword cssMediaType contained screen print aural braile embosed handheld projection ty tv all nextgroup=cssMediaComma,cssMediaBlock skipwhite skipnl
-syn match cssMediaComma "," nextgroup=cssMediaType skipwhite skipnl
+"syn match cssMediaComma "," nextgroup=cssMediaType skipwhite skipnl
 syn region cssMediaBlock transparent matchgroup=cssBraces start='{' end='}' contains=cssTagName,cssError,cssComment,cssDefinition,cssURL,cssUnicodeEscape,cssIdentifier
 
 syn match cssValueInteger contained "[-+]\=\d\+"
 syn match cssValueNumber contained "[-+]\=\d\+\(\.\d*\)\="
-syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\)"
+syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\)"
 syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)"
 syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)"
 syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)"
@@ -73,20 +94,78 @@ syn keyword cssColor contained aqua black blue fuchsia gray green lime maroon na
 syn case match
 syn keyword cssColor contained ActiveBorder ActiveCaption AppWorkspace ButtonFace ButtonHighlight ButtonShadow ButtonText CaptionText GrayText Highlight HighlightText InactiveBorder InactiveCaption InactiveCaptionText InfoBackground InfoText Menu MenuText Scrollbar ThreeDDarkShadow ThreeDFace ThreeDHighlight ThreeDLightShadow ThreeDShadow Window WindowFrame WindowText Background
 syn case ignore
+
+syn match cssImportant contained "!\s*important\>"
+
 syn match cssColor contained "\<transparent\>"
 syn match cssColor contained "\<white\>"
 syn match cssColor contained "#[0-9A-Fa-f]\{3\}\>"
 syn match cssColor contained "#[0-9A-Fa-f]\{6\}\>"
-"syn match cssColor contained "\<rgb\s*(\s*\d\+\(\.\d*\)\=%\=\s*,\s*\d\+\(\.\d*\)\=%\=\s*,\s*\d\+\(\.\d*\)\=%\=\s*)"
+
 syn region cssURL contained matchgroup=cssFunctionName start="\<url\s*(" end=")" oneline keepend
-syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgb\|clip\|attr\|counter\|rect\)\s*(" end=")" oneline keepend
+syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgb\|clip\|attr\|counter\|rect\|cubic-bezier\)\s*(" end=")" oneline keepend
+syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgba\|hsl\|hsla\)\s*(" end=")" oneline keepend
+syn region cssFunction contained matchgroup=cssFunctionName start="\<\(linear\|radial\)-gradient\s*(" end=")" oneline keepend
+syn region cssFunction contained matchgroup=cssFunctionName start="\<\(matrix\(3d\)\=\|scale\(3d\|X\|Y|\Z\)\=\|translate\(3d\|X\|Y|\Z\)\=\|skew\(X\|Y\)\=\|rotate\(3d\|X\|Y|\Z\)\=\|perspective\)\s*(" end=")" oneline keepend
 
-syn match cssImportant contained "!\s*important\>"
-
-syn keyword cssCommonAttr contained auto none inherit
+" Prop and Attr
+" Reference: http://www.w3schools.com/cssref/default.asp
+syn keyword cssCommonAttr contained auto none inherit all
 syn keyword cssCommonAttr contained top bottom
 syn keyword cssCommonAttr contained medium normal
 
+
+syn match cssAnimationProp contained "\<animation\(-\(name\|duration\|timing-function\|delay\|iteration-cout\|play-state\)\)\=\>"
+
+
+syn keyword cssAnimationAttr contained infinite alternate paused running
+" bugfix: escape linear-gradient
+syn match cssAnimationAttr contained "\<linear\(-gradient\)\@!\>"
+syn match cssAnimationAttr contained "\<ease\(-\(in-out\|out\|in\)\)\=\>"
+
+syn match cssBackgroundProp contained "\<background\(-\(color\|image\|attachment\|position\|clip\|origin\|size\)\)\=\>"
+syn keyword cssBackgroundAttr contained center fixed over contain
+syn match cssBackgroundAttr contained "\<no-repeat\>"
+syn match cssBackgroundAttr contained "\<repeat\(-[xy]\)\=\>"
+syn match cssBackgroundAttr contained "\<\(border\|content\|padding\)-box\>"
+
+
+syn match cssBorderOutlineProp contained "\<border\(-\(top\|right\|bottom\|left\)\)\=\(-\(width\|color\|style\)\)\=\>"
+syn match cssBorderOutlineProp contained "\<outline\(-\(width\|style\|color\)\)\=\>"
+syn match cssBorderOutlineProp contained "\<border-\(top\|bottom\)-\(left\|right\)\(-radius\)\=\>"
+syn match cssBorderOutlineProp contained "\<border-image\(-\(outset\|repeat\|slice\|source\|width\)\)\=\>"
+syn match cssBorderOutlineProp contained "\<border-radius\>"
+syn keyword cssBorderOutlineAttr contained thin thick medium
+syn keyword cssBorderOutlineAttr contained dotted dashed solid double groove ridge inset outset
+syn keyword cssBorderOutlineAttr contained hidden visible scroll collapse
+syn keyword cssBorderOutlineAttr contained stretch round
+
+
+syn match cssBoxProp contained "\<overflow\(-\(x\|y\|style\)\)\=\>"
+syn match cssBoxProp contained "\<rotation\(-point\)=\>"
+syn keyword cssBoxAttr contained visible hidden scroll auto
+syn match cssBoxAttr contained "\<no-\(display\|content\)\>"
+
+syn keyword cssColorProp contained opacity
+syn match cssColorProp contained "\<color-profile\>"
+syn match cssColorProp contained "\<rendering-intent\>"
+
+
+syn match cssDimensionProp contained "\<\(min\|max\)-\(width\|height\)\>"
+syn keyword cssDimensionProp contained height
+syn keyword cssDimensionProp contained width
+
+" shadow and sizing are in other property groups
+syn match cssFlexibleBoxProp contained "\<box-\(align\|direction\|flex\|ordinal-group\|orient\|pack\|shadow\|sizing\)\>"
+syn keyword cssFlexibleBoxAttr contained start end center baseline stretch
+syn keyword cssFlexibleBoxAttr contained normal reverse
+syn keyword cssFlexibleBoxAttr contained single mulitple
+syn keyword cssFlexibleBoxAttr contained horizontal
+" bugfix: escape vertial-align
+syn match cssFlexibleBoxAttr contained "\<vertical\(-align\)\@!\>"
+syn match cssFlexibleBoxAttr contained "\<\(inline\|block\)-axis\>"
+
+
 syn match cssFontProp contained "\<font\(-\(family\|style\|variant\|weight\|size\(-adjust\)\=\|stretch\)\)\=\>"
 syn match cssFontAttr contained "\<\(sans-\)\=\<serif\>"
 syn match cssFontAttr contained "\<small\(-\(caps\|caption\)\)\=\>"
@@ -95,67 +174,92 @@ syn match cssFontAttr contained "\<message-box\>"
 syn match cssFontAttr contained "\<status-bar\>"
 syn match cssFontAttr contained "\<\(\(ultra\|extra\|semi\|status-bar\)-\)\=\(condensed\|expanded\)\>"
 syn keyword cssFontAttr contained cursive fantasy monospace italic oblique
-syn keyword cssFontAttr contained bold bolder lighter larger smaller
-syn keyword cssFontAttr contained icon menu
-syn match cssFontAttr contained "\<caption\>"
-syn keyword cssFontAttr contained large smaller larger
-syn keyword cssFontAttr contained narrower wider
+syn keyword cssFontAttr contained bold bolder light lighter larger smaller
+syn keyword cssFontAttr contained icon menu caption
+syn keyword cssFontAttr contained large smaller larger narrower wider
+syn keyword cssFontAttr contained Courier Arial Georgia Times
 
-syn keyword cssColorProp contained color
-syn match cssColorProp contained "\<background\(-\(color\|image\|attachment\|position\)\)\=\>"
-syn keyword cssColorAttr contained center scroll fixed
-syn match cssColorAttr contained "\<repeat\(-[xy]\)\=\>"
-syn match cssColorAttr contained "\<no-repeat\>"
 
+syn keyword cssGeneratedContentProp contained content quotes crop
+syn match cssGeneratedContentProp contained "\<counter-\(reset\|increment\)\>"
+syn match cssGeneratedContentProp contained "\<move-to\>"
+syn match cssGeneratedContentProp contained "\<page-policy\>"
+syn match cssGeneratedContentAttr contained "\<\(no-\)\=\(open\|close\)-quote\>"
+
+
+syn match cssGridProp contained "\<grid-\(columns\|rows\)\>"
+
+syn match cssHyerlinkProp contained "\<target\(-\(name\|new\|position\)\)\=\>"
+
+syn match cssListProp contained "\<list-style\(-\(type\|position\|image\)\)\=\>"
+syn match cssListAttr contained "\<\(lower\|upper\)-\(roman\|alpha\|greek\|latin\)\>"
+syn match cssListAttr contained "\<\(hiragana\|katakana\)\(-iroha\)\=\>"
+syn match cssListAttr contained "\<\(decimal\(-leading-zero\)\=\|cjk-ideographic\)\>"
+syn keyword cssListAttr contained disc circle square hebrew armenian georgian
+syn keyword cssListAttr contained inside outside
+
+
+syn match cssMarginProp contained "\<margin\(-\(top\|right\|bottom\|left\)\)\=\>"
+
+syn match cssMultiColumnProp contained "\<column\(-\(\break-\(after\|before\)\|count\|gap\|rule\(-\(color\|style\|width\)\)\=\)\|span\|width\)\=\>"
+
+
+syn match cssPaddingProp contained "\<padding\(-\(top\|right\|bottom\|left\)\)\=\>"
+
+syn keyword cssPositioningProp contained bottom clear clip display float left
+syn keyword cssPositioningProp contained position right top visibility
+syn match cssPositioningProp contained "\<z-index\>"
+syn keyword cssPositioningAttr contained block inline compact
+syn match cssPositioningAttr contained "\<table\(-\(row-gorup\|\(header\|footer\)-group\|row\|column\(-group\)\=\|cell\|caption\)\)\=\>"
+syn keyword cssPositioningAttr contained left right both
+syn match cssPositioningAttr contained "\<list-item\>"
+syn match cssPositioningAttr contained "\<inline-\(block\|table\)\>"
+syn keyword cssPositioningAttr contained static relative absolute fixed
+
+syn match cssPrintProp contained "\<page\(-break-\(before\|after\|inside\)\)\=\>"
+syn keyword cssPrintProp contained orphans widows
+syn keyword cssPrintAttr contained landscape portrait crop cross always avoid
+
+syn match cssTableProp contained "\<\(caption-side\|table-layout\|border-collapse\|border-spacing\|empty-cells\)\>"
+syn keyword cssTableAttr contained fixed collapse separate show hide once always
+
+
+syn keyword cssTextProp contained color direction
 syn match cssTextProp "\<\(\(word\|letter\)-spacing\|text\(-\(decoration\|transform\|align\|index\|shadow\)\)\=\|vertical-align\|unicode-bidi\|line-height\)\>"
+syn match cssTextProp contained "\<text-\(justify\|\outline\|overflow\|warp\|align-last\)\>"
+syn match cssTextProp contained "\<word-\(break\|\wrap\)\>"
+syn match cssTextProp contained "\<white-space\>"
+syn match cssTextProp contained "\<hanging-punctuation\>"
+syn match cssTextProp contained "\<punctuation-trim\>"
 syn match cssTextAttr contained "\<line-through\>"
 syn match cssTextAttr contained "\<text-indent\>"
 syn match cssTextAttr contained "\<\(text-\)\=\(top\|bottom\)\>"
+syn keyword cssTextAttr contained ltr rtl embed nowrap
 syn keyword cssTextAttr contained underline overline blink sub super middle
-syn keyword cssTextAttr contained capitalize uppercase lowercase center justify baseline sub super
+syn keyword cssTextAttr contained capitalize uppercase lowercase
+syn keyword cssTextAttr contained center justify baseline sub super
+syn match cssTextAttr contained "\<pre\(-\(line\|wrap\)\)\=\>"
+syn match cssTextAttr contained "\<\(allow\|force\)-end\>"
+syn keyword cssTextAttr contained start end adjacent
+syn match cssTextAttr contained "\<inter-\(word\|ideographic\|cluster\)\>"
+syn keyword cssTextAttr contained distribute kashida first last
+syn keyword cssTextAttr contained clip ellipsis unrestricted suppress
+syn match cssTextAttr contained "\<break-all\>"
+syn match cssTextAttr contained "\<break-word\>"
+syn keyword cssTextAttr contained hyphenate
 
-syn match cssBoxProp contained "\<\(margin\|padding\|border\)\(-\(top\|right\|bottom\|left\)\)\=\>"
-syn match cssBoxProp contained "\<border-\(\(\(top\|right\|bottom\|left\)-\)\=\(width\|color\|style\)\)\=\>"
-syn match cssBoxProp contained "\<\(width\|z-index\)\>"
-syn match cssBoxProp contained "\<\(min\|max\)-\(width\|height\)\>"
-syn keyword cssBoxProp contained width height float clear overflow clip visibility
-syn keyword cssBoxAttr contained thin thick both
-syn keyword cssBoxAttr contained dotted dashed solid double groove ridge inset outset
-syn keyword cssBoxAttr contained hidden visible scroll collapse
 
-syn keyword cssGeneratedContentProp contained content quotes
-syn match cssGeneratedContentProp contained "\<counter-\(reset\|increment\)\>"
-syn match cssGeneratedContentProp contained "\<list-style\(-\(type\|position\|image\)\)\=\>"
-syn match cssGeneratedContentAttr contained "\<\(no-\)\=\(open\|close\)-quote\>"
-syn match cssAuralAttr contained "\<lower\>"
-syn match cssGeneratedContentAttr contained "\<\(lower\|upper\)-\(roman\|alpha\|greek\|latin\)\>"
-syn match cssGeneratedContentAttr contained "\<\(hiragana\|katakana\)\(-iroha\)\=\>"
-syn match cssGeneratedContentAttr contained "\<\(decimal\(-leading-zero\)\=\|cjk-ideographic\)\>"
-syn keyword cssGeneratedContentAttr contained disc circle square hebrew armenian georgian
-syn keyword cssGeneratedContentAttr contained inside outside
+syn match cssTransformProp contained "\<transform\(-\(origin\|style\)\)\=\>"
+syn match cssTransformProp contained "\<perspective\(-origin\)\=\>"
+syn match cssTransformProp contained "\<backface-visibility\>"
 
-syn match cssPagingProp contained "\<page\(-break-\(before\|after\|inside\)\)\=\>"
-syn keyword cssPagingProp contained size marks inside orphans widows
-syn keyword cssPagingAttr contained landscape portrait crop cross always avoid
-
-syn keyword cssUIProp contained cursor
-syn match cssUIProp contained "\<outline\(-\(width\|style\|color\)\)\=\>"
-syn match cssUIAttr contained "\<[ns]\=[ew]\=-resize\>"
-syn keyword cssUIAttr contained default crosshair pointer move wait help
-syn keyword cssUIAttr contained thin thick
-syn keyword cssUIAttr contained dotted dashed solid double groove ridge inset outset
-syn keyword cssUIAttr contained invert
-
-syn match cssRenderAttr contained "\<marker\>"
-syn match cssRenderProp contained "\<\(display\|marker-offset\|unicode-bidi\|white-space\|list-item\|run-in\|inline-table\)\>"
-syn keyword cssRenderProp contained position top bottom direction
-syn match cssRenderProp contained "\<\(left\|right\)\>"
-syn keyword cssRenderAttr contained block inline compact
-syn match cssRenderAttr contained "\<table\(-\(row-gorup\|\(header\|footer\)-group\|row\|column\(-group\)\=\|cell\|caption\)\)\=\>"
-syn keyword cssRenderAttr contained static relative absolute fixed
-syn keyword cssRenderAttr contained ltr rtl embed bidi-override pre nowrap
-syn match cssRenderAttr contained "\<bidi-override\>"
+syn match cssTransitionProp contained "\<transition\(-\(delay\|duration\|property\|timing-function\)\)\=\>"
 
+syn match cssUIProp contained "\<nav-\(down\|index\|left\|right\|up\)\=\>"
+syn match cssUIProp contained "\<outline-offset\>"
+syn match cssUIProp contained "\<box-sizing\>"
+syn keyword cssUIProp contained appearance icon resize
+syn keyword cssUIAttr contained window button menu field
 
 syn match cssAuralProp contained "\<\(pause\|cue\)\(-\(before\|after\)\)\=\>"
 syn match cssAuralProp contained "\<\(play-during\|speech-rate\|voice-family\|pitch\(-range\)\=\|speak\(-\(punctuation\|numerals\)\)\=\)\>"
@@ -171,30 +275,54 @@ syn keyword cssAuralAttr contained below level above higher
 syn match cssAuralAttr contained "\<\(x-\)\=\(slow\|fast\)\>"
 syn keyword cssAuralAttr contained faster slower
 syn keyword cssAuralAttr contained male female child code digits continuous
+syn match cssAuralAttr contained "\<lower\>"
+
+" cursor
+syn keyword cssUIProp contained cursor
+syn match cssUIAttr contained "\<[ns]\=[ew]\=-resize\>"
+syn keyword cssUIAttr contained crosshair default help move pointer
+syn keyword cssUIAttr contained progress wait
+
+" FIXME: I could not find them in reference
+syn keyword cssUIAttr contained invert maker size zoom
+syn match cssRenderAttr contained "\<run-in\>"
+syn match cssRenderAttr contained "\<text-rendering\>"
+syn match cssRenderAttr contained "\<font-smoothing\>"
+syn match cssRenderProp contained "\<marker-offset\>"
+syn match cssRenderAttr contained "\<bidi-override\>"
 
-syn match cssTableProp contained "\<\(caption-side\|table-layout\|border-collapse\|border-spacing\|empty-cells\|speak-header\)\>"
-syn keyword cssTableAttr contained fixed collapse separate show hide once always
 
 " FIXME: This allows cssMediaBlock before the semicolon, which is wrong.
 syn region cssInclude start="@import" end=";" contains=cssComment,cssURL,cssUnicodeEscape,cssMediaType
 syn match cssBraces contained "[{}]"
 syn match cssError contained "{@<>"
-syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape
+syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition
 syn match cssBraceError "}"
 
+" Pseudo class
 syn match cssPseudoClass ":[A-Za-z0-9_-]*" contains=cssPseudoClassId,cssUnicodeEscape
-syn keyword cssPseudoClassId contained link visited active hover focus before after left right
+syn keyword cssPseudoClassId link visited active hover focus before after left right lang
 syn match cssPseudoClassId contained "\<first\(-\(line\|letter\|child\)\)\=\>"
-syn region cssPseudoClassLang matchgroup=cssPseudoClassId start=":lang(" end=")" oneline
+" FIXME: handle functions.
+"syn region cssPseudoClassLang matchgroup=cssPseudoClassId start="lang(" end=")"
+syn match cssPseudoClassId contained "\<\(last\|only\|nth\|nth-last\)-child\>"
+syn match cssPseudoClassId contained "\<\(first\|last\|only\|nth\|nth-last\)-of-type\>"
+syn keyword cssPseudoClassId root empty target enable disabled checked not invalid
+syn match cssPseudoClassId contained  "::\(-moz-\)\=selection"
 
+" Comment
 syn region cssComment start="/\*" end="\*/" contains=@Spell
+syn region cssComment start="//" skip="\\$" end="$" keepend contains=@Spell
 
 syn match cssUnicodeEscape "\\\x\{1,6}\s\?"
 syn match cssSpecialCharQQ +\\"+ contained
 syn match cssSpecialCharQ +\\'+ contained
 syn region cssStringQQ start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=cssUnicodeEscape,cssSpecialCharQQ
 syn region cssStringQ start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=cssUnicodeEscape,cssSpecialCharQ
-syn match cssClassName "\.[A-Za-z][A-Za-z0-9_-]\+"
+
+" Vendor Prefix
+syn match cssVendor contained "\(-\(webkit\|moz\|o\|ms\)-\)"
+
 
 if main_syntax == "css"
   syn sync minlines=10
@@ -212,31 +340,75 @@ if version >= 508 || !exists("did_css_syn_inits")
   endif
 
   HiLink cssComment Comment
+  HiLink cssVendor Comment
   HiLink cssTagName Statement
+  HiLink cssDeprecated Error
   HiLink cssSelectorOp Special
   HiLink cssSelectorOp2 Special
-  HiLink cssFontProp StorageClass
-  HiLink cssColorProp StorageClass
-  HiLink cssTextProp StorageClass
+
+  HiLink cssAnimationProp StorageClass
+  HiLink cssBackgroundProp StorageClass
+  HiLink cssBorderOutlineProp StorageClass
   HiLink cssBoxProp StorageClass
-  HiLink cssRenderProp StorageClass
+  HiLink cssColorProp StorageClass
+  HiLink cssContentForPagedMediaProp StorageClass
+  HiLink cssDimensionProp StorageClass
+  HiLink cssFlexibleBoxProp StorageClass
+  HiLink cssFontProp StorageClass
+  HiLink cssGeneratedContentProp StorageClass
+  HiLink cssGridProp StorageClass
+  HiLink cssHyerlinkProp StorageClass
+  HiLink cssLineboxProp StorageClass
+  HiLink cssListProp StorageClass
+  HiLink cssMarginProp StorageClass
+  HiLink cssMarqueeProp StorageClass
+  HiLink cssMultiColumnProp StorageClass
+  HiLink cssPaddingProp StorageClass
+  HiLink cssPagedMediaProp StorageClass
+  HiLink cssPositioningProp StorageClass
+  HiLink cssPrintProp StorageClass
+  HiLink cssRubyProp StorageClass
+  HiLink cssSpeechProp StorageClass
+  HiLink cssTableProp StorageClass
+  HiLink cssTextProp StorageClass
+  HiLink cssTransformProp StorageClass
+  HiLink cssTransitionProp StorageClass
+  HiLink cssUIProp StorageClass
   HiLink cssAuralProp StorageClass
   HiLink cssRenderProp StorageClass
-  HiLink cssGeneratedContentProp StorageClass
-  HiLink cssPagingProp StorageClass
-  HiLink cssTableProp StorageClass
-  HiLink cssUIProp StorageClass
-  HiLink cssFontAttr Type
-  HiLink cssColorAttr Type
-  HiLink cssTextAttr Type
+
+  HiLink cssAnimationAttr Type
+  HiLink cssBackgroundAttr Type
+  HiLink cssBorderOutlineAttr Type
   HiLink cssBoxAttr Type
-  HiLink cssRenderAttr Type
-  HiLink cssAuralAttr Type
+  HiLink cssColorAttr Type
+  HiLink cssContentForPagedMediaAttr Type
+  HiLink cssDimensionAttr Type
+  HiLink cssFlexibleBoxAttr Type
+  HiLink cssFontAttr Type
   HiLink cssGeneratedContentAttr Type
-  HiLink cssPagingAttr Type
+  HiLink cssGridAttr Type
+  HiLink cssHyerlinkAttr Type
+  HiLink cssLineboxAttr Type
+  HiLink cssListAttr Type
+  HiLink cssMarginAttr Type
+  HiLink cssMarqueeAttr Type
+  HiLink cssMultiColumnAttr Type
+  HiLink cssPaddingAttr Type
+  HiLink cssPagedMediaAttr Type
+  HiLink cssPositioningAttr Type
+  HiLink cssPrintAttr Type
+  HiLink cssRubyAttr Type
+  HiLink cssSpeechAttr Type
   HiLink cssTableAttr Type
+  HiLink cssTextAttr Type
+  HiLink cssTransformAttr Type
+  HiLink cssTransitionAttr Type
   HiLink cssUIAttr Type
+  HiLink cssAuralAttr Type
+  HiLink cssRenderAttr Type
   HiLink cssCommonAttr Type
+
   HiLink cssPseudoClassId PreProc
   HiLink cssPseudoClassLang Constant
   HiLink cssValueLength Number
diff --git a/runtime/syntax/hgcommit.vim b/runtime/syntax/hgcommit.vim
index e4c8b6ed44..37fe9db8bf 100644
--- a/runtime/syntax/hgcommit.vim
+++ b/runtime/syntax/hgcommit.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	hg (Mercurial) commit file
 " Maintainer:	Ken Takata <kentkt at csc dot jp>
-" Last Change:	2012 Aug 2
+" Last Change:	2012 Aug 23
 " Filenames:	hg-editor-*.txt
 " License:	VIM License
 " URL:		https://github.com/k-takata/hg-vim
@@ -10,12 +10,12 @@ if exists("b:current_syntax")
   finish
 endif
 
-syn match hgcommitComment "^HG:.*$"
-syn match hgcommitUser    "^HG: user: \zs.*$"   contained containedin=hgcommitComment
-syn match hgcommitBranch  "^HG: branch \zs.*$"  contained containedin=hgcommitComment
-syn match hgcommitAdded   "^HG: \zsadded .*$"   contained containedin=hgcommitComment
-syn match hgcommitChanged "^HG: \zschanged .*$" contained containedin=hgcommitComment
-syn match hgcommitRemoved "^HG: \zsremoved .*$" contained containedin=hgcommitComment
+syn match hgcommitComment "^HG:.*$"             contains=@NoSpell
+syn match hgcommitUser    "^HG: user: \zs.*$"   contains=@NoSpell contained containedin=hgcommitComment
+syn match hgcommitBranch  "^HG: branch \zs.*$"  contains=@NoSpell contained containedin=hgcommitComment
+syn match hgcommitAdded   "^HG: \zsadded .*$"   contains=@NoSpell contained containedin=hgcommitComment
+syn match hgcommitChanged "^HG: \zschanged .*$" contains=@NoSpell contained containedin=hgcommitComment
+syn match hgcommitRemoved "^HG: \zsremoved .*$" contains=@NoSpell contained containedin=hgcommitComment
 
 hi def link hgcommitComment Comment
 hi def link hgcommitUser    String
diff --git a/runtime/syntax/progress.vim b/runtime/syntax/progress.vim
index 3ff7723453..190a0f381b 100644
--- a/runtime/syntax/progress.vim
+++ b/runtime/syntax/progress.vim
@@ -3,20 +3,20 @@
 " Filename extensions:	*.p (collides with Pascal),
 "			*.i (collides with assembler)
 "			*.w (collides with cweb)
-" Maintainer:		Philip Uren	    <philuSPAX@ieee.org> Remove SPAX spam block
-" Contributors:         Chris Ruprecht	    <chris@ruprecht.org>
-"			Philip Uren	    <philu@computer.org>
-"			Mikhail Kuperblum   <mikhail@whasup.com>
-"			John Florian	    <jflorian@voyager.net>
-" Version:              11
-" Last Change:		May 11 2012
+" Maintainer:		Philip Uren	<philuSPAX@ieee.org> Remove SPAX spam block
+" Contributors:         Chris Ruprecht	<chris@ruprecht.org>
+"					Philip Uren		<philu@computer.org>
+"					Mikhail Kuperblum	<mikhail@whasup.com>
+"					John Florian		<jflorian@voyager.net>
+" Version:              12
+" Last Change:		Aug 16 2012
 
 " For version 5.x: Clear all syntax item
 " For version 6.x: Quit when a syntax file was already loaded
 if version < 600
-    syntax clear
+	syntax clear
 elseif exists("b:current_syntax")
-    finish
+	finish
 endif
 
 let s:cpo_save = &cpo
@@ -34,7 +34,7 @@ set expandtab
 syn case ignore
 
 " Progress Blocks of code and mismatched "end." errors.
-syn match   ProgressEndError	    "\<end\>"
+syn match   ProgressEndError		"\<end\>"
 syn region ProgressDoBlock transparent matchgroup=ProgressDo start="\<do\>" matchgroup=ProgressDo end="\<end\>" contains=ALLBUT,ProgressProcedure,ProgressFunction
 syn region ProgressForBlock transparent matchgroup=ProgressFor start="\<for\>" matchgroup=ProgressFor end="\<end\>" contains=ALLBUT,ProgressProcedure,ProgressFunction
 syn region ProgressRepeatBlock transparent matchgroup=ProgressRepeat start="\<repeat\>" matchgroup=ProgressRepeat end="\<end\>" contains=ALLBUT,ProgressProcedure,ProgressFunction
@@ -44,20 +44,20 @@ syn region ProgressCaseBlock transparent matchgroup=ProgressCase start="\<case\>
 " and they could go in ProgressReserved,
 " but I found it more helpful to highlight them in a different color.
 syn keyword ProgressConditional	if else then when otherwise
-syn keyword ProgressFor		    each where
+syn keyword ProgressFor				each where
 
 " Make those TODO and debugging notes stand out!
-syn keyword ProgressTodo	    contained	TODO BUG FIX
-syn keyword ProgressDebug	    contained	DEBUG
+syn keyword ProgressTodo			contained	TODO BUG FIX
+syn keyword ProgressDebug			contained	DEBUG
 syn keyword ProgressDebug			debugger
 
 " If you like to highlight the whole line of
 " the start and end of procedures
 " to make the whole block of code stand out:
-syn match ProgressProcedure	"^\s*procedure.*"
-syn match ProgressProcedure	"^\s*end\s\s*procedure.*"
-syn match ProgressFunction	"^\s*function.*"
-syn match ProgressFunction	"^\s*end\s\s*function.*"
+syn match ProgressProcedure		"^\s*procedure.*"
+syn match ProgressProcedure		"^\s*end\s\s*procedure.*"
+syn match ProgressFunction		"^\s*function.*"
+syn match ProgressFunction		"^\s*end\s\s*function.*"
 " ... otherwise use this:
 " syn keyword ProgressFunction	procedure function
 
@@ -99,14 +99,14 @@ syn keyword ProgressReserved	window-maxim[ized] window-minim[ized] window-normal
 " Strings. Handles embedded quotes.
 " Note that, for some reason, Progress doesn't use the backslash, "\"
 " as the escape character; it uses tilde, "~".
-syn region ProgressString   matchgroup=ProgressQuote	start=+"+ end=+"+   skip=+\~'\|\~\~+
-syn region ProgressString   matchgroup=ProgressQuote	start=+'+ end=+'+   skip=+\~'\|\~\~+
+syn region ProgressString	matchgroup=ProgressQuote	start=+"+ end=+"+	skip=+\~'\|\~\~+ contains=@Spell
+syn region ProgressString	matchgroup=ProgressQuote	start=+'+ end=+'+	skip=+\~'\|\~\~+ contains=@Spell
 
 syn match  ProgressIdentifier		"\<[a-zA-Z_][a-zA-Z0-9_]*\>()"
 
 " syn match  ProgressDelimiter		"()"
 
-syn match  ProgressMatrixDelimiter  "[][]"
+syn match  ProgressMatrixDelimiter	"[][]"
 " If you prefer you can highlight the range:
 "syn match  ProgressMatrixDelimiter	"[\d\+\.\.\d\+]"
 
@@ -114,7 +114,7 @@ syn match  ProgressNumber		"\<\-\=\d\+\(u\=l\=\|lu\|f\)\>"
 syn match  ProgressByte			"\$[0-9a-fA-F]\+"
 
 " More values: Logicals, and Progress's unknown value, ?.
-syn match   ProgressNumber		"?"
+syn match   ProgressNumber				"?"
 syn keyword ProgressNumber		true false yes no
 
 " If you don't like tabs:
@@ -123,9 +123,9 @@ syn match ProgressShowTab "\t"
 " If you don't like white space on the end of lines, uncomment this:
 " syn match   ProgressSpaceError "\s\+$"
 
-syn region ProgressComment	start="/\*"  end="\*/" contains=ProgressComment,ProgressTodo,ProgressDebug
-syn region ProgressInclude	start="^[   ]*[{]" end="[}]" contains=ProgressPreProc,ProgressOperator,ProgressString,ProgressComment
-syn region ProgressPreProc	start="&" end="\>" contained
+syn region ProgressComment		start="/\*"  end="\*/" contains=ProgressComment,ProgressTodo,ProgressDebug,@Spell
+syn region ProgressInclude		start="^[ 	]*[{]" end="[}]" contains=ProgressPreProc,ProgressOperator,ProgressString,ProgressComment
+syn region ProgressPreProc		start="&" end="\>" contained
 
 " This next line works reasonably well.
 " syn match ProgressOperator        "[!;|)(:.><+*=-]"
@@ -277,7 +277,7 @@ syn keyword ProgressOperator	write-fragment write-message write-processing-instr
 syn keyword ProgressOperator	xml-data-type xml-node-name xml-node-type xml-schema-pat[h] xml-suppress-namespace-processing y y-of year year-offset yes-no
 syn keyword ProgressOperator	yes-no-cancel
 
-syn keyword ProgressType    char[acter] int[eger] int64 dec[imal] log[ical] da[te] datetime datetime-tz
+syn keyword ProgressType	char[acter] int[eger] int64 dec[imal] log[ical] da[te] datetime datetime-tz
 
 syn sync lines=800
 
@@ -285,40 +285,40 @@ syn sync lines=800
 " For version 5.7 and earlier: only when not done already
 " For version 5.8 and later: only when an item doesn't have highlighting yet
 if version >= 508 || !exists("did_progress_syntax_inits")
-    if version < 508
-	let did_progress_syntax_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
+	if version < 508
+		let did_progress_syntax_inits = 1
+		command -nargs=+ HiLink hi link <args>
+	else
+		command -nargs=+ HiLink hi def link <args>
+	endif
 
-    " The default methods for highlighting. Can be overridden later.
-    HiLink ProgressByte		    Number
-    HiLink ProgressCase		    Repeat
-    HiLink ProgressComment	    Comment
-    HiLink ProgressConditional	    Conditional
-    HiLink ProgressDebug		Debug
-    HiLink ProgressDo			Repeat
-    HiLink ProgressEndError	    Error
-    HiLink ProgressFor		    Repeat
-    HiLink ProgressFunction	    Procedure
-    HiLink ProgressIdentifier		Identifier
-    HiLink ProgressInclude	    Include
-    HiLink ProgressMatrixDelimiter  Identifier
-    HiLink ProgressNumber		Number
-    HiLink ProgressOperator	    Operator
-    HiLink ProgressPreProc	    PreProc
-    HiLink ProgressProcedure		Procedure
-    HiLink ProgressQuote		Delimiter
-    HiLink ProgressRepeat		Repeat
-    HiLink ProgressReserved	    Statement
-    HiLink ProgressSpaceError		Error
-    HiLink ProgressString		String
-    HiLink ProgressTodo		    Todo
-    HiLink ProgressType		    Statement
-    HiLink ProgressShowTab	    Error
+	" The default methods for highlighting. Can be overridden later.
+	HiLink ProgressByte		Number
+	HiLink ProgressCase		Repeat
+	HiLink ProgressComment		Comment
+	HiLink ProgressConditional	Conditional
+	HiLink ProgressDebug		Debug
+	HiLink ProgressDo		Repeat
+	HiLink ProgressEndError		Error
+	HiLink ProgressFor		Repeat
+	HiLink ProgressFunction		Procedure
+	HiLink ProgressIdentifier	Identifier
+	HiLink ProgressInclude		Include
+	HiLink ProgressMatrixDelimiter	Identifier
+	HiLink ProgressNumber		Number
+	HiLink ProgressOperator		Operator
+	HiLink ProgressPreProc		PreProc
+	HiLink ProgressProcedure	Procedure
+	HiLink ProgressQuote		Delimiter
+	HiLink ProgressRepeat		Repeat
+	HiLink ProgressReserved		Statement
+	HiLink ProgressSpaceError	Error
+	HiLink ProgressString		String
+	HiLink ProgressTodo		Todo
+	HiLink ProgressType		Statement
+	HiLink ProgressShowTab		Error
 
-    delcommand HiLink
+	delcommand HiLink
 endif
 
 let b:current_syntax = "progress"
@@ -326,4 +326,4 @@ let b:current_syntax = "progress"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8 sw=4
+" vim: ts=8 sw=8
diff --git a/runtime/tutor/tutor.vim b/runtime/tutor/tutor.vim
index 11584d5b75..a48ff6a4eb 100644
--- a/runtime/tutor/tutor.vim
+++ b/runtime/tutor/tutor.vim
@@ -1,7 +1,7 @@
 " Vim tutor support file
 " Author: Eduardo F. Amatria <eferna1@platea.pntic.mec.es>
 " Maintainer: Bram Moolenaar
-" Last Change:	2008 Jul 21
+" Last Change:	2012 Sep 21
 
 " This Vim script is used for detecting if a translation of the
 " tutor file exist, i.e., a tutor.xx file, where xx is the language.
@@ -72,14 +72,20 @@ if s:ext =~? '\.ko'
   endif
 endif
 
-" The Chinese tutor is available in two encodings, guess which one to use
+" The Chinese tutor is available in three encodings, guess which one to use
 " This segment is from the above lines and modified by
 " Mendel L Chan <beos@turbolinux.com.cn> for Chinese vim tutorial
+" When 'encoding' is utf-8, choose between China (simplified) and Taiwan
+" (traditional) based on the language, suggested by Alick Zhao.
 if s:ext =~? '\.zh'
   if &enc =~ 'big5\|cp950'
     let s:ext = ".zh.big5"
   elseif &enc != 'utf-8'
     let s:ext = ".zh.euc"
+  elseif s:ext =~? 'zh_tw' || (exists("s:lang") && s:lang =~? 'zh_tw')
+    let s:ext = ".zh_tw"
+  else
+    let s:ext = ".zh_cn"
   endif
 endif
 
diff --git a/runtime/tutor/tutor.zh_cn.utf-8 b/runtime/tutor/tutor.zh_cn.utf-8
new file mode 100644
index 0000000000..0821ef6e45
--- /dev/null
+++ b/runtime/tutor/tutor.zh_cn.utf-8
@@ -0,0 +1,851 @@
+===============================================================================
+=      欢     迎     阅     读   《 V I M  教  程 》   ——     版本 1.5      =
+===============================================================================
+     vim 是一个具有很多命令的功能�常强大的编辑器。�于篇幅，在本教程当中
+     就�详细介�了。本教程的设计目标是讲述一些必�的基本命令，而掌�好这
+     些命令，您就能够很容易将vim当作一个通用的万能编辑器�使用了。
+
+     完�本教程的内容大约需�25-30分钟，�决于您训练的时间。
+
+     �一节的命令�作将会更改本文。推�您�制本文的一个副本，然�在副本上
+     进行训练(如果您是通过"vimtutor"��动教程的，那么本文就已�是副本了)。
+
+     切记一点∶本教程的设计�路是在使用中进行学习的。也就是说，您需�通过
+     执行命令�学习它们本身的正确用法。如果您�是阅读而��作，那么您�能
+     会很快�忘这些命令的�
+
+     好了，现在请确定您的Shift-Lock(大�写�定键)还没有按下，然�按键盘上
+     的字�键 j 足够多的次数�移动光标，直到第一节的内容能够完全充满�幕。
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			第一讲第一节∶移动光标
+
+
+   ※※ �移动光标，请�照说明分别按下 h�j�k�l 键。 ※※
+
+	     ^
+	     k		    �示∶ h 的键�于左边，�次按下就会�左移动。
+       < h	 l >		   l 的键�于�边，�次按下就会��移动。
+	     j			   j 键看起�很象一支尖端方��下的箭头。
+	     v
+
+  1. 请��在�幕内移动光标，直至您觉得舒�为止。
+
+  2. 按下下行键(j)，直到出现光标��下行。
+
+---> 现在您应该已�学会如何移动到下一讲�。
+
+  3. 现在请使用下行键，将光标移动到第二讲。
+
+�示∶如果您�敢确定您所按下的字�，请按下<ESC>键回到正常(Normal)模�。
+      然��次从键盘输入您想�的命令。
+
+�示∶光标键应当也能正常工作的。但是使用hjkl键，在习惯之�您就能够快速
+      地在�幕内四处移动光标了。
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			第一讲第二节∶VIM的进入和退出
+
+
+  !! 特别�示∶敬请阅读完整本一节的内容，然��能执行以下所讲解的命令。
+
+  1. 请按<ESC>键(这是为了确�您处在正常模�)。
+
+  2. 然�输入∶			:q! <回车>
+
+---> 这�方�的退出编辑器��会�存您进入编辑器以�所�的改动。
+     如果您想�存更改�退出，请输入∶
+				:wq  <回车>
+
+  3. 如果您看到了命令行�示符，请输入能够带您回到本教程的命令，那就是∶
+
+		vimtutor <回车>
+
+     通常情况下您也�以用这�方�∶
+
+		vim tutor <回车>
+
+---> 这里的 'vim' 表示进入vim编辑器，而 'tutor'则是您准备�编辑的文件。
+
+  4. 如果您自信已�牢牢记�了这些步骤的�，请从步骤1执行到步骤3退出，然
+     ��次进入编辑器。接�将光标移动到第一讲第三节�继续我们的教程讲解。
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			第一讲第三节∶文本编辑之删除
+
+
+   ** 在正常(Normal)模�下，�以按下 x 键�删除光标所在�置的字符。**
+
+  1. 请将光标移动到本节中下�标记有 ---> 的那一行。
+
+  2. 为了修正输入错误，请将光标移至准备删除的字符的�置处。
+
+  3. 然�按下 x 键将错误字符删除掉。
+
+  4. ��步骤2到步骤4，直到��修正为止。
+
+---> The ccow jumpedd ovverr thhe mooon.
+
+  5. 好了，该行已�修正了，下一节内容是第一讲第四节。
+
+特别�示∶在您�览本教程时，��强行记忆。记�一点∶在使用中学习。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     第一讲第四节∶文本编辑之�入
+
+
+	 ** 在正常模�下，�以按下 i 键��入文本。**
+
+  1. 请将光标移动到本节中下�标记有 ---> 的第一行。
+
+  2. 为了使得第一行内容雷�于第二行，请将光标移至文本第一个字符准备�入
+     的�置。
+
+  3. 然�按下 i 键，接�输入必�的文本字符。
+
+  4. 所有文本都修正完毕，请按下 <ESC> 键返回正常模�。
+     ��步骤2至步骤4以便修正��。
+
+---> There is text misng this .
+---> There is some text missing from this line.
+
+  5. 如果您对文本�入�作已�很满�，请接�阅读下�的�结。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			       第一讲�结
+
+
+  1. 光标在�幕文本中的移动既�以用箭头键，也�以使用 hjkl 字�键。
+	 h (左移)	j (下行)       k (上行)	    l (�移)
+
+  2. 欲进入vim编辑器(从命令行�示符)，请输入∶vim 文件� <回车>
+
+  3. 欲退出vim编辑器，请输入以下命令放弃所有修改∶
+
+	<ESC>   :q!	 <回车>
+
+     或者输入以下命令�存所有修改∶
+
+	<ESC>   :wq	 <回车>
+
+  4. 在正常模�下删除光标所在�置的字符，请按∶ x
+
+  5. 在正常模�下�在光标所在�置开始�入文本，请按∶
+
+	 i     输入必�文本	<ESC>
+
+特别�示∶按下 <ESC> 键会带您回到正常模�或者�消一个�期望或者部分完�
+的命令。
+
+好了，第一讲到此结�。下�接下�继续第二讲的内容。
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			第二讲第一节∶删除类命令
+
+
+	    ** 输入 dw �以从光标处删除至一个�字/��的末尾。**
+
+  1. 请按下 <ESC> 键确�您处于正常模�。
+
+  2. 请将光标移动到本节中下�标记有 ---> 的那一行。
+
+  3. 请将光标移至准备�删除的��的开始。
+
+  4. 接�输入 dw 删除掉该��。
+
+  特别�示∶您所输入的 dw 会在您输入的�时出现在�幕的最�一行。如果您输
+  入有误，请按下 <ESC> 键�消，然��新��。
+
+---> There are a some words fun that don't belong paper in this sentence.
+
+  5. ��步骤3至步骤4，直至��修正完毕。接�继续第二讲第二节内容。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		      第二讲第二节∶其他删除类命令
+
+
+		   ** 输入 d$ 从当�光标删除到行末。**
+
+  1. 请按下 <ESC> 键确�您处于正常模�。
+
+  2. 请将光标移动到本节中下�标记有 ---> 的那一行。
+
+  3. 请将光标移动到该行的尾部(也就是在第一个点�‘.’��)。
+
+  4. 然�输入 d$ 从光标处删至当�行尾部。
+
+---> Somebody typed the end of this line twice. end of this line twice.
+
+
+  5. 请继续学习第二讲第三节就知�是怎么回事了。
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     第二讲第三节∶关于命令和对象
+
+
+  删除命令 d 的格�如下∶
+
+	 [number]   d	object	    或者     d	 [number]   object
+
+  其�如下∶
+    number - 代表执行命令的次数(�选项，缺�设置为 1 )。
+    d - 代表删除。
+    object - 代表命令所��作的对象(下�有相关介�)。
+
+  一个简短的对象列表∶
+    w - 从当�光标当��置直到�字/��末尾，包括空格。
+    e - 从当�光标当��置直到�字/��末尾，但是 *�* 包括空格。
+    $ - 从当�光标当��置直到当�行末。
+
+特别�示∶
+    对于勇于探索者，请在正常模�下�仅按代表相应对象的键而�使用命令，则
+    将看到光标的移动正如上�的对象列表所代表的一样。
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		第二讲第四节∶对象命令的特殊情况
+
+
+	       ** 输入 dd �以删除整一个当�行。 **
+
+  鉴于整行删除的高频度，VIM 的设计者决定�简化整行删除，仅需�在�一行上
+  击打两次 d 就�以删除掉光标所在的整行了。
+
+  1. 请将光标移动到本节中下�的短�段�中的第二行。
+  2. 输入 dd 删除该行。
+  3. 然�移动到第四行。
+  4. 接�输入 2dd (还记得��讲过的 number-command-object �？) 删除两行。
+
+      1)  Roses are red,
+      2)  Mud is fun,
+      3)  Violets are blue,
+      4)  I have a car,
+      5)  Clocks tell time,
+      6)  Sugar is sweet
+      7)  And so are you.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			 第二讲第五节∶撤消类命令
+
+
+	 ** 输入 u �撤消最�执行的命令，输入 U �修正整行。**
+
+  1. 请将光标移动到本节中下�标记有 ---> 的那一行，并将其置于第一个错误
+     处。
+  2. 输入 x 删除第一个�想�留的字�。
+  3. 然�输入 u 撤消最�执行的(一次)命令。
+  4. 这次�使用 x 修正本行的所有错误。
+  5. 现在输入一个大写的 U ，��到该行的原始状�。
+  6. 接�多次输入 u 以撤消 U 以�更�的命令。
+  7. 然�多次输入 CTRL-R (先按下 CTRL 键�放开，接�输入 R 键) ，这样就
+     �以执行��命令，也就是撤消掉撤消命令。
+
+---> Fiix the errors oon thhis line and reeplace them witth undo.
+
+  8. 这些都是�常有用的命令。下�是第二讲的�结了。
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			       第二讲�结
+
+
+  1. 欲从当�光标删除至�字/��末尾，请输入∶dw
+
+  2. 欲从当�光标删除至当�行末尾，请输入∶d$
+
+  3. 欲删除整行，请输入∶dd
+
+  4. 在正常模�下一个命令的格�是∶
+
+       [number]   command   object     或者     command	[number]   object
+     其�是∶
+       number - 代表的是命令执行的次数
+       command - 代表��的事情，比如 d 代表删除
+       object - 代表��作的对象，比如 w 代表�字/��，$ 代表到行末等等。
+		$ (to the end of line), etc.
+
+  5. 欲撤消以�的�作，请输入∶u (�写的u)
+     欲撤消在一行中所�的改动，请输入∶U (大写的U)
+     欲撤消以�的撤消命令，��以�的�作结果，请输入∶CTRL-R
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			 第三讲第一节∶置入类命令
+
+
+	       ** 输入 p 将最�一次删除的内容置入光标之� **
+
+  1. 请将光标移动到本节中下�示范段�的首行。
+
+  2. 输入 dd 将该行删除，这样会将该行�存到vim的缓冲区中。
+
+  3. 接�将光标移动到准备置入的�置的上方。记�∶是上方哦。
+
+  4. 然�在正常模�下(<ESC>键进入)，输入 p 将该行粘贴置入。
+
+  5. ��步骤2至步骤4，将所有的行��放置到正确的�置上。
+
+     d) Can you learn too?
+     b) Violets are blue,
+     c) Intelligence is learned,
+     a) Roses are red,
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		       第三讲第二节∶替�类命令
+
+
+	  ** 输入 r 和一个字符替�光标所在�置的字符。**
+
+  1. 请将光标移动到本节中下�标记有 ---> 的第一行。
+
+  2. 请移动光标到第一个错误的适当�置。
+
+  3. 接�输入 r ，这样就能将错误替�掉了。
+
+  4. ��步骤2和步骤3，直到第一行已�修改完毕。
+
+--->  Whan this lime was tuoed in, someone presswd some wrojg keys!
+--->  When this line was typed in, someone pressed some wrong keys!
+
+  5. 然�我们继续学校第三讲第三节。
+
+特别�示∶切记您�在使用中学习，而�是在记忆中学习。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			第三讲第三节∶更改类命令
+
+
+	   ** �改�一个�字/��的部分或者全部，请输入 cw **
+
+  1. 请将光标移动到本节中下�标记有 ---> 的第一行。
+
+  2. 接�把光标放在�� lubw 的字� u 的�置那里。
+
+  3. 然�输入 cw 就�以修正该��了(在本例这里是输入 ine 。)
+
+  4. 最�按 <ESC> 键，然�光标定�到下一个错误第一个准备更改的字�处。
+
+  5. ��步骤3和步骤4，直到第一个��完全雷�第二个��。
+
+---> This lubw has a few wptfd that mrrf changing usf the change command.
+---> This line has a few words that need changing using the change command.
+
+�示∶请注� cw 命令�仅仅是替�了一个��，也让您进入文本�入状�了。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		       第三讲第四节∶使用c指令的其他更改类命令
+
+
+	     ** 更改类指令�以使用�删除类命令所使用的对象�数。**
+
+  1. 更改类指令的工作方�跟删除类命令是一致的。�作格�是∶
+
+       [number]   c   object	   或者	    c	[number]   object
+
+  2. 对象�数也是一样的，比如 w 代表�字/��，$代表行末等等。
+
+  3. 请将光标移动到本节中下�标记有 ---> 的第一行。
+
+  4. 接�将光标移动到第一个错误处。
+
+  5. 然�输入 c$ 使得该行剩下的部分更正得�第二行一样。最�按 <ESC> 键。
+
+---> The end of this line needs some help to make it like the second.
+---> The end of this line needs to be corrected using the  c$  command.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			       第三讲�结
+
+
+  1. ��新置入已�删除的文本内容，请输入�写字� p。该�作�以将已删除
+     的文本内容置于光标之�。如果最�一次删除的是一个整行，那么该行将置
+     于当�光标所在行的下一行。
+
+  2. �替�光标所在�置的字符，请输入�写的 r 和�替�掉原�置字符的新字
+     符��。
+
+  3. 更改类命令�许您改�指定的对象，从当�光标所在�置直到对象的末尾。
+     比如输入 cw �以替�当�光标到��的末尾的内容；输入 c$ �以替�当
+     �光标到行末的内容。
+
+  4. 更改类命令的格�是∶
+
+	 [number]   c	object	      或者	c   [number]   object
+
+下�我们继续学习下一讲。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     第四讲第一节∶定��文件状�
+
+
+  ** 输入 CTRL-g 显示当�编辑文件中当�光标所在行�置以�文件状�信�。
+     输入 SHIFT-G 则直接跳转到文件中的�一指定行。**
+
+  �示∶切记�先通读本节内容，之���以执行以下步骤!!!
+
+  1. 按下 CTRL 键�放开然�按 g 键。然�就会看到页�最底部出现一个状�信
+     �行，显示的内容是当�编辑的文件�和文件的总行数。请记�步骤3的行�。
+
+  2. 按下 SHIFT-G 键�以使得当�光标直接跳转到文件最�一行。
+
+  3. 输入您曾�留的行�，然�按下 SHIFT-G。这样就�以返回到您第一次按下
+     CTRL-g 时所在的行好了。注�∶输入行�时，行�是�会在�幕上显示出�
+     的。
+
+  4. 如果愿�，您�以继续执行步骤1至步骤三。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			第四讲第二节∶�索类命令
+
+
+     ** 输入 / 以�尾�的字符串�以用以在当�文件中查找该字符串。**
+
+  1. 在正常模�下输入 / 字符。您此时会注�到该字符和光标都会出现在�幕底
+     部，这跟 : 命令是一样的。
+
+  2. 接�输入 errroor <回车>。那个errroor就是您�查找的字符串。
+
+  3. �查找�上一次的字符串，�需�按 n 键。��相�方�查找�上一次的字
+     符串，请输入 Shift-N ��。
+
+  4. 如果您想逆�查找字符串，请使用 ? 代替 / 进行。
+
+---> When the search reaches the end of the file it will continue at the start.
+
+  "errroor" is not the way to spell error;  errroor is an error.
+
+  �示∶如果查找已�到达文件末尾，查找会自动从文件头部继续查找。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		   第四讲第三节∶�对括�的查找
+
+
+	      ** 按 % �以查找�对的括� )�]�}。**
+
+  1. 把光标放在本节下�标记有 --> 那一行中的任何一个 (�[ 或 { 处。
+
+  2. 接�按 % 字符。
+
+  3. 此时光标的�置应当是在�对的括�处。
+
+  4. �次按 % 就�以跳回�对的第一个括�处。
+
+---> This ( is a test line with ('s, ['s ] and {'s } in it. ))
+
+�示∶在程�调试时，这个功能用�查找��对的括�是很有用的。
+
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		      第四讲第四节∶修正错误的方法之一
+
+
+		** 输入 :s/old/new/g �以替� old 为 new。**
+
+  1. 请将光标移动到本节中下�标记有 ---> 的那一行。
+
+  2. 输入 :s/thee/the <回车> 。请注�该命令�改�光标所在行的第一个匹�
+     串。
+
+  3. 输入 :s/thee/the/g	则是替�全行的匹�串。
+
+---> the best time to see thee flowers is in thee spring.
+
+  4. �替�两行之间出现的�个匹�串，请输入 :#,#s/old/new/g (#,#代表的是
+     两行的行�)。输入 :%s/old/new/g 则是替�整个文件中的�个匹�串。
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			       第四讲�结
+
+
+  1. Ctrl-g 用于显示当�光标所在�置和文件状�信�。Shift-G 用于将光标跳
+     转至文件最�一行。先敲入一个行�然�按 Shift-G 则是将光标移动至该行
+     �代表的行。
+
+  2. 输入 / 然�紧�一个字符串是则是在当�所编辑的文档中��查找该字符串。
+     输入问� ? 然�紧�一个字符串是则是在当�所编辑的文档中��查找该字
+     符串。完�一次查找之�按 n 键则是��上一次的命令，�在�一方�上查
+     找下一个字符串所在；或者按 Shift-N �相�方�查找下该字符串所在。
+
+  3. 如果光标当��置是括�(�)�[�]�{�}，按 % �以将光标移动到�对的
+     括�上。
+
+  4. 在一行内替�头一个字符串 old 为新的字符串 new，请输入  :s/old/new
+     在一行内替�所有的字符串 old 为新的字符串 new，请输入  :s/old/new/g
+     在两行内替�所有的字符串 old 为新的字符串 new，请输入  :#,#s/old/new/g
+     在文件内替�所有的字符串 old 为新的字符串 new，请输入  :%s/old/new/g
+     进行全文替�时询问用户确认�个替�需添加 c 选项，请输入 :%s/old/new/gc
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		第五讲第一节∶在 VIM 内执行外部命令的方法
+
+
+	   ** 输入 :! 然�紧�著输入一个外部命令�以执行该外部命令。**
+
+  1. 按下我们所熟悉的 : 命令设置光标到�幕底部。这样就�以让您输入命令了。
+
+  2. 接�输入感�� ! 这个字符，这样就�许您执行外部的 shell 命令了。
+
+  3. 我们以 ls 命令为例。输入 !ls <回车> 。该命令就会列举出您当�目录的
+     内容，就如�您在命令行�示符下输入 ls 命令的结果一样。如果 !ls 没起
+     作用，您�以试试 :!dir 看看。
+
+---> �示∶ 所有的外部命令都�以以这�方�执行。
+
+---> �示∶ 所有的 : 命令都必须以 <回车> 告终。
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		      第五讲第二节∶关于�存文件的更多信�
+
+
+	     ** �将对文件的改动�存到文件中，请输入 :w FILENAME 。**
+
+  1. 输入 :!dir 或者 :!ls 获知当�目录的内容。您应当已知�最�还得敲
+     <回车> �。
+
+  2. 选择一个尚未存在文件�，比如 TEST 。
+
+  3. 接�输入 :w TEST  (此处 TEST 是您所选择的文件�。)
+
+  4. 该命令会以 TEST 为文件��存整个文件 (VIM 教程)。为了确�正确�存，
+     请�次输入 :!dir 查看您的目录列表内容。
+
+---> 请注�∶如果您退出 VIM 然�在以文件� TEST 为�数进入，那么该文件内
+     容应该�您�存时的文件内容是完全一样的。
+
+  5. 现在您�以通过输入 :!rm TEST �删除 TEST 文件了。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		    第五讲第三节∶一个具有选择性的�存命令
+
+
+		** ��存文件的部分内容，请输入 :#,# w FILENAME **
+
+  1. ��执行一次 :!dir 或者 :!ls 获知当�目录的内容，然�选择一个�适的
+     ���的文件�，比如 TEST 。
+
+  2. 接�将光标移动至本页的最顶端，然�按 CTRL-g 找到该行的行�。别忘了
+     行�哦。
+
+  3. 接�把光标移动至本页的最底端，�按一次 CTRL-g 。也别忘了这个行好哦。
+
+  4. 为了��存文章的�个部分，请输入 :#,# w TEST 。这里的 #,# 就是上�
+     �求您记�的行�(顶端行�,底端行�)，而 TEST 就是选定的文件�。
+
+  5. 最�，用 :!dir 确认文件是�正确�存。但是这次先别删除掉。
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		   第五讲第四节∶��和�并文件
+
+
+       ** ��当�文件中�入�外的文件的内容，请输入 :r FILENAME **
+
+  1. 请键入 :!dir 确认您��创建的 TEST 文件还在。
+
+  2. 然�将光标移动至当�页�的顶端。
+
+特别�示∶ 执行步骤3之�您将看到第五讲第三节，请届时�往下移动回到这里�。
+
+  3. 接�通过 :r TEST 将��创建的�为 TEST 的文件��进�。
+
+特别�示∶您所��进�的文件将从光标所在�置处开始置入。
+
+  4. 为了确认文件已����功，移动光标回到原�的�置就�以注�有两份第
+     五讲第三节，一份是原本，�外一份是�自文件的副本。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			       第五讲�结
+
+
+  1. :!command 用于执行一个外部命令 command。
+
+     请看一些实际例�∶
+	  :!dir  -  用于显示当�目录的内容。
+	  :!rm FILENAME  -	用于删除�为 FILENAME 的文件。
+
+  2. :w FILENAME  �将当� VIM 中正在编辑的文件�存到�为 FILENAME 的文
+     件中。
+
+  3. :#,#w FILENAME �将当�编辑文件第 # 行至第 # 行的内容�存到文件
+     FILENAME 中。
+
+  4. :r FILENAME ����盘文件 FILENAME 并将其�入到当�文件的光标�置
+     ��。
+
+
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			 第六讲第一节∶打开类命令
+
+
+	 ** 输入 o 将在光标的下方打开新的一行并进入�入模�。**
+
+  1. 请将光标移动到本节中下�标记有 ---> 的那一行。
+
+  2. 接�输入�写的 o 在光标 *下方* 打开新的一行并进入�入模�。
+
+  3. 然��制标记有 ---> 的行并按 <ESC> 键退出�入模�而进入正常模�。
+
+---> After typing  o  the cursor is placed on the open line in Insert mode.
+
+  4. 为了在光标 *上方* 打开新的一行，�需�输入大写的 O 而�是�写的 o
+     就�以了。请在下行测试一下�。当光标处在在该行上时，按 Shift-O�以
+     在该行上方新开一行。
+
+Open up a line above this by typing Shift-O while the cursor is on this line.
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			第六讲第二节∶光标��入类命令
+
+
+		     ** 输入 a 将�在光标之��入文本。 **
+
+  1. 请在正常模�下通过输入 $ 将光标移动到本节中下�标记有 ---> 的第一行
+     的末尾。
+
+  2. 接�输入�写的 a 则�在光标之��入文本了。大写的 A 则�以直接在行
+     末�入文本。
+
+�示∶输入大写 A 的�作方法�以在行末�入文本，��了输入 i，光标定�到
+      最�一个字符，输入的文本，<ESC> 回�正常模�，箭头�键移动光标以�
+      x 删除当�光标所在�置字符等等诸多��的�作。
+
+  3. �作之�第一行就�以补充完整了。请注�光标��入文本与�入模�是基
+     本完全一致的，�是文本�入的�置定��有��罢了。
+
+---> This line will allow you to practice
+---> This line will allow you to practice appending text to the end of a line.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		    第六讲第三节∶�外一个置�类命令的版本
+
+
+		      ** 输入大写的 R �连续替�多个字符。**
+
+  1. 请将光标移动到本节中下�标记有 ---> 的第一行。
+
+  2. 移动光标到第一行中��于标有 ---> 的第二行的第一个��的开始，��
+     � last 处。
+
+  3. 然�输入大写的 R 开始把第一行中的��于第二行的剩余字符�一输入，就
+     �以全部替�掉原有的字符而使得第一行完全雷�第二行了。
+
+---> To make the first line the same as the last on this page use the keys.
+---> To make the first line the same as the second, type R and the new text.
+
+  4. 请注�∶如果您按 <ESC> 退出置�模�回�正常模�，尚未替�的文本将�
+     然��原状。
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			    第六讲第四节∶设置类命令的选项
+
+
+		  ** 设置�使查找或者替��忽略大�写的选项 **
+
+
+  1. �查找�� ignore �在正常模�下输入 /ignore 。���查找该�，�以
+     ��按 n 键。
+
+  2. 然�设置 ic 选项(ic就是英文忽略大�写Ignore Case的首字�缩写�)，�
+     输入∶
+	:set ic
+
+  3. 现在�以通过键入 n 键�次查找�� ignore。��查找�以��键入 n 键。
+
+  4. 然�设置 hlsearch 和 incsearch 这两个选项，输入以下内容∶
+     :set hls is
+
+  5. 现在�以�次输入查找命令，看看会有什么效果∶
+     /ignore
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			       第六讲�结
+
+
+  1. 输入�写的 o �以在光标下方打开新的一行并将光标置于新开的行首，进入
+     �入模�。
+     输入大写的 O �以在光标上方打开新的一行并将光标置于新开的行首，进入
+     �入模�。
+
+  2. 输入�写的 a �以在光标所在�置之��入文本。
+     输入大写的 A �以在光标所在行的行末之��入文本。
+
+  3. 输入大写的 R 将进入替�模�，直至按 <ESC> 键退出替�模�而进入正常
+     模�。
+
+  4. 输入 :set xxx �以设置 xxx 选项。
+
+
+
+
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		       第七讲∶在线帮助命令
+
+		      ** 使用在线帮助系统 **
+
+  Vim 拥有一个细致全�的在线帮助系统。��动该帮助系统，请选择如下三�方
+  法之一∶
+	- 按下 <HELP> 键 (如果键盘上有的�)
+	- 按下 <F1> 键 (如果键盘上有的�)
+	- 输入	:help <回车>
+
+  输入 :q <回车> �以关闭帮助窗�。
+
+  �供一个正确的�数给":help"命令，您�以找到关于该主题的帮助。请试验以
+  下�数(�别忘了按回车键哦。:)∶
+
+	  :help w <回车>
+	  :help c_<T <回车>
+	  :help insert-index <回车>
+	  :help user-manual <回车>
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		       第八讲∶创建一个�动脚本
+
+			  ** �用vim的功能 **
+
+  Vim的功能特性�比vi多得多，但大部分功能都没有缺�激活。为了�动更多的
+  功能，您得创建一个vimrc文件。
+
+  1. 开始编辑vimrc文件，这�决于您所使用的�作系统∶
+
+     :edit ~/.vimrc		这是Unix系统所使用的命令
+     :edit $VIM/_vimrc		这是Windows系统所使用的命令
+
+  2. 接�导入vimrc范例文件∶
+
+     :read $VIMRUNTIME/vimrc_example.vim
+
+  3. �存文件，命令为∶
+
+     :write
+
+  在下次您�动vim的时候，编辑器就会有了语法高亮的功能。您�以继续把您喜
+  欢的其它功能设置添加到这个vimrc文件中。
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  vim 教程到此结�。本教程�是为了简明地介�一下vim编辑器，但已足以让您
+  很容易学会使用本编辑器了。毋庸质疑，vim还有很多很多的命令，本教程所介
+  �的还差得远著呢。所以您�精通的�，还望继续努力哦。下一步您�以阅读
+  vim手册，使用的命令是∶
+	:help user-manual
+
+  为了更进一步的�考和学习，以下这本书值得推�∶
+
+	Vim - Vi Improved - 作者∶Steve Oualline
+	出版社∶New Riders
+
+  这是第一本完全讲解vim的书�。对于�学者特别有用。其中还包�有大�实例
+  和图示。欲知详情，请访问 http://iccf-holland.org/click5.html
+
+  以下这本书比较�了而且内容主�是vi而�是vim，但是也值得推�∶
+
+	Learning the Vi Editor - 作者∶Linda Lamb
+	出版社∶O'Reilly & Associates Inc.
+
+  这是一本�错的书，通过它您几乎能够了解到全部vi能够�到的事情。此书的第
+  六个版本也包�了一些关于vim的信�。
+
+  本教程是由�自Calorado School of Minese的Michael C. Pierce�Robert K.
+  Ware 所编写的，其中�自Colorado State University的Charles Smith�供了
+  很多创�。编者通信地�是∶
+
+	bware@mines.colorado.edu
+
+  本教程已由Bram Moolenaar专为vim进行修订。
+
+
+
+  译制者附言∶
+  ===========
+      简体中文教程翻译版之译制者为�昌泰 <beos@turbolinux.com.cn>，还有
+      �外一个�系地�∶linuxrat@gnuchina.org。
+
+      �体中文教程是从简体中文教程翻译版使用 Debian GNU/Linux 中文项目�
+      组的于广辉先生编写的中文汉字转�器  autoconvert 转�而�的，并对转
+      �的结果�了一些细节的改动。
+
+  �更记录∶
+  =========
+      2002年08月30日 �昌泰 <beos@turbolinux.com.cn>
+      感谢 RMS@SMTH 的指正，将多处错误修正。
+
+      2002年04月22日 �昌泰 <linuxrat@gnuchina.org>
+      感谢 xuandong@sh163.net 的指正，将两处错别字修正。
+
+      2002年03月18日 �昌泰 <linuxrat@gnuchina.org>
+      根�Bram Molenaar先生在2002年03月16日的�信�求，将vimtutor1.4中译
+      版�级到vimtutor1.5。
+
+      2001年11月15日 �昌泰 <linuxrat@gnuchina.org>
+      将vimtutor1.4中译版�交给Bram Molenaar和Sven Guckes。
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/runtime/tutor/tutor.zh_tw.utf-8 b/runtime/tutor/tutor.zh_tw.utf-8
new file mode 100644
index 0000000000..21d702051d
--- /dev/null
+++ b/runtime/tutor/tutor.zh_tw.utf-8
@@ -0,0 +1,852 @@
+===============================================================================
+=      歡     迎     閱     讀   《 V I M  教  程 》   ──     版本 1.5      =
+===============================================================================
+     vim 是一個具有很多命令的功能�常強大的編輯器。�于篇幅，在本教程當中
+     �就詳細介紹了。本教程的設計目標是講述一些必�的基本命令，而掌�好這
+     些命令，您就能夠很容易將vim當作一個通用的�能編輯器來使用了。
+
+     完�本教程的內容大約需�25-30分�，�決于您訓練的時間。
+
+     �一節的命令�作將會更改本文。推薦您復制本文的一個副本，然後在副本上
+     進行訓練(如果您是通�"vimtutor"來啟動教程的，那麼本文就已經是副本了)。
+
+     切記一點︰本教程的設計�路是在使用中進行學習的。也就是說，您需�通�
+     執行命令來學習它們本身的正確用法。如果您�是閱讀而��作，那麼您�能
+     會很快�忘這些命令的�
+
+     好了，�在請確定您的Shift-Lock(大�寫鎖定�)還沒有按下，然後按�盤上
+     的字�� j 足夠多的次數來移動光標，直到第一節的內容能夠完全充滿�幕。
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			第一講第一節︰移動光標
+
+
+   ※※ �移動光標，請�照說明分別按下 h�j�k�l �。 ※※
+
+	     ^
+	     k		    �示︰ h 的��于左邊，�次按下就會�左移動。
+       < h	 l >		   l 的��于�邊，�次按下就會��移動。
+	     j			   j �看起來很象一支尖端方��下的箭頭。
+	     v
+
+  1. 請隨�在�幕內移動光標，直至您覺得舒�為止。
+
+  2. 按下下行�(j)，直到出�光標�復下行。
+
+---> �在您應該已經學會如何移動到下一講�。
+
+  3. �在請使用下行�，將光標移動到第二講。
+
+�示︰如果您�敢確定您所按下的字�，請按下<ESC>�回到正常(Normal)模�。
+      然後�次從�盤輸入您想�的命令。
+
+�示︰光標�應當也能正常工作的。但是使用hjkl�，在習慣之後您就能夠快速
+      地在�幕內四處移動光標了。
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			第一講第二節︰VIM的進入和退出
+
+
+  !! 特別�示︰敬請閱讀完整本一節的內容，然後�能執行以下所講解的命令。
+
+  1. 請按<ESC>�(這是為了確�您處在正常模�)。
+
+  2. 然後輸入︰			:q! <回車>
+
+---> 這種方�的退出編輯器絕�會�存您進入編輯器以來所�的改動。
+     如果您想�存更改�退出，請輸入︰
+				:wq  <回車>
+
+  3. 如果您看到了命令行�示符，請輸入能夠帶您回到本教程的命令，那就是︰
+
+		vimtutor <回車>
+
+     通常情�下您也�以用這種方�︰
+
+		vim tutor <回車>
+
+---> 這裡的 'vim' 表示進入vim編輯器，而 'tutor'則是您準備�編輯的文件。
+
+  4. 如果您自信已經牢牢記�了這些步驟的話，請從步驟1執行到步驟3退出，然
+     後�次進入編輯器。接著將光標移動到第一講第三節來繼續我們的教程講解。
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			第一講第三節︰文本編輯之刪除
+
+
+   ** 在正常(Normal)模�下，�以按下 x �來刪除光標所在�置的字符。**
+
+  1. 請將光標移動到本節中下�標記有 ---> 的那一行。
+
+  2. 為了修正輸入錯誤，請將光標移至準備刪除的字符的�置處。
+
+  3. 然後按下 x �將錯誤字符刪除掉。
+
+  4. �復步驟2到步驟4，直到��修正為止。
+
+---> The ccow jumpedd ovverr thhe mooon.
+
+  5. 好了，該行已經修正了，下一節內容是第一講第四節。
+
+特別�示︰在您�覽本教程時，��強行記憶。記�一點︰在使用中學習。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     第一講第四節︰文本編輯之�入
+
+
+	 ** 在正常模�下，�以按下 i �來�入文本。**
+
+  1. 請將光標移動到本節中下�標記有 ---> 的第一行。
+
+  2. 為了使得第一行內容雷�于第二行，請將光標移至文本第一個字符準備�入
+     的�置。
+
+  3. 然後按下 i �，接著輸入必�的文本字符。
+
+  4. 所有文本都修正完畢，請按下 <ESC> �返回正常模�。
+     �復步驟2至步驟4以便修正��。
+
+---> There is text misng this .
+---> There is some text missing from this line.
+
+  5. 如果您�文本�入�作已經很滿�，請接著閱讀下�的��。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			       第一講��
+
+
+  1. 光標在�幕文本中的移動既�以用箭頭�，也�以使用 hjkl 字��。
+	 h (左移)	j (下行)       k (上行)	    l (�移)
+
+  2. 欲進入vim編輯器(從命令行�示符)，請輸入︰vim 文件� <回車>
+
+  3. 欲退出vim編輯器，請輸入以下命令放棄所有修改︰
+
+	<ESC>   :q!	 <回車>
+
+     或者輸入以下命令�存所有修改︰
+
+	<ESC>   :wq	 <回車>
+
+  4. 在正常模�下刪除光標所在�置的字符，請按︰ x
+
+  5. 在正常模�下�在光標所在�置開始�入文本，請按︰
+
+	 i     輸入必�文本	<ESC>
+
+特別�示︰按下 <ESC> �會帶您回到正常模�或者�消一個�期望或者部分完�
+的命令。
+
+好了，第一講到此��。下�接下來繼續第二講的內容。
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			第二講第一節︰刪除類命令
+
+
+	    ** 輸入 dw �以從光標處刪除至一個單字/單詞的末尾。**
+
+  1. 請按下 <ESC> �確�您處于正常模�。
+
+  2. 請將光標移動到本節中下�標記有 ---> 的那一行。
+
+  3. 請將光標移至準備�刪除的單詞的開始。
+
+  4. 接著輸入 dw 刪除掉該單詞。
+
+  特別�示︰您所輸入的 dw 會在您輸入的�時出�在�幕的最後一行。如果您輸
+  入有誤，請按下 <ESC> ��消，然後�新�來。
+
+---> There are a some words fun that don't belong paper in this sentence.
+
+  5. �復步驟3至步驟4，直至��修正完畢。接著繼續第二講第二節內容。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		      第二講第二節︰其他刪除類命令
+
+
+		   ** 輸入 d$ 從當�光標刪除到行末。**
+
+  1. 請按下 <ESC> �確�您處于正常模�。
+
+  2. 請將光標移動到本節中下�標記有 ---> 的那一行。
+
+  3. 請將光標移動到該行的尾部(也就是在第一個點號‘.’後�)。
+
+  4. 然後輸入 d$ 從光標處刪至當�行尾部。
+
+---> Somebody typed the end of this line twice. end of this line twice.
+
+
+  5. 請繼續學習第二講第三節就知�是怎麼回事了。
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     第二講第三節︰關于命令和�象
+
+
+  刪除命令 d 的格�如下︰
+
+	 [number]   d	object	    或者     d	 [number]   object
+
+  其�如下︰
+    number - 代表執行命令的次數(��項，缺�設置為 1 )。
+    d - 代表刪除。
+    object - 代表命令所��作的�象(下�有相關介紹)。
+
+  一個簡短的�象列表︰
+    w - 從當�光標當��置直到單字/單詞末尾，包括空格。
+    e - 從當�光標當��置直到單字/單詞末尾，但是 *�* 包括空格。
+    $ - 從當�光標當��置直到當�行末。
+
+特別�示︰
+    �于勇于探索者，請在正常模�下�僅按代表相應�象的�而�使用命令，則
+    將看到光標的移動正如上�的�象列表所代表的一樣。
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		第二講第四節︰�象命令的特殊情�
+
+
+	       ** 輸入 dd �以刪除整一個當�行。 **
+
+  鑒于整行刪除的高頻度，VIM 的設計者決定�簡化整行刪除，僅需�在�一行上
+  擊打兩次 d 就�以刪除掉光標所在的整行了。
+
+  1. 請將光標移動到本節中下�的短�段�中的第二行。
+  2. 輸入 dd 刪除該行。
+  3. 然後移動到第四行。
+  4. 接著輸入 2dd (還記得��講�的 number-command-object 嗎？) 刪除兩行。
+
+      1)  Roses are red,
+      2)  Mud is fun,
+      3)  Violets are blue,
+      4)  I have a car,
+      5)  Clocks tell time,
+      6)  Sugar is sweet
+      7)  And so are you.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			 第二講第五節︰撤消類命令
+
+
+	 ** 輸入 u 來撤消最後執行的命令，輸入 U 來修正整行。**
+
+  1. 請將光標移動到本節中下�標記有 ---> 的那一行，並將其置于第一個錯誤
+     處。
+  2. 輸入 x 刪除第一個�想�留的字�。
+  3. 然後輸入 u 撤消最後執行的(一次)命令。
+  4. 這次�使用 x 修正本行的所有錯誤。
+  5. �在輸入一個大寫的 U ，�復到該行的原始狀態。
+  6. 接著多次輸入 u 以撤消 U 以�更�的命令。
+  7. 然後多次輸入 CTRL-R (先按下 CTRL ��放開，接著輸入 R �) ，這樣就
+     �以執行�復命令，也就是撤消掉撤消命令。
+
+---> Fiix the errors oon thhis line and reeplace them witth undo.
+
+  8. 這些都是�常有用的命令。下�是第二講的��了。
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			       第二講��
+
+
+  1. 欲從當�光標刪除至單字/單詞末尾，請輸入︰dw
+
+  2. 欲從當�光標刪除至當�行末尾，請輸入︰d$
+
+  3. 欲刪除整行，請輸入︰dd
+
+  4. 在正常模�下一個命令的格�是︰
+
+       [number]   command   object     或者     command	[number]   object
+     其�是︰
+       number - 代表的是命令執行的次數
+       command - 代表��的事情，比如 d 代表刪除
+       object - 代表��作的�象，比如 w 代表單字/單詞，$ 代表到行末等等。
+		$ (to the end of line), etc.
+
+  5. 欲撤消以�的�作，請輸入︰u (�寫的u)
+     欲撤消在一行中所�的改動，請輸入︰U (大寫的U)
+     欲撤消以�的撤消命令，�復以�的�作�果，請輸入︰CTRL-R
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			 第三講第一節︰置入類命令
+
+
+	       ** 輸入 p 將最後一次刪除的內容置入光標之後 **
+
+  1. 請將光標移動到本節中下�示范段�的首行。
+
+  2. 輸入 dd 將該行刪除，這樣會將該行�存到vim的緩沖�中。
+
+  3. 接著將光標移動到準備置入的�置的上方。記�︰是上方哦。
+
+  4. 然後在正常模�下(<ESC>�進入)，輸入 p 將該行粘貼置入。
+
+  5. �復步驟2至步驟4，將所有的行��放置到正確的�置上。
+
+     d) Can you learn too?
+     b) Violets are blue,
+     c) Intelligence is learned,
+     a) Roses are red,
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		       第三講第二節︰替�類命令
+
+
+	  ** 輸入 r 和一個字符替�光標所在�置的字符。**
+
+  1. 請將光標移動到本節中下�標記有 ---> 的第一行。
+
+  2. 請移動光標到第一個錯誤的�當�置。
+
+  3. 接著輸入 r ，這樣就能將錯誤替�掉了。
+
+  4. �復步驟2和步驟3，直到第一行已經修改完畢。
+
+--->  Whan this lime was tuoed in, someone presswd some wrojg keys!
+--->  When this line was typed in, someone pressed some wrong keys!
+
+  5. 然後我們繼續學校第三講第三節。
+
+特別�示︰切記您�在使用中學習，而�是在記憶中學習。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			第三講第三節︰更改類命令
+
+
+	   ** �改變一個單字/單詞的部分或者全部，請輸入 cw **
+
+  1. 請將光標移動到本節中下�標記有 ---> 的第一行。
+
+  2. 接著把光標放在單詞 lubw 的字� u 的�置那裡。
+
+  3. 然後輸入 cw 就�以修正該單詞了(在本例這裡是輸入 ine 。)
+
+  4. 最後按 <ESC> �，然後光標定�到下一個錯誤第一個準備更改的字�處。
+
+  5. �復步驟3和步驟4，直到第一個��完全雷�第二個��。
+
+---> This lubw has a few wptfd that mrrf changing usf the change command.
+---> This line has a few words that need changing using the change command.
+
+�示︰請注� cw 命令�僅僅是替�了一個單詞，也讓您進入文本�入狀態了。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		       第三講第四節︰使用c指令的其他更改類命令
+
+
+	     ** 更改類指令�以使用�刪除類命令所使用的�象�數。**
+
+  1. 更改類指令的工作方�跟刪除類命令是一致的。�作格�是︰
+
+       [number]   c   object	   或者	    c	[number]   object
+
+  2. �象�數也是一樣的，比如 w 代表單字/單詞，$代表行末等等。
+
+  3. 請將光標移動到本節中下�標記有 ---> 的第一行。
+
+  4. 接著將光標移動到第一個錯誤處。
+
+  5. 然後輸入 c$ 使得該行剩下的部分更正得�第二行一樣。最後按 <ESC> �。
+
+---> The end of this line needs some help to make it like the second.
+---> The end of this line needs to be corrected using the  c$  command.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			       第三講��
+
+
+  1. ��新置入已經刪除的文本內容，請輸入�寫字� p。該�作�以將已刪除
+     的文本內容置于光標之後。如果最後一次刪除的是一個整行，那麼該行將置
+     于當�光標所在行的下一行。
+
+  2. �替�光標所在�置的字符，請輸入�寫的 r 和�替�掉原�置字符的新字
+     符��。
+
+  3. 更改類命令�許您改變指定的�象，從當�光標所在�置直到�象的末尾。
+     比如輸入 cw �以替�當�光標到單詞的末尾的內容；輸入 c$ �以替�當
+     �光標到行末的內容。
+
+  4. 更改類命令的格�是︰
+
+	 [number]   c	object	      或者	c   [number]   object
+
+下�我們繼續學習下一講。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     第四講第一節︰定��文件狀態
+
+
+  ** 輸入 CTRL-g 顯示當�編輯文件中當�光標所在行�置以�文件狀態信�。
+     輸入 SHIFT-G 則直接跳轉到文件中的�一指定行。**
+
+  �示︰切記�先通讀本節內容，之後��以執行以下步驟!!!
+
+  1. 按下 CTRL ��放開然後按 g �。然後就會看到��最底部出�一個狀態信
+     �行，顯示的內容是當�編輯的文件�和文件的總行數。請記�步驟3的行號。
+
+  2. 按下 SHIFT-G ��以使得當�光標直接跳轉到文件最後一行。
+
+  3. 輸入您曾�留的行號，然後按下 SHIFT-G。這樣就�以返回到您第一次按下
+     CTRL-g 時所在的行好了。注�︰輸入行號時，行號是�會在�幕上顯示出來
+     的。
+
+  4. 如果願�，您�以繼續執行步驟1至步驟三。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			第四講第二節︰�索類命令
+
+
+     ** 輸入 / 以�尾隨的字符串�以用以在當�文件中查找該字符串。**
+
+  1. 在正常模�下輸入 / 字符。您此時會注�到該字符和光標都會出�在�幕底
+     部，這跟 : 命令是一樣的。
+
+  2. 接著輸入 errroor <回車>。那個errroor就是您�查找的字符串。
+
+  3. �查找�上一次的字符串，�需�按 n �。��相�方�查找�上一次的字
+     符串，請輸入 Shift-N ��。
+
+  4. 如果您想逆�查找字符串，請使用 ? 代替 / 進行。
+
+---> When the search reaches the end of the file it will continue at the start.
+
+  "errroor" is not the way to spell error;  errroor is an error.
+
+  �示︰如果查找已經到�文件末尾，查找會自動從文件頭部繼續查找。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		   第四講第三節︰��括號的查找
+
+
+	      ** 按 % �以查找��的括號 )�]�}。**
+
+  1. 把光標放在本節下�標記有 --> 那一行中的任何一個 (�[ 或 { 處。
+
+  2. 接著按 % 字符。
+
+  3. 此時光標的�置應當是在��的括號處。
+
+  4. �次按 % 就�以跳回��的第一個括號處。
+
+---> This ( is a test line with ('s, ['s ] and {'s } in it. ))
+
+�示︰在程�調試時，這個功能用來查找���的括號是很有用的。
+
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		      第四講第四節︰修正錯誤的方法之一
+
+
+		** 輸入 :s/old/new/g �以替� old 為 new。**
+
+  1. 請將光標移動到本節中下�標記有 ---> 的那一行。
+
+  2. 輸入 :s/thee/the <回車> 。請注�該命令�改變光標所在行的第一個匹�
+     串。
+
+  3. 輸入 :s/thee/the/g	則是替�全行的匹�串。
+
+---> the best time to see thee flowers is in thee spring.
+
+  4. �替�兩行之間出�的�個匹�串，請輸入 :#,#s/old/new/g (#,#代表的是
+     兩行的行號)。輸入 :%s/old/new/g 則是替�整個文件中的�個匹�串。
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			       第四講��
+
+
+  1. Ctrl-g 用于顯示當�光標所在�置和文件狀態信�。Shift-G 用于將光標跳
+     轉至文件最後一行。先敲入一個行號然後按 Shift-G 則是將光標移動至該行
+     號代表的行。
+
+  2. 輸入 / 然後緊隨一個字符串是則是在當�所編輯的文檔中�後查找該字符串。
+     輸入�號 ? 然後緊隨一個字符串是則是在當�所編輯的文檔中��查找該字
+     符串。完�一次查找之後按 n �則是�復上一次的命令，�在�一方�上查
+     找下一個字符串所在；或者按 Shift-N �相�方�查找下該字符串所在。
+
+  3. 如果光標當��置是括號(�)�[�]�{�}，按 % �以將光標移動到��的
+     括號上。
+
+  4. 在一行內替�頭一個字符串 old 為新的字符串 new，請輸入  :s/old/new
+     在一行內替�所有的字符串 old 為新的字符串 new，請輸入  :s/old/new/g
+     在兩行內替�所有的字符串 old 為新的字符串 new，請輸入  :#,#s/old/new/g
+     在文件內替�所有的字符串 old 為新的字符串 new，請輸入  :%s/old/new/g
+     進行全文替�時詢�用戶確��個替�需添加 c �項，請輸入 :%s/old/new/gc
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		第五講第一節︰在 VIM 內執行外部命令的方法
+
+
+	   ** 輸入 :! 然後緊隨著輸入一個外部命令�以執行該外部命令。**
+
+  1. 按下我們所熟悉的 : 命令設置光標到�幕底部。這樣就�以讓您輸入命令了。
+
+  2. 接著輸入感嘆號 ! 這個字符，這樣就�許您執行外部的 shell 命令了。
+
+  3. 我們以 ls 命令為例。輸入 !ls <回車> 。該命令就會列舉出您當�目錄的
+     內容，就如�您在命令行�示符下輸入 ls 命令的�果一樣。如果 !ls 沒起
+     作用，您�以試試 :!dir 看看。
+
+---> �示︰ 所有的外部命令都�以以這種方�執行。
+
+---> �示︰ 所有的 : 命令都必須以 <回車> 告終。
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		      第五講第二節︰關于�存文件的更多信�
+
+
+	     ** �將�文件的改動�存到文件中，請輸入 :w FILENAME **
+
+  1. 輸入 :!dir 或者 :!ls �知當�目錄的內容。您應當已知�最後還得敲
+     <回車> �。
+
+  2. �擇一個尚未存在文件�，比如 TEST 。
+
+  3. 接著輸入 :w TEST  (此處 TEST 是您所�擇的文件�。)
+
+  4. 該命令會以 TEST 為文件��存整個文件 (VIM 教程)。為了確�正確�存，
+     請�次輸入 :!dir 查看您的目錄列表內容。
+
+---> 請注�︰如果您退出 VIM 然後在以文件� TEST 為�數進入，那麼該文件內
+     容應該�您�存時的文件內容是完全一樣的。
+
+  5. �在您�以通�輸入 :!rm TEST 來刪除 TEST 文件了。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		    第五講第三節︰一個具有�擇性的�存命令
+
+
+		** ��存文件的部分內容，請輸入 :#,# w FILENAME **
+
+  1. �來執行一次 :!dir 或者 :!ls �知當�目錄的內容，然後�擇一個��的
+     ���的文件�，比如 TEST 。
+
+  2. 接著將光標移動至本�的最頂端，然後按 CTRL-g 找到該行的行號。別忘了
+     行號哦。
+
+  3. 接著把光標移動至本�的最底端，�按一次 CTRL-g 。也別忘了這個行好哦。
+
+  4. 為了��存文章的�個部分，請輸入 :#,# w TEST 。這裡的 #,# 就是上�
+     �求您記�的行號(頂端行號,底端行號)，而 TEST 就是�定的文件�。
+
+  5. 最後，用 :!dir 確�文件是�正確�存。但是這次先別刪除掉。
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		   第五講第四節︰��和�並文件
+
+
+       ** ��當�文件中�入�外的文件的內容，請輸入 :r FILENAME **
+
+  1. 請�入 :!dir 確�您��創建的 TEST 文件還在。
+
+  2. 然後將光標移動至當���的頂端。
+
+特別�示︰ 執行步驟3之後您將看到第五講第三節，請屆時�往下移動回到這裡來。
+
+  3. 接著通� :r TEST 將��創建的�為 TEST 的文件��進來。
+
+特別�示︰您所��進來的文件將從光標所在�置處開始置入。
+
+  4. 為了確�文件已經���功，移動光標回到原來的�置就�以注�有兩份第
+     五講第三節，一份是原本，�外一份是來自文件的副本。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			       第五講��
+
+
+  1. :!command 用于執行一個外部命令 command。
+
+     請看一些實際例�︰
+	 :!dir		-  用于顯示當�目錄的內容。
+	 :!rm FILENAME	-  用于刪除�為 FILENAME 的文件。
+
+  2. :w FILENAME  �將當� VIM 中正在編輯的文件�存到�為 FILENAME
+     的文件中。
+
+  3. :#,#w FILENAME �將當�編輯文件第 # 行至第 # 行的內容�存到文件
+     FILENAME 中。
+
+  4. :r FILENAME ����盤文件 FILENAME 並將其�入到當�文件的光標�置
+     後�。
+
+
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			 第六講第一節︰打開類命令
+
+
+	 ** 輸入 o 將在光標的下方打開新的一行並進入�入模�。**
+
+  1. 請將光標移動到本節中下�標記有 ---> 的那一行。
+
+  2. 接著輸入�寫的 o 在光標 *下方* 打開新的一行並進入�入模�。
+
+  3. 然後復制標記有 ---> 的行並按 <ESC> �退出�入模�而進入正常模�。
+
+---> After typing  o  the cursor is placed on the open line in Insert mode.
+
+  4. 為了在光標 *上方* 打開新的一行，�需�輸入大寫的 O 而�是�寫的 o
+     就�以了。請在下行測試一下�。當光標處在在該行上時，按 Shift-O�以
+     在該行上方新開一行。
+
+Open up a line above this by typing Shift-O while the cursor is on this line.
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			第六講第二節︰光標後�入類命令
+
+
+		     ** 輸入 a 將�在光標之後�入文本。 **
+
+  1. 請在正常模�下通�輸入 $ 將光標移動到本節中下�標記有 ---> 的第一行
+     的末尾。
+
+  2. 接著輸入�寫的 a 則�在光標之後�入文本了。大寫的 A 則�以直接在行
+     末�入文本。
+
+�示︰輸入大寫 A 的�作方法�以在行末�入文本，��了輸入 i，光標定�到
+      最後一個字符，輸入的文本，<ESC> 回復正常模�，箭頭��移動光標以�
+      x 刪除當�光標所在�置字符等等諸多�雜的�作。
+
+  3. �作之後第一行就�以補充完整了。請注�光標後�入文本與�入模�是基
+     本完全一致的，�是文本�入的�置定��有��罷了。
+
+---> This line will allow you to practice
+---> This line will allow you to practice appending text to the end of a line.
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		    第六講第三節︰�外一個置�類命令的版本
+
+
+		      ** 輸入大寫的 R �連續替�多個字符。**
+
+  1. 請將光標移動到本節中下�標記有 ---> 的第一行。
+
+  2. 移動光標到第一行中��于標有 ---> 的第二行的第一個單詞的開始，�單
+     詞 last 處。
+
+  3. 然後輸入大寫的 R 開始把第一行中的��于第二行的剩余字符�一輸入，就
+     �以全部替�掉原有的字符而使得第一行完全雷�第二行了。
+
+---> To make the first line the same as the last on this page use the keys.
+---> To make the first line the same as the second, type R and the new text.
+
+  4. 請注�︰如果您按 <ESC> 退出置�模�回復正常模�，尚未替�的文本將�
+     然��原狀。
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			    第六講第四節︰設置類命令的�項
+
+
+		  ** 設置�使查找或者替��忽略大�寫的�項 **
+
+
+  1. �查找單詞 ignore �在正常模�下輸入 /ignore 。��復查找該詞，�以
+     �復按 n �。
+
+  2. 然後設置 ic �項(ic就是英文忽略大�寫Ignore Case的首字�縮寫詞)，�
+     輸入︰
+	:set ic
+
+  3. �在�以通��入 n ��次查找單詞 ignore。�復查找�以�復�入 n �。
+
+  4. 然後設置 hlsearch 和 incsearch 這兩個�項，輸入以下內容︰
+     :set hls is
+
+  5. �在�以�次輸入查找命令，看看會有什麼效果︰
+     /ignore
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			       第六講��
+
+
+  1. 輸入�寫的 o �以在光標下方打開新的一行並將光標置于新開的行首，進入
+     �入模�。
+     輸入大寫的 O �以在光標上方打開新的一行並將光標置于新開的行首，進入
+     �入模�。
+
+  2. 輸入�寫的 a �以在光標所在�置之後�入文本。
+     輸入大寫的 A �以在光標所在行的行末之後�入文本。
+
+  3. 輸入大寫的 R 將進入替�模�，直至按 <ESC> �退出替�模�而進入正常
+     模�。
+
+  4. 輸入 :set xxx �以設置 xxx �項。
+
+
+
+
+
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		       第七講︰在線幫助命令
+
+		      ** 使用在線幫助系統 **
+
+  Vim �有一個細致全�的在線幫助系統。�啟動該幫助系統，請�擇如下三種方
+  法之一︰
+	- 按下 <HELP> � (如果�盤上有的話)
+	- 按下 <F1> � (如果�盤上有的話)
+	- 輸入	:help <回車>
+
+  輸入 :q <回車> �以關閉幫助窗�。
+
+  �供一個正確的�數給":help"命令，您�以找到關于該主題的幫助。請試驗以
+  下�數(�別忘了按回車�哦。:)︰
+
+	  :help w <回車>
+	  :help c_<T <回車>
+	  :help insert-index <回車>
+	  :help user-manual <回車>
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		      第八講︰創建一個啟動腳本
+
+			 ** 啟用vim的功能 **
+
+  Vim的功能特性�比vi多得多，但大部分功能都沒有缺�激活。為了啟動更多的
+  功能，您得創建一個vimrc文件。
+
+  1. 開始編輯vimrc文件，這�決于您所使用的�作系統︰
+
+     :edit ~/.vimrc		這是Unix系統所使用的命令
+     :edit $VIM/_vimrc		這是Windows系統所使用的命令
+
+  2. 接著導入vimrc范例文件︰
+
+     :read $VIMRUNTIME/vimrc_example.vim
+
+  3. �存文件，命令為︰
+
+     :write
+
+  在下次您啟動vim的時候，編輯器就會有了語法高亮的功能。您�以繼續把您喜
+  歡的其它功能設置添加到這個vimrc文件中。
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  vim 教程到此��。本教程�是為了簡明地介紹一下vim編輯器，但已足以讓您
+  很容易學會使用本編輯器了。毋庸質疑，vim還有很多很多的命令，本教程所介
+  紹的還差得�著呢。所以您�精通的話，還望繼續努力哦。下一步您�以閱讀
+  vim手冊，使用的命令是︰
+	:help user-manual
+
+  為了更進一步的�考和學習，以下這本書值得推薦︰
+
+	Vim - Vi Improved - 作者︰Steve Oualline
+	出版社︰New Riders
+
+  這是第一本完全講解vim的書�。�于�學者特別有用。其中還包�有大�實例
+  和圖示。欲知詳情，請訪� http://iccf-holland.org/click5.html
+
+  以下這本書比較�了而且內容主�是vi而�是vim，但是也值得推薦︰
+
+	Learning the Vi Editor - 作者︰Linda Lamb
+	出版社︰O'Reilly & Associates Inc.
+
+  這是一本�錯的書，通�它您幾乎能夠了解到全部vi能夠�到的事情。此書的第
+  六個版本也包�了一些關于vim的信�。
+
+  本教程是由來自Calorado School of Minese的Michael C. Pierce�Robert K.
+  Ware 所編寫的，其中來自Colorado State University的Charles Smith�供了
+  很多創�。編者通信地�是︰
+
+	bware@mines.colorado.edu
+
+  本教程已由Bram Moolenaar專為vim進行修訂。
+
+
+
+  譯制者附言︰
+  ===========
+      簡體中文教程翻譯版之譯制者為�昌泰 <beos@turbolinux.com.cn>，還有
+      �外一個�系地�︰linuxrat@gnuchina.org。
+
+      �體中文教程是從簡體中文教程翻譯版使用 Debian GNU/Linux 中文項目�
+      組的于廣�先生編寫的中文漢字轉碼器  autoconvert 轉�而�的，並�轉
+      �的�果�了一些細節的改動。
+
+  變更記錄︰
+  =========
+      2002年08月30日 �昌泰 <beos@turbolinux.com.cn>
+      感� RMS@SMTH 的指正，將多處錯誤修正。
+
+      2002年04月22日 �昌泰 <linuxrat@gnuchina.org>
+      感� xuandong@sh163.net 的指正，將兩處錯別字修正。
+
+      2002年03月18日 �昌泰 <linuxrat@gnuchina.org>
+      根據Bram Molenaar先生在2002年03月16日的來信�求，將vimtutor1.4中譯
+      版�級到vimtutor1.5。
+
+      2001年11月15日 �昌泰 <linuxrat@gnuchina.org>
+      將vimtutor1.4中譯版�交給Bram Molenaar和Sven Guckes。
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

From 2cf65b529f9f1912247847a650336b127521db91 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 13:35:51 +0200
Subject: [PATCH 054/136] updated for version 7.3.673 Problem:    Using "gN"
 while 'selection' is "exclusive" misses one character. 	    (Ben
 Fritz) Solution:   Check the direction when compensating for exclusive
 selection. 	    (Christian Brabandt)

---
 src/search.c  | 11 +++++++++--
 src/version.c |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/search.c b/src/search.c
index 158cfd8f5d..d7bfc43b14 100644
--- a/src/search.c
+++ b/src/search.c
@@ -4650,8 +4650,15 @@ current_search(count, forward)
     if (VIsual_active)
     {
 	redraw_curbuf_later(INVERTED);	/* update the inversion */
-	if (*p_sel == 'e' && ltoreq(VIsual, curwin->w_cursor))
-	    inc_cursor();
+	if (*p_sel == 'e')
+	{
+	    /* Correction for exclusive selection depends on the direction. */
+	    if (forward && ltoreq(VIsual, curwin->w_cursor))
+		inc_cursor();
+	    else if (!forward && ltoreq(curwin->w_cursor, VIsual))
+		inc(&VIsual);
+	}
+
     }
 
 #ifdef FEAT_FOLDING
diff --git a/src/version.c b/src/version.c
index cd50417553..e8fcf2c41a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    673,
 /**/
     672,
 /**/

From 329bb46d510d1bd3ee8cd7146f8f6cbd8b92572a Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 13:35:51 +0200
Subject: [PATCH 055/136] Added tag v7-3-673 for changeset ca1c025079b1

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 104a0ed275..648d60f967 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2009,3 +2009,4 @@ dde6d0216a08a5554f3c351e519134c386d14232 v7-3-668
 2bf8c00741f7f07d9b58596764236a92eaeca862 v7-3-670
 530f5a9030315f984e096794938c61f9d3562e22 v7-3-671
 fd6ef931aa77239804860b74ed2362b29c1a6d4a v7-3-672
+ca1c025079b11c98363e11576d903af756a593fc v7-3-673

From f08c83c8b674dd7e47894a2a3efc576b79b7f522 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 14:48:08 +0200
Subject: [PATCH 056/136] updated for version 7.3.674 Problem:    Can't compile
 with Lua/dyn on Cygwin. Solution:   Adjust configure to use the right library
 name. (Ken Takata)

---
 src/auto/configure | 61 +++++++++++++++++++++++++---------------------
 src/configure.in   | 53 ++++++++++++++++++++++------------------
 src/version.c      |  2 ++
 3 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/src/auto/configure b/src/auto/configure
index d0c935867b..a5398b101e 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4648,15 +4648,7 @@ $as_echo "not set, default to /usr" >&6; }
 
   LUA_INC=
   if test "X$vi_cv_path_lua_pfx" != "X"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5
-$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include... " >&6; }
-    if test -f $vi_cv_path_lua_pfx/include/lua.h; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-            # Extract the first word of "lua", so it can be a program name with args.
+        # Extract the first word of "lua", so it can be a program name with args.
 set dummy lua; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -4696,8 +4688,8 @@ $as_echo "no" >&6; }
 fi
 
 
-      if test "X$vi_cv_path_lua" != "X"; then
-                { $as_echo "$as_me:${as_lineno-$LINENO}: checking Lua version" >&5
+    if test "X$vi_cv_path_lua" != "X"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking Lua version" >&5
 $as_echo_n "checking Lua version... " >&6; }
 if test "${vi_cv_version_lua+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -4706,23 +4698,31 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua" >&5
 $as_echo "$vi_cv_version_lua" >&6; }
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua" >&5
-$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua... " >&6; }
-        if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5
+$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include... " >&6; }
+    if test -f $vi_cv_path_lua_pfx/include/lua.h; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-          LUA_INC=/lua$vi_cv_version_lua
-        else
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-          vi_cv_path_lua_pfx=
-        fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua" >&5
+$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua... " >&6; }
+      if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        LUA_INC=/lua$vi_cv_version_lua
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        vi_cv_path_lua_pfx=
       fi
     fi
   fi
 
   if test "X$vi_cv_path_lua_pfx" != "X"; then
-    if test "X$vi_cv_version_lua" != "X"; then
+    if test "X$LUA_INC" != "X"; then
             LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua"
     else
       LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua"
@@ -4734,16 +4734,21 @@ $as_echo "no" >&6; }
     $as_echo "#define FEAT_LUA 1" >>confdefs.h
 
     if test "$enable_luainterp" = "dynamic"; then
-                  for i in 0 1 2 3 4 5 6 7 8 9; do
-	if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then
-	  LUA_SONAME=".$i"
-	  break
-	fi
-      done
+      if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then
+	vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll"
+      else
+			for i in 0 1 2 3 4 5 6 7 8 9; do
+	  if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then
+	    LUA_SONAME=".$i"
+	    break
+	  fi
+	done
+	vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME"
+      fi
       $as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
 
       LUA_LIBS=""
-      LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua${vi_cv_version_lua}.so$LUA_SONAME\\\" $LUA_CFLAGS"
+      LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS"
     fi
   fi
   if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then
diff --git a/src/configure.in b/src/configure.in
index 5c14fc0c5c..4b8c200798 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -455,31 +455,31 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
 
   LUA_INC=
   if test "X$vi_cv_path_lua_pfx" != "X"; then
+    dnl -- try to find Lua executable
+    AC_PATH_PROG(vi_cv_path_lua, lua)
+    if test "X$vi_cv_path_lua" != "X"; then
+      dnl -- find Lua version
+      AC_CACHE_CHECK(Lua version, vi_cv_version_lua,
+      [ vi_cv_version_lua=`${vi_cv_path_lua} -e "print(_VERSION)" | sed 's/.* //'` ])
+    fi
     AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include)
     if test -f $vi_cv_path_lua_pfx/include/lua.h; then
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
-      dnl -- try to find Lua executable
-      AC_PATH_PROG(vi_cv_path_lua, lua)
-      if test "X$vi_cv_path_lua" != "X"; then
-        dnl -- find Lua version
-        AC_CACHE_CHECK(Lua version, vi_cv_version_lua,
-        [ vi_cv_version_lua=`${vi_cv_path_lua} -e "print(_VERSION)" | sed 's/.* //'` ])
-        AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua)
-        if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
-          AC_MSG_RESULT(yes)
-          LUA_INC=/lua$vi_cv_version_lua
-        else
-          AC_MSG_RESULT(no)
-          vi_cv_path_lua_pfx=
-        fi
+      AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua)
+      if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
+        AC_MSG_RESULT(yes)
+        LUA_INC=/lua$vi_cv_version_lua
+      else
+        AC_MSG_RESULT(no)
+        vi_cv_path_lua_pfx=
       fi
     fi
   fi
 
   if test "X$vi_cv_path_lua_pfx" != "X"; then
-    if test "X$vi_cv_version_lua" != "X"; then
+    if test "X$LUA_INC" != "X"; then
       dnl Test alternate location using version
       LUA_LIBS="-L${vi_cv_path_lua_pfx}/lib -llua$vi_cv_version_lua"
     else
@@ -491,17 +491,22 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
     LUA_PRO="if_lua.pro"
     AC_DEFINE(FEAT_LUA)
     if test "$enable_luainterp" = "dynamic"; then
-      dnl Determine the SONAME for the current version, but fallback to
-      dnl liblua${vi_cv_version_lua}.so if no SONAME-versioned file is found.
-      for i in 0 1 2 3 4 5 6 7 8 9; do
-	if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then
-	  LUA_SONAME=".$i"
-	  break
-	fi
-      done
+      if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then
+	vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll"
+      else
+	dnl Determine the SONAME for the current version, but fallback to
+	dnl liblua${vi_cv_version_lua}.so if no SONAME-versioned file is found.
+	for i in 0 1 2 3 4 5 6 7 8 9; do
+	  if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then
+	    LUA_SONAME=".$i"
+	    break
+	  fi
+	done
+	vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME"
+      fi
       AC_DEFINE(DYNAMIC_LUA)
       LUA_LIBS=""
-      LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"liblua${vi_cv_version_lua}.so$LUA_SONAME\\\" $LUA_CFLAGS"
+      LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS"
     fi
   fi
   if test "$fail_if_missing" = "yes" -a -z "$LUA_SRC"; then
diff --git a/src/version.c b/src/version.c
index e8fcf2c41a..fff0079c27 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    674,
 /**/
     673,
 /**/

From 0a531eb0bb1f25ce8b070dbd46572e7ed5c678f0 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 14:48:08 +0200
Subject: [PATCH 057/136] Added tag v7-3-674 for changeset 4da6003f0f0e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 648d60f967..9d5f497b56 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2010,3 +2010,4 @@ dde6d0216a08a5554f3c351e519134c386d14232 v7-3-668
 530f5a9030315f984e096794938c61f9d3562e22 v7-3-671
 fd6ef931aa77239804860b74ed2362b29c1a6d4a v7-3-672
 ca1c025079b11c98363e11576d903af756a593fc v7-3-673
+4da6003f0f0eee0f3908f8627af6d13a94c10cc6 v7-3-674

From 842aa3e3e9e6ea15c2ed34c097f586d7e4908dca Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 17:12:47 +0200
Subject: [PATCH 058/136] updated for version 7.3.675 Problem:    Using
 uninitialized memory with very long file name. Solution:   Put NUL after text
 when it is truncated. (ZyX)

---
 src/buffer.c  | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/buffer.c b/src/buffer.c
index 0a2ce8ec96..5998523219 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3058,7 +3058,7 @@ fileinfo(fullname, shorthelp, dont_truncate)
 
     *p++ = '"';
     if (buf_spname(curbuf) != NULL)
-	STRCPY(p, buf_spname(curbuf));
+	vim_strncpy(p, buf_spname(curbuf), IOSIZE - (p - buffer) - 1);
     else
     {
 	if (!fullname && curbuf->b_fname != NULL)
diff --git a/src/version.c b/src/version.c
index fff0079c27..1798f053c2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    675,
 /**/
     674,
 /**/

From 5ca34165b2aa41aaae46764acb89b1604f9b81d6 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 17:12:47 +0200
Subject: [PATCH 059/136] Added tag v7-3-675 for changeset 9963f7a9b41b

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 9d5f497b56..c6a7cfc979 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2011,3 +2011,4 @@ dde6d0216a08a5554f3c351e519134c386d14232 v7-3-668
 fd6ef931aa77239804860b74ed2362b29c1a6d4a v7-3-672
 ca1c025079b11c98363e11576d903af756a593fc v7-3-673
 4da6003f0f0eee0f3908f8627af6d13a94c10cc6 v7-3-674
+9963f7a9b41b555a0660288dd94df44b6dee7c2e v7-3-675

From 8ca6791477754114640470ecb0fef6fbf79b70ff Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 18:06:59 +0200
Subject: [PATCH 060/136] updated for version 7.3.676 Problem:    Ruby
 compilation on Windows 32 bit doesn't work. Solution:   Only use some
 functions for 64 bit. (Ken Takata)

---
 src/if_ruby.c | 6 ++++++
 src/version.c | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/src/if_ruby.c b/src/if_ruby.c
index dd1ba47009..aea7b5656e 100644
--- a/src/if_ruby.c
+++ b/src/if_ruby.c
@@ -178,9 +178,11 @@ static void ruby_vim_init(void);
 #define rb_hash_new			dll_rb_hash_new
 #define rb_inspect			dll_rb_inspect
 #define rb_int2inum			dll_rb_int2inum
+#if SIZEOF_INT < SIZEOF_LONG /* 64 bits only */
 #define rb_fix2int			dll_rb_fix2int
 #define rb_num2int			dll_rb_num2int
 #define rb_num2uint			dll_rb_num2uint
+#endif
 #define rb_lastline_get			dll_rb_lastline_get
 #define rb_lastline_set			dll_rb_lastline_set
 #define rb_load_protect			dll_rb_load_protect
@@ -271,9 +273,11 @@ static VALUE (*dll_rb_hash_aset) (VALUE, VALUE, VALUE);
 static VALUE (*dll_rb_hash_new) (void);
 static VALUE (*dll_rb_inspect) (VALUE);
 static VALUE (*dll_rb_int2inum) (long);
+#if SIZEOF_INT < SIZEOF_LONG /* 64 bits only */
 static long (*dll_rb_fix2int) (VALUE);
 static long (*dll_rb_num2int) (VALUE);
 static unsigned long (*dll_rb_num2uint) (VALUE);
+#endif
 static VALUE (*dll_rb_lastline_get) (void);
 static void (*dll_rb_lastline_set) (VALUE);
 static void (*dll_rb_load_protect) (VALUE, int, int*);
@@ -382,9 +386,11 @@ static struct
     {"rb_hash_new", (RUBY_PROC*)&dll_rb_hash_new},
     {"rb_inspect", (RUBY_PROC*)&dll_rb_inspect},
     {"rb_int2inum", (RUBY_PROC*)&dll_rb_int2inum},
+#if SIZEOF_INT < SIZEOF_LONG /* 64 bits only */
     {"rb_fix2int", (RUBY_PROC*)&dll_rb_fix2int},
     {"rb_num2int", (RUBY_PROC*)&dll_rb_num2int},
     {"rb_num2uint", (RUBY_PROC*)&dll_rb_num2uint},
+#endif
     {"rb_lastline_get", (RUBY_PROC*)&dll_rb_lastline_get},
     {"rb_lastline_set", (RUBY_PROC*)&dll_rb_lastline_set},
     {"rb_load_protect", (RUBY_PROC*)&dll_rb_load_protect},
diff --git a/src/version.c b/src/version.c
index 1798f053c2..38f132467c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    676,
 /**/
     675,
 /**/

From ad43616e35304fe4a7e0cda82da6d5d5b0f5b490 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 18:06:59 +0200
Subject: [PATCH 061/136] Added tag v7-3-676 for changeset 5309996ddced

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index c6a7cfc979..5a6f6f136c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2012,3 +2012,4 @@ fd6ef931aa77239804860b74ed2362b29c1a6d4a v7-3-672
 ca1c025079b11c98363e11576d903af756a593fc v7-3-673
 4da6003f0f0eee0f3908f8627af6d13a94c10cc6 v7-3-674
 9963f7a9b41b555a0660288dd94df44b6dee7c2e v7-3-675
+5309996ddcedd7e2dcc8c46624348405290b8940 v7-3-676

From 51c67d40f19b4bad07d1ebcbc399117f250b0cc8 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 18:25:00 +0200
Subject: [PATCH 062/136] updated for version 7.3.677 Problem:    buf_spname()
 is used inconsistently. Solution:   Make the return type a char_u pointer. 
 Check the size of the 	    returned string.

---
 src/buffer.c         | 18 +++++++++---------
 src/ex_cmds2.c       |  3 +--
 src/ex_docmd.c       |  2 +-
 src/memline.c        |  6 ++----
 src/proto/buffer.pro |  2 +-
 src/screen.c         |  2 +-
 src/version.c        |  2 ++
 7 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/buffer.c b/src/buffer.c
index 5998523219..05da2860dd 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2635,7 +2635,7 @@ buflist_list(eap)
 	    continue;
 	msg_putchar('\n');
 	if (buf_spname(buf) != NULL)
-	    STRCPY(NameBuff, buf_spname(buf));
+	    vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1);
 	else
 	    home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE);
 
@@ -3350,7 +3350,7 @@ maketitle()
 	else
 	{
 	    if (buf_spname(curbuf) != NULL)
-		i_name = (char_u *)buf_spname(curbuf);
+		i_name = buf_spname(curbuf);
 	    else		    /* use file name only in icon */
 		i_name = gettail(curbuf->b_ffname);
 	    *i_str = NUL;
@@ -3766,7 +3766,7 @@ build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar,
 	case STL_FILENAME:
 	    fillable = FALSE;	/* don't change ' ' to fillchar */
 	    if (buf_spname(wp->w_buffer) != NULL)
-		STRCPY(NameBuff, buf_spname(wp->w_buffer));
+		vim_strncpy(NameBuff, buf_spname(wp->w_buffer), MAXPATHL - 1);
 	    else
 	    {
 		t = (opt == STL_FULLPATH) ? wp->w_buffer->b_ffname
@@ -5244,7 +5244,7 @@ write_viminfo_bufferlist(fp)
  * Return special buffer name.
  * Returns NULL when the buffer has a normal file name.
  */
-    char *
+    char_u *
 buf_spname(buf)
     buf_T	*buf;
 {
@@ -5263,9 +5263,9 @@ buf_spname(buf)
 		goto win_found;
 win_found:
 	if (win != NULL && win->w_llist_ref != NULL)
-	    return _(msg_loclist);
+	    return (char_u *)_(msg_loclist);
 	else
-	    return _(msg_qflist);
+	    return (char_u *)_(msg_qflist);
     }
 #endif
 #ifdef FEAT_QUICKFIX
@@ -5274,12 +5274,12 @@ win_found:
     if (bt_nofile(buf))
     {
 	if (buf->b_sfname != NULL)
-	    return (char *)buf->b_sfname;
-	return _("[Scratch]");
+	    return buf->b_sfname;
+	return (char_u *)_("[Scratch]");
     }
 #endif
     if (buf->b_fname == NULL)
-	return _("[No Name]");
+	return (char_u *)_("[No Name]");
     return NULL;
 }
 
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index d3bf04fade..de190e78c3 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -1688,8 +1688,7 @@ check_changed_any(hidden)
 	    msg_didout = FALSE;
 	}
 	if (EMSG2(_("E162: No write since last change for buffer \"%s\""),
-		    buf_spname(buf) != NULL ? (char_u *)buf_spname(buf) :
-		    buf->b_fname))
+		    buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname))
 	{
 	    save = no_wait_return;
 	    no_wait_return = FALSE;
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index ebc8b98d11..311f4f0e91 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7602,7 +7602,7 @@ ex_tabs(eap)
 	    msg_putchar(bufIsChanged(wp->w_buffer) ? '+' : ' ');
 	    msg_putchar(' ');
 	    if (buf_spname(wp->w_buffer) != NULL)
-		STRCPY(IObuff, buf_spname(wp->w_buffer));
+		vim_strncpy(IObuff, buf_spname(wp->w_buffer), IOSIZE - 1);
 	    else
 		home_replace(wp->w_buffer, wp->w_buffer->b_fname,
 							IObuff, IOSIZE, TRUE);
diff --git a/src/memline.c b/src/memline.c
index 2a2426d672..fecd876373 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -780,9 +780,7 @@ ml_open_file(buf)
 	need_wait_return = TRUE;	/* call wait_return later */
 	++no_wait_return;
 	(void)EMSG2(_("E303: Unable to open swap file for \"%s\", recovery impossible"),
-		    buf_spname(buf) != NULL
-			? (char_u *)buf_spname(buf)
-			: buf->b_fname);
+		    buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname);
 	--no_wait_return;
     }
 
@@ -1315,7 +1313,7 @@ ml_recover()
     smsg((char_u *)_("Using swap file \"%s\""), NameBuff);
 
     if (buf_spname(curbuf) != NULL)
-	STRCPY(NameBuff, buf_spname(curbuf));
+	vim_strncpy(NameBuff, buf_spname(curbuf), MAXPATHL - 1);
     else
 	home_replace(NULL, curbuf->b_ffname, NameBuff, MAXPATHL, TRUE);
     smsg((char_u *)_("Original file \"%s\""), NameBuff);
diff --git a/src/proto/buffer.pro b/src/proto/buffer.pro
index 411c5af57e..85aeddaef5 100644
--- a/src/proto/buffer.pro
+++ b/src/proto/buffer.pro
@@ -51,7 +51,7 @@ void ex_buffer_all __ARGS((exarg_T *eap));
 void do_modelines __ARGS((int flags));
 int read_viminfo_bufferlist __ARGS((vir_T *virp, int writing));
 void write_viminfo_bufferlist __ARGS((FILE *fp));
-char *buf_spname __ARGS((buf_T *buf));
+char_u *buf_spname __ARGS((buf_T *buf));
 void buf_addsign __ARGS((buf_T *buf, int id, linenr_T lnum, int typenr));
 linenr_T buf_change_sign_type __ARGS((buf_T *buf, int markId, int typenr));
 int buf_getsigntype __ARGS((buf_T *buf, linenr_T lnum, int type));
diff --git a/src/screen.c b/src/screen.c
index 92eb232ef0..0e76d8cef2 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -9876,7 +9876,7 @@ get_trans_bufname(buf)
     buf_T	*buf;
 {
     if (buf_spname(buf) != NULL)
-	STRCPY(NameBuff, buf_spname(buf));
+	vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1);
     else
 	home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE);
     trans_characters(NameBuff, MAXPATHL);
diff --git a/src/version.c b/src/version.c
index 38f132467c..e0bff5328f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    677,
 /**/
     676,
 /**/

From 669a50fbe3667cbd1498897f03c915cb344cfa6e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 18:25:00 +0200
Subject: [PATCH 063/136] Added tag v7-3-677 for changeset 8115f449a574

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5a6f6f136c..49410d68dd 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2013,3 +2013,4 @@ ca1c025079b11c98363e11576d903af756a593fc v7-3-673
 4da6003f0f0eee0f3908f8627af6d13a94c10cc6 v7-3-674
 9963f7a9b41b555a0660288dd94df44b6dee7c2e v7-3-675
 5309996ddcedd7e2dcc8c46624348405290b8940 v7-3-676
+8115f449a574bc146f75449161f1757aaa5bbb66 v7-3-677

From 70c020ca71cc9c2a0a6b3d35d7fb578169b27886 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 18:50:00 +0200
Subject: [PATCH 064/136] updated for version 7.3.678 Problem:    Ruby .so name
 may not be correct. Solution:   Use the LIBRUBY_SO entry from the config.
 (Vit Ondruch)

---
 src/auto/configure | 2 +-
 src/configure.in   | 2 +-
 src/version.c      | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/auto/configure b/src/auto/configure
index a5398b101e..85fe8db2f6 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -6376,7 +6376,7 @@ $as_echo "$rubyhdrdir" >&6; }
 	$as_echo "#define FEAT_RUBY 1" >>confdefs.h
 
 	if test "$enable_rubyinterp" = "dynamic"; then
-	  libruby=`$vi_cv_path_ruby -r rbconfig -e 'printf "lib%s.%s\n", Config::CONFIG["RUBY_SO_NAME"], Config::CONFIG["DLEXT"]'`
+	  libruby=`$vi_cv_path_ruby -r rbconfig -e 'puts Config::CONFIG["LIBRUBY_SO"]'`
 	  $as_echo "#define DYNAMIC_RUBY 1" >>confdefs.h
 
 	  RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
diff --git a/src/configure.in b/src/configure.in
index 4b8c200798..8a7de2c368 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1487,7 +1487,7 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
 	RUBY_PRO="if_ruby.pro"
 	AC_DEFINE(FEAT_RUBY)
 	if test "$enable_rubyinterp" = "dynamic"; then
-	  libruby=`$vi_cv_path_ruby -r rbconfig -e 'printf "lib%s.%s\n", Config::CONFIG[["RUBY_SO_NAME"]], Config::CONFIG[["DLEXT"]]'`
+	  libruby=`$vi_cv_path_ruby -r rbconfig -e 'puts Config::CONFIG[["LIBRUBY_SO"]]'`
 	  AC_DEFINE(DYNAMIC_RUBY)
 	  RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
 	  RUBY_LIBS=
diff --git a/src/version.c b/src/version.c
index e0bff5328f..935dfea878 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    678,
 /**/
     677,
 /**/

From 41fa41daffb8c259175146a1f28dd2f9592ce82d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 18:50:00 +0200
Subject: [PATCH 065/136] Added tag v7-3-678 for changeset de253f606048

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 49410d68dd..f817b79433 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2014,3 +2014,4 @@ ca1c025079b11c98363e11576d903af756a593fc v7-3-673
 9963f7a9b41b555a0660288dd94df44b6dee7c2e v7-3-675
 5309996ddcedd7e2dcc8c46624348405290b8940 v7-3-676
 8115f449a574bc146f75449161f1757aaa5bbb66 v7-3-677
+de253f606048a2862a338190b071e5e3c7de7a41 v7-3-678

From 732b020ef1ab1a419543e71cdd126c51262df61f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 21:09:35 +0200
Subject: [PATCH 066/136] updated for version 7.3.679 Problem:    Ruby
 detection uses Config, newer Ruby versions use RbConfig. Solution:   Detect
 the need to use RbConfig. (Vit Ondruch)

---
 src/auto/configure | 26 +++++++++++++++++---------
 src/configure.in   | 24 +++++++++++++++---------
 src/version.c      |  2 ++
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/auto/configure b/src/auto/configure
index 85fe8db2f6..fc8a1373a1 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -6332,26 +6332,34 @@ $as_echo_n "checking Ruby version... " >&6; }
     if $vi_cv_path_ruby -e '(VERSION rescue RUBY_VERSION) >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
 $as_echo "OK" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby rbconfig" >&5
+$as_echo_n "checking Ruby rbconfig... " >&6; }
+      ruby_rbconfig="RbConfig"
+      if ! $vi_cv_path_ruby -r rbconfig -e 'RbConfig' >/dev/null 2>/dev/null; then
+	ruby_rbconfig="Config"
+      fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ruby_rbconfig" >&5
+$as_echo "$ruby_rbconfig" >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby header files" >&5
 $as_echo_n "checking Ruby header files... " >&6; }
-      rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG["rubyhdrdir"] || Config::CONFIG["archdir"] || $hdrdir' 2>/dev/null`
+      rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e "print $ruby_rbconfig::CONFIG['rubyhdrdir'] || $ruby_rbconfig::CONFIG['archdir'] || \\$hdrdir" 2>/dev/null`
       if test "X$rubyhdrdir" != "X"; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rubyhdrdir" >&5
 $as_echo "$rubyhdrdir" >&6; }
 	RUBY_CFLAGS="-I$rubyhdrdir"
-        rubyarch=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["arch"]'`
+        rubyarch=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['arch']"`
         if test -d "$rubyhdrdir/$rubyarch"; then
           RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch"
         fi
-        rubyversion=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["ruby_version"].gsub(/\./, "")[0,2]'`
+        rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['ruby_version'].gsub(/\./, '')[0,2]"`
         RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion"
-	rubylibs=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LIBS"]'`
+	rubylibs=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['LIBS']"`
 	if test "X$rubylibs" != "X"; then
 	  RUBY_LIBS="$rubylibs"
 	fi
-	librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["LIBRUBYARG"])'`
-	librubya=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["LIBRUBY_A"])'`
-  rubylibdir=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG["libdir"])'`
+	librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBYARG'])"`
+	librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBY_A'])"`
+  rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"`
 	if test -f "$rubylibdir/$librubya"; then
 	  librubyarg="$librubyarg"
     RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
@@ -6363,7 +6371,7 @@ $as_echo "$rubyhdrdir" >&6; }
 	if test "X$librubyarg" != "X"; then
 	  RUBY_LIBS="$librubyarg $RUBY_LIBS"
 	fi
-	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'`
+	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['LDFLAGS']"`
 	if test "X$rubyldflags" != "X"; then
 	  	  	  	  rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
 	  if test "X$rubyldflags" != "X"; then
@@ -6376,7 +6384,7 @@ $as_echo "$rubyhdrdir" >&6; }
 	$as_echo "#define FEAT_RUBY 1" >>confdefs.h
 
 	if test "$enable_rubyinterp" = "dynamic"; then
-	  libruby=`$vi_cv_path_ruby -r rbconfig -e 'puts Config::CONFIG["LIBRUBY_SO"]'`
+	  libruby=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG['LIBRUBY_SO']"`
 	  $as_echo "#define DYNAMIC_RUBY 1" >>confdefs.h
 
 	  RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
diff --git a/src/configure.in b/src/configure.in
index 8a7de2c368..37c3fb12fe 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1442,24 +1442,30 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
     AC_MSG_CHECKING(Ruby version)
     if $vi_cv_path_ruby -e '(VERSION rescue RUBY_VERSION) >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then
       AC_MSG_RESULT(OK)
+      AC_MSG_CHECKING(Ruby rbconfig)
+      ruby_rbconfig="RbConfig"
+      if ! $vi_cv_path_ruby -r rbconfig -e 'RbConfig' >/dev/null 2>/dev/null; then
+	ruby_rbconfig="Config"
+      fi
+      AC_MSG_RESULT($ruby_rbconfig)
       AC_MSG_CHECKING(Ruby header files)
-      rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG[["rubyhdrdir"]] || Config::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null`
+      rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e "print $ruby_rbconfig::CONFIG[['rubyhdrdir']] || $ruby_rbconfig::CONFIG[['archdir']] || \\$hdrdir" 2>/dev/null`
       if test "X$rubyhdrdir" != "X"; then
 	AC_MSG_RESULT($rubyhdrdir)
 	RUBY_CFLAGS="-I$rubyhdrdir"
-        rubyarch=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["arch"]]'`
+        rubyarch=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['arch']]"`
         if test -d "$rubyhdrdir/$rubyarch"; then
           RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch"
         fi
-        rubyversion=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["ruby_version"]].gsub(/\./, "")[[0,2]]'`
+        rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,2]]"`
         RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion"
-	rubylibs=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LIBS"]]'`
+	rubylibs=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['LIBS']]"`
 	if test "X$rubylibs" != "X"; then
 	  RUBY_LIBS="$rubylibs"
 	fi
-	librubyarg=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'`
-	librubya=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBY_A"]])'`
-  rubylibdir=`$vi_cv_path_ruby -r rbconfig -e 'print Config.expand(Config::CONFIG[["libdir"]])'`
+	librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBYARG']])"`
+	librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBY_A']])"`
+  rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['libdir']])"`
 	if test -f "$rubylibdir/$librubya"; then
 	  librubyarg="$librubyarg"
     RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
@@ -1472,7 +1478,7 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
 	if test "X$librubyarg" != "X"; then
 	  RUBY_LIBS="$librubyarg $RUBY_LIBS"
 	fi
-	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'`
+	rubyldflags=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['LDFLAGS']]"`
 	if test "X$rubyldflags" != "X"; then
 	  dnl Ruby on Mac OS X 10.5 adds "-arch" flags but these should only
 	  dnl be included if requested by passing --with-mac-arch to
@@ -1487,7 +1493,7 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
 	RUBY_PRO="if_ruby.pro"
 	AC_DEFINE(FEAT_RUBY)
 	if test "$enable_rubyinterp" = "dynamic"; then
-	  libruby=`$vi_cv_path_ruby -r rbconfig -e 'puts Config::CONFIG[["LIBRUBY_SO"]]'`
+	  libruby=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG[['LIBRUBY_SO']]"`
 	  AC_DEFINE(DYNAMIC_RUBY)
 	  RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby\\\" -DDYNAMIC_RUBY_VER=$rubyversion $RUBY_CFLAGS"
 	  RUBY_LIBS=
diff --git a/src/version.c b/src/version.c
index 935dfea878..9ef1e8f07c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    679,
 /**/
     678,
 /**/

From f0073e43e060992dbc5bb5cd57af1cbc5bb31ef6 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 21:09:35 +0200
Subject: [PATCH 067/136] Added tag v7-3-679 for changeset dd0f25ede9a8

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f817b79433..821b3b868d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2015,3 +2015,4 @@ ca1c025079b11c98363e11576d903af756a593fc v7-3-673
 5309996ddcedd7e2dcc8c46624348405290b8940 v7-3-676
 8115f449a574bc146f75449161f1757aaa5bbb66 v7-3-677
 de253f606048a2862a338190b071e5e3c7de7a41 v7-3-678
+dd0f25ede9a8322b5b638961835cc4743cd479a2 v7-3-679

From 93fb4a15898f283b3a112630b8c30844dda714ed Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 21:33:41 +0200
Subject: [PATCH 068/136] updated for version 7.3.680 Problem:    Some files
 missing in the list of distributed files. Solution:   Add lines for new
 files.

---
 Filelist      | 3 +++
 src/version.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/Filelist b/Filelist
index 2eac3685a9..b63acd9c2a 100644
--- a/Filelist
+++ b/Filelist
@@ -261,6 +261,7 @@ SRC_DOS =	\
 		src/Make_mvc.mak \
 		src/Make_w16.mak \
 		src/bigvim.bat \
+		src/bigvim64.bat \
 		src/msvcsetup.bat \
 		src/msvc2008.bat \
 		src/msvc2010.bat \
@@ -352,6 +353,7 @@ SRC_DOS_BIN =	\
 		src/xpm/COPYRIGHT \
 		src/xpm/README.txt \
 		src/xpm/include/*.h \
+		src/xpm/x64/lib/libXpm.a \
 		src/xpm/x64/lib/libXpm.lib \
 		src/xpm/x86/lib/libXpm.a \
 		src/xpm/x86/lib/libXpm.lib \
@@ -692,6 +694,7 @@ LANG_GEN = \
 		runtime/tutor/tutor.utf-8 \
 		runtime/tutor/tutor.?? \
 		runtime/tutor/tutor.??.* \
+		runtime/tutor/tutor.??_??.* \
 		runtime/tutor/tutor.bar \
 		runtime/tutor/tutor.bar.* \
 		runtime/spell/README.txt \
diff --git a/src/version.c b/src/version.c
index 9ef1e8f07c..fa453088c3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    680,
 /**/
     679,
 /**/

From e21e514d4e86f47ab7a32236831a866e4ffb4276 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 21:33:41 +0200
Subject: [PATCH 069/136] Added tag v7-3-680 for changeset 52acec46b75e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 821b3b868d..133b31690e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2016,3 +2016,4 @@ ca1c025079b11c98363e11576d903af756a593fc v7-3-673
 8115f449a574bc146f75449161f1757aaa5bbb66 v7-3-677
 de253f606048a2862a338190b071e5e3c7de7a41 v7-3-678
 dd0f25ede9a8322b5b638961835cc4743cd479a2 v7-3-679
+52acec46b75ecf24d044982d4cc067ef7890e7d6 v7-3-680

From 393f45e8d62817ea64a783ec901bd88f7423a10a Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 21:46:54 +0200
Subject: [PATCH 070/136] Update runtime files.

---
 runtime/doc/if_pyth.txt         |   4 +-
 runtime/doc/todo.txt            |  33 +-
 runtime/filetype.vim            |   5 +-
 runtime/syntax/synload.vim      |   4 +-
 runtime/tutor/tutor             |   2 +-
 runtime/tutor/tutor.eo.utf-8    |   2 +-
 runtime/tutor/tutor.fr          |   2 +-
 runtime/tutor/tutor.fr.utf-8    |   2 +-
 runtime/tutor/tutor.hr          |   2 +-
 runtime/tutor/tutor.hr.cp1250   |   2 +-
 runtime/tutor/tutor.hr.utf-8    |   2 +-
 runtime/tutor/tutor.ja.euc      |  10 +-
 runtime/tutor/tutor.ja.sjis     |  10 +-
 runtime/tutor/tutor.ja.utf-8    |  10 +-
 runtime/tutor/tutor.ko.euc      |   2 +-
 runtime/tutor/tutor.ko.utf-8    |   2 +-
 runtime/tutor/tutor.nb          |   2 +-
 runtime/tutor/tutor.nb.utf-8    |   2 +-
 runtime/tutor/tutor.no          |   2 +-
 runtime/tutor/tutor.no.utf-8    |   2 +-
 runtime/tutor/tutor.sk          |   2 +-
 runtime/tutor/tutor.sk.cp1250   |   2 +-
 runtime/tutor/tutor.sk.utf-8    |   2 +-
 runtime/tutor/tutor.utf-8       |   2 +-
 runtime/tutor/tutor.zh.euc      | 829 ++++++++++++++++++-------------
 runtime/tutor/tutor.zh.utf-8    | 852 --------------------------------
 runtime/tutor/tutor.zh_cn.utf-8 | 829 ++++++++++++++++++-------------
 src/INSTALLpc.txt               |  16 +-
 28 files changed, 1054 insertions(+), 1582 deletions(-)
 delete mode 100644 runtime/tutor/tutor.zh.utf-8

diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 92840d40ec..ec7d2396ea 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 7.3.  Last change: 2012 Aug 02
+*if_pyth.txt*   For Vim version 7.3.  Last change: 2012 Sep 23
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -165,7 +165,7 @@ vim.bindeval(str)					*python-bindeval*
 	     Value           Meaning ~
 	     zero            Variable is not locked
 	     vim.VAR_LOCKED  Variable is locked, but can be unlocked
-	     vim.VAR_FIXED   Variable is locked and can’t be unlocked
+	     vim.VAR_FIXED   Variable is locked and can't be unlocked
 	   integer constants. If variable is not fixed, you can do 
 	   `var.locked=True` to lock it and `var.locked=False` to unlock. 
 	   There is no recursive locking like |:lockvar|! does. There is also 
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index e3e6bbbffc..275b7ac45a 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 Sep 21
+*todo.txt*      For Vim version 7.3.  Last change: 2012 Oct 03
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -36,18 +36,20 @@ not be repeated below, unless there is extra information.
 
 Go through more coverity reports.
 
-Ruby problem, patch in issue 49. (Sep 19)
-Also in email from Ondruch?
-
 Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
 
-GTK: problem with 'L' in 'guioptions' changing the window width.
-(Aaron Cornelius, 2012 Feb 6)
-
 Checking runtime scripts: Thilo Six, 2012 Jun 6.
 
 Crash with 1023 byte directory name. (Danek Duvall, 2012 Sep 19)
 
+Patch for wrong text in balloon, Issue 58. (Dominique Pelle)
+
+Patch for menu.vim to correct message about adding spell file.
+(Jiri Sedlak, 2012 Sep 24)
+
+GTK: problem with 'L' in 'guioptions' changing the window width.
+(Aaron Cornelius, 2012 Feb 6)
+
 Patch for SGR mouse with older xterm. (Hayaki Saito, 2012 Sep 19)
 
 Patch for crash with an autocommand. (ZyX, 2012 Sep 6, second one)
@@ -79,16 +81,32 @@ Aug 16)
 the order they were made.  Also ":gredo".  Both with a count.  Useful when
 tests fail after making changes and you forgot in which files.
 
+Crash with vimdiff. (Don Cruickshank, 2012 Sep 23)
+
+Win32: use 'guifontwide' for IME composition. (Taro Muraoka, 2012 Sep 30)
+Update Oct 2.
+
+Patch to make multibyte input work on Win32 console when codepage differs from
+'encoding'. (Ken Takata, 2012 Sep 29)
+
+It's possible to defined an input() function that overrides the built-in one.
+(ZyX, 2012 Sep 28)
+
 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)
 
+Patch to support 'u' in interactive substitute. (Christian Brabandt, 2012 Sep
+28)  Asked for tests.
+
 Patch for IME handling, adds 'imactivatefunc' and 'imstatusfunc' option.
 (Yukihiro Nakadaira, 2012 Aug 16)
 Patch to improve IME handling. (Yasuhiro Matsumoto, 2012 Jul 18)
 
 Issue 54: document behavior of -complete, also expands arg.
 
+New syntax files for apt. (quidame, 2012 Sep 21)
+
 Patch for if_lua. (Luis Carvalho, 2012 Aug 26, update Aug 29, another Aug 30,
 then Sep 1)
 
@@ -156,6 +174,7 @@ Do give the prompt? Quit with an error?
 Patch for 'backupcopy' default behavior for symlinks on Windows. (David Pope,
 2012 Mar 21, update Mar 31)
 With fix for memory leak: Ken Takata, 2012 Aug 24
+Another update Sep 24.
 
 Patch to list user digraphs. (Christian Brabandt, 2012 Apr 14)
 
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 6f6bc812ad..5010d68773 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 Sep 06
+" Last Change:	2012 Oct 03
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -633,6 +633,9 @@ au BufNewFile,BufRead *.dsl			setf dsl
 " DTD (Document Type Definition for XML)
 au BufNewFile,BufRead *.dtd			setf dtd
 
+" DTS/DSTI (device tree files)
+au BufNewFile,BufRead *.dts,*.dtsi		setf dts
+
 " EDIF (*.edf,*.edif,*.edn,*.edo)
 au BufNewFile,BufRead *.ed\(f\|if\|n\|o\)	setf edif
 
diff --git a/runtime/syntax/synload.vim b/runtime/syntax/synload.vim
index 9b28fd8f41..48b5956b3c 100644
--- a/runtime/syntax/synload.vim
+++ b/runtime/syntax/synload.vim
@@ -1,6 +1,6 @@
 " Vim syntax support file
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 Feb 11
+" Last Change:	2012 Sep 25
 
 " This file sets up for syntax highlighting.
 " It is loaded from "syntax.vim" and "manual.vim".
@@ -46,6 +46,8 @@ fun! s:SynSet()
       echohl None
     endif
     let s = &filetype
+  elseif s == "OFF"
+    let s = ""
   endif
 
   if s != ""
diff --git a/runtime/tutor/tutor b/runtime/tutor/tutor
index daf42b6bb2..da28a15313 100644
--- a/runtime/tutor/tutor
+++ b/runtime/tutor/tutor
@@ -658,7 +658,7 @@ NOTE: If you were to exit Vim and start it again with  vim TEST , the file
   4. Type  w TEST  , where TEST is a filename that does not exist yet.  Verify
      that you see  :'<,'>w TEST  before you press <ENTER>.
 
-  5. Vim will write the selected lines to the file TEST.  Use  :!dir  or  !ls
+  5. Vim will write the selected lines to the file TEST.  Use  :!dir  or  :!ls
      to see it.  Do not remove it yet!  We will use it in the next lesson.
 
 NOTE:  Pressing  v  starts Visual selection.  You can move the cursor around
diff --git a/runtime/tutor/tutor.eo.utf-8 b/runtime/tutor/tutor.eo.utf-8
index 41f40726d9..44d7b29a37 100644
--- a/runtime/tutor/tutor.eo.utf-8
+++ b/runtime/tutor/tutor.eo.utf-8
@@ -645,7 +645,7 @@ RIMARKO: Ĉiuj  :  komandoj devas fini�i per tajpo de <Enenklavo>
   3. Nun tajpu:   :w TESTO   (kie TESTO estas la elektita dosiernomo)
 
   4. Tio konservas la tutan dosieron (instruilon de Vim) kun la nomo TESTO.
-     Por kontroli tion, tajpu   :!dir   aÅ­   !ls   denove por vidigi vian
+     Por kontroli tion, tajpu   :!dir   aÅ­   :!ls   denove por vidigi vian
      dosierujon.
 
 RIMARKO: Se vi volus eliri el Vim kaj restartigi �in denove per  vim TESTO,
diff --git a/runtime/tutor/tutor.fr b/runtime/tutor/tutor.fr
index f51a62e532..2eb92d5e95 100644
--- a/runtime/tutor/tutor.fr
+++ b/runtime/tutor/tutor.fr
@@ -707,7 +707,7 @@ NOTE : Si vous quittez Vim et le red
      Vérifiez que vous voyez  :'<,'>w TEST  avant de d'appuyer sur <Entrée>.
 
   5. Vim va enregistrer les lignes sélectionnées dans le fichier TEST.
-     Utilisez  :!dir  ou  !ls pour le voir. Ne l'effacez pas encore !
+     Utilisez  :!dir  ou  :!ls pour le voir. Ne l'effacez pas encore !
      Nous allons l'utiliser dans la leçon suivante.
 
 NOTE : L'appui de  v  démarre la sélection Visuelle. Vous pouvez déplacer le
diff --git a/runtime/tutor/tutor.fr.utf-8 b/runtime/tutor/tutor.fr.utf-8
index 6281538939..9e1087de64 100644
--- a/runtime/tutor/tutor.fr.utf-8
+++ b/runtime/tutor/tutor.fr.utf-8
@@ -707,7 +707,7 @@ NOTE : Si vous quittez Vim et le redémarrez de nouveau avec le fichier TEST,
      Vérifiez que vous voyez  :'<,'>w TEST  avant de d'appuyer sur <Entrée>.
 
   5. Vim va enregistrer les lignes sélectionnées dans le fichier TEST.
-     Utilisez  :!dir  ou  !ls pour le voir. Ne l'effacez pas encore !
+     Utilisez  :!dir  ou  :!ls pour le voir. Ne l'effacez pas encore !
      Nous allons l'utiliser dans la leçon suivante.
 
 NOTE : L'appui de  v  démarre la sélection Visuelle. Vous pouvez déplacer le
diff --git a/runtime/tutor/tutor.hr b/runtime/tutor/tutor.hr
index f1d346c2ac..90443bf659 100644
--- a/runtime/tutor/tutor.hr
+++ b/runtime/tutor/tutor.hr
@@ -659,7 +659,7 @@ NAPOMENA:  Ako bi napustili Vim i ponovno ga pokrenuli sa vim TEST ,
      Provjerite da zaista pi¹e  :'<,'>w TEST
      prije nego ¹to pritisnite <ENTER>.
 
-  5. Vim æe spremiti oznaèeni tekst u TEST.  Provjerite sa :!dir  ili  !ls .
+  5. Vim æe spremiti oznaèeni tekst u TEST.  Provjerite sa :!dir  ili  :!ls .
      Nemojte je jo¹ brisati!  Koristiti æe te je u sljedeæoj lekciji.
 
 NAPOMENA:  Tipka  v  zapoèinje Vizualno oznaèavanje.  Mo¾ete pomicati kursor
diff --git a/runtime/tutor/tutor.hr.cp1250 b/runtime/tutor/tutor.hr.cp1250
index 92771ab22b..1956a8aba0 100644
--- a/runtime/tutor/tutor.hr.cp1250
+++ b/runtime/tutor/tutor.hr.cp1250
@@ -659,7 +659,7 @@ NAPOMENA:  Ako bi napustili Vim i ponovno ga pokrenuli sa vim TEST ,
      Provjerite da zaista piše  :'<,'>w TEST
      prije nego što pritisnite <ENTER>.
 
-  5. Vim æe spremiti oznaèeni tekst u TEST.  Provjerite sa :!dir  ili  !ls .
+  5. Vim æe spremiti oznaèeni tekst u TEST.  Provjerite sa :!dir  ili  :!ls .
      Nemojte je još brisati!  Koristiti æe te je u sljedeæoj lekciji.
 
 NAPOMENA:  Tipka  v  zapoèinje Vizualno oznaèavanje.  Možete pomicati kursor
diff --git a/runtime/tutor/tutor.hr.utf-8 b/runtime/tutor/tutor.hr.utf-8
index 396bdfeb14..79838ec7f2 100644
--- a/runtime/tutor/tutor.hr.utf-8
+++ b/runtime/tutor/tutor.hr.utf-8
@@ -659,7 +659,7 @@ NAPOMENA:  Ako bi napustili Vim i ponovno ga pokrenuli sa vim TEST ,
      Provjerite da zaista piše  :'<,'>w TEST
      prije nego Å¡to pritisnite <ENTER>.
 
-  5. Vim će spremiti ozna�eni tekst u TEST.  Provjerite sa :!dir  ili  !ls .
+  5. Vim će spremiti ozna�eni tekst u TEST.  Provjerite sa :!dir  ili  :!ls .
      Nemojte je još brisati!  Koristiti će te je u sljedećoj lekciji.
 
 NAPOMENA:  Tipka  v  zapo�inje Vizualno ozna�avanje.  Možete pomicati kursor
diff --git a/runtime/tutor/tutor.ja.euc b/runtime/tutor/tutor.ja.euc
index 513439344e..2734ee8ca3 100644
--- a/runtime/tutor/tutor.ja.euc
+++ b/runtime/tutor/tutor.ja.euc
@@ -117,7 +117,7 @@ NOTE: 
 		     ¥ì¥Ã¥¹¥ó 1.5: ¥Æ¥­¥¹¥ÈÊÔ½¸ - ÄɲÃ
 
 
-		 ** ¥Æ¥­¥¹¥ÈÄɲ乤ë¤Ë¤Ï A ¤ò²¡¤·¤Þ¤·¤ç¤¦ **
+		 ** ¥Æ¥­¥¹¥È¤òÄɲ乤ë¤Ë¤Ï A ¤ò²¡¤·¤Þ¤·¤ç¤¦ **
 
   1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿ºÇ½é¤Î¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
      ¥«¡¼¥½¥ë¤¬¤½¤Îʸ»ú¾å¤Ë¤¢¤Ã¤Æ¤â¤«¤Þ¤¤¤Þ¤»¤ó¡£
@@ -232,7 +232,7 @@ NOTE: <ESC> 
 		     ¥ì¥Ã¥¹¥ó 2.3: ¥ª¥Ú¥ì¡¼¥¿¤È¥â¡¼¥·¥ç¥ó
 
 
-  ¿¤¯¤Î¥³¥Þ¥ó¥É¤Ï¥ª¥Ú¥ì¡¼¥¿¤È¥â¡¼¥·¥ç¥ó¤«¤é¥Æ¥­¥¹¥È¤ËÊѹ¹¤ò²Ã¤Þ¤¹¡£
+  ¿¤¯¤Î¥³¥Þ¥ó¥É¤Ï¥ª¥Ú¥ì¡¼¥¿¤È¥â¡¼¥·¥ç¥ó¤«¤é¥Æ¥­¥¹¥È¤ËÊѹ¹¤ò²Ã¤¨¤Þ¤¹¡£
   ºï½ü¥³¥Þ¥ó¥É d ¤Î¥ª¥Ú¥ì¡¼¥¿¤Ï¼¡¤ÎÍͤˤʤäƤ¤¤Þ¤¹:
 
   	d   ¥â¡¼¥·¥ç¥ó
@@ -259,7 +259,7 @@ NOTE: 
 
   1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤ÎÀèƬ¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¤Þ¤¹¡£
 
-  2. 2dw ¤ò¥¿¥¤¥×¤·¤Æñ¸ì2¤Äʬ°ÜÆ°¤·¤Þ¤¹¡£
+  2. 2dw ¤ò¥¿¥¤¥×¤·¤Æñ¸ì2¤Äʬºï½ü¤·¤Þ¤¹¡£
 
   3. 3e ¤ò¥¿¥¤¥×¤·¤Æ3¤ÄÌܤÎñ¸ì¤Î½ªÃ¼¤Ë°ÜÆ°¤·¤Þ¤¹¡£
 
@@ -326,8 +326,8 @@ NOTE:  
 
   ** ºÇ¸å¤Î¥³¥Þ¥ó¥É¤ò¼è¤ê¾Ã¤¹¤Ë¤Ï u ¤ò²¡¤·¤Þ¤¹¡£U ¤Ï¹ÔÁ´ÂΤμè¾Ã¤Ç¤¹¡£ **
 
-  1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¡¢ºÇ½é¤Î´Ö°ã¤¤¤Ë¥«¡¼¥½
-     ¥ë¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
+  1. °Ê²¼¤Î ---> ¤È¼¨¤µ¤ì¤¿¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°¤·¡¢ºÇ½é¤Î´Ö°ã¤¤¤Ë¥«¡¼¥½¥ë
+     ¤ò°ÜÆ°¤·¤Þ¤·¤ç¤¦¡£
   2. x ¤ò¥¿¥¤¥×¤·¤Æ¤¤¤é¤Ê¤¤ÀèƬ¤Îʸ»ú¤òºï½ü¤·¤Þ¤·¤ç¤¦¡£
   3. ¤µ¤¡¡¢u ¤ò¥¿¥¤¥×¤·¤ÆºÇ¸å¤Ë¼Â¹Ô¤·¤¿¥³¥Þ¥ó¥É¤ò¼è¤ê¾Ã¤·¤Þ¤·¤ç¤¦¡£
   4. º£Å٤ϡ¢x ¤ò»ÈÍѤ·¤Æ¸í¤ê¤òÁ´¤Æ½¤Àµ¤·¤Þ¤·¤ç¤¦¡£
diff --git a/runtime/tutor/tutor.ja.sjis b/runtime/tutor/tutor.ja.sjis
index 7be2120a5c..fe3be23b44 100644
--- a/runtime/tutor/tutor.ja.sjis
+++ b/runtime/tutor/tutor.ja.sjis
@@ -117,7 +117,7 @@ NOTE: 
 		     ƒŒƒbƒXƒ“ 1.5: ƒeƒLƒXƒg•Ò�W - ’ljÁ
 
 
-		 ** ƒeƒLƒXƒg’ljÁ‚·‚é‚É‚Í A ‚ð‰Ÿ‚µ‚Ü‚µ‚傤 **
+		 ** ƒeƒLƒXƒg‚ð’ljÁ‚·‚é‚É‚Í A ‚ð‰Ÿ‚µ‚Ü‚µ‚傤 **
 
   1. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽ�Å�‰‚Ì�s‚ɃJ�[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤�B
      ƒJ�[ƒ\ƒ‹‚ª‚»‚Ì•¶Žš�ã‚É‚ ‚Á‚Ä‚à‚©‚Ü‚¢‚Ü‚¹‚ñ�B
@@ -232,7 +232,7 @@ NOTE: <ESC> 
 		     ƒŒƒbƒXƒ“ 2.3: ƒIƒyƒŒ�[ƒ^‚ƃ‚�[ƒVƒ‡ƒ“
 
 
-  ‘½‚­‚̃Rƒ}ƒ“ƒh‚̓IƒyƒŒ�[ƒ^‚ƃ‚�[ƒVƒ‡ƒ“‚©‚çƒeƒLƒXƒg‚É•Ï�X‚ð‰Á‚Ü‚·�B
+  ‘½‚­‚̃Rƒ}ƒ“ƒh‚̓IƒyƒŒ�[ƒ^‚ƃ‚�[ƒVƒ‡ƒ“‚©‚çƒeƒLƒXƒg‚É•Ï�X‚ð‰Á‚¦‚Ü‚·�B
   �í�œƒRƒ}ƒ“ƒh d ‚̃IƒyƒŒ�[ƒ^‚ÍŽŸ‚Ì—l‚É‚È‚Á‚Ä‚¢‚Ü‚·:
 
   	d   ƒ‚�[ƒVƒ‡ƒ“
@@ -259,7 +259,7 @@ NOTE: 
 
   1. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽ�s‚Ì�擪‚ɃJ�[ƒ\ƒ‹‚ðˆÚ“®‚µ‚Ü‚·�B
 
-  2. 2dw ‚ðƒ^ƒCƒv‚µ‚Ä’PŒê2‚•ªˆÚ“®‚µ‚Ü‚·�B
+  2. 2dw ‚ðƒ^ƒCƒv‚µ‚Ä’PŒê2‚•ª�í�œ‚µ‚Ü‚·�B
 
   3. 3e ‚ðƒ^ƒCƒv‚µ‚Ä3‚–ڂ̒PŒê‚Ì�I’[‚Ɉړ®‚µ‚Ü‚·�B
 
@@ -326,8 +326,8 @@ NOTE:  
 
   ** �ÅŒã‚̃Rƒ}ƒ“ƒh‚ðŽæ‚è�Á‚·‚É‚Í u ‚ð‰Ÿ‚µ‚Ü‚·�BU ‚Í�s‘S‘Ì‚ÌŽæ�Á‚Å‚·�B **
 
-  1. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽ�s‚ɃJ�[ƒ\ƒ‹‚ðˆÚ“®‚µ�A�Å�‰‚̊ԈႢ‚ɃJ�[ƒ\
-     ƒ‹‚ðˆÚ“®‚µ‚Ü‚µ‚傤�B
+  1. ˆÈ‰º‚Ì ---> ‚ÆŽ¦‚³‚ꂽ�s‚ɃJ�[ƒ\ƒ‹‚ðˆÚ“®‚µ�A�Å�‰‚̊ԈႢ‚ɃJ�[ƒ\ƒ‹
+     ‚ðˆÚ“®‚µ‚Ü‚µ‚傤�B
   2. x ‚ðƒ^ƒCƒv‚µ‚Ä‚¢‚ç‚È‚¢�擪‚Ì•¶Žš‚ð�í�œ‚µ‚Ü‚µ‚傤�B
   3. ‚³‚Ÿ�Au ‚ðƒ^ƒCƒv‚µ‚Ä�ÅŒã‚ÉŽÀ�s‚µ‚½ƒRƒ}ƒ“ƒh‚ðŽæ‚è�Á‚µ‚Ü‚µ‚傤�B
   4. �¡“x‚Í�Ax ‚ðŽg—p‚µ‚ÄŒë‚è‚ð‘S‚Ä�C�³‚µ‚Ü‚µ‚傤�B
diff --git a/runtime/tutor/tutor.ja.utf-8 b/runtime/tutor/tutor.ja.utf-8
index 95e108efe6..a620cd57a3 100644
--- a/runtime/tutor/tutor.ja.utf-8
+++ b/runtime/tutor/tutor.ja.utf-8
@@ -117,7 +117,7 @@ NOTE: 全��レッスンを通���覚�よ���る�����
 		     レッスン 1.5: テキスト編集 - 追加
 
 
-		 ** テキスト追加�る�� A を押���ょ� **
+		 ** テキストを追加�る�� A を押���ょ� **
 
   1. 以下� ---> �示�れ�最��行�カーソルを移動���ょ�。
      カーソル���文字上����も�����ん。
@@ -232,7 +232,7 @@ NOTE: <ESC> キーを押��ノーマルモード�移行���。��
 		     レッスン 2.3: オペレータ�モーション
 
 
-  多��コマンド�オペレータ�モーション�らテキスト�変更を加��。
+  多��コマンド�オペレータ�モーション�らテキスト�変更を加���。
   削除コマンド d �オペレータ�次�様�������:
 
   	d   モーション
@@ -259,7 +259,7 @@ NOTE: 冒険���人��ノーマルモード��コマンド���
 
   1. 以下� ---> �示�れ�行�先頭�カーソルを移動���。
 
-  2. 2dw をタイプ���語2�分移動���。
+  2. 2dw をタイプ���語2�分削除���。
 
   3. 3e をタイプ��3�目��語�終端�移動���。
 
@@ -326,8 +326,8 @@ NOTE:  オペレータ d �モーション�間�カウントを使��場
 
   ** 最後�コマンドを�り消��� u を押���。U �行全体��消��。 **
 
-  1. 以下� ---> �示�れ�行�カーソルを移動��最��間���カーソ
-     ルを移動���ょ�。
+  1. 以下� ---> �示�れ�行�カーソルを移動��最��間���カーソル
+     を移動���ょ�。
   2. x をタイプ���ら��先頭�文字を削除���ょ�。
   3. ���u をタイプ��最後�実行��コマンドを�り消���ょ�。
   4. 今度��x を使用��誤りを全�修正���ょ�。
diff --git a/runtime/tutor/tutor.ko.euc b/runtime/tutor/tutor.ko.euc
index ddfc5ac810..95282f86ee 100644
--- a/runtime/tutor/tutor.ko.euc
+++ b/runtime/tutor/tutor.ko.euc
@@ -551,7 +551,7 @@ cw 
 
         ** ÆÄÀÏÀÇ ÀϺθ¦ ÀúÀåÇÏ·Á¸é,  :#,# w FILENAME  ÇϽʽÿÀ. **
 
-  1. ´Ù½Ã Çѹø,  :!dir  À̳ª  !ls ¸¦ ÀÔ·ÂÇÏ¿© µð·ºÅ丮ÀÇ ¸ñ·ÏÀ» ¹Þ¾Æ¿Â ÈÄ
+  1. ´Ù½Ã Çѹø,  :!dir  À̳ª  :!ls ¸¦ ÀÔ·ÂÇÏ¿© µð·ºÅ丮ÀÇ ¸ñ·ÏÀ» ¹Þ¾Æ¿Â ÈÄ
      TEST °°Àº ÀûÇÕÇÑ À̸§À» ¼±ÅÃÇÕ´Ï´Ù.
 
   2. Ä¿¼­¸¦ ÀÌ ÆäÀÌÁöÀÇ Ã³À½À¸·Î ¿Å±ä ÈÄ, Ctrl-g ¸¦ ÀÔ·ÂÇÏ¿© ±× ÁÙÀÇ ÁÙ¹øÈ£¸¦
diff --git a/runtime/tutor/tutor.ko.utf-8 b/runtime/tutor/tutor.ko.utf-8
index 4498c9f6d1..f19ce7539e 100644
--- a/runtime/tutor/tutor.ko.utf-8
+++ b/runtime/tutor/tutor.ko.utf-8
@@ -551,7 +551,7 @@ cw 는 단어를 치환하는 것 �만 아니�, 내용� 삽입할 수 있
 
         ** 파�� �부를 저장하려면,  :#,# w FILENAME  하십시오. **
 
-  1. 다시 한번,  :!dir  �나  !ls 를 입력하여 디렉토리� 목�� 받아온 후
+  1. 다시 한번,  :!dir  �나  :!ls 를 입력하여 디렉토리� 목�� 받아온 후
      TEST 같� �합한 �름� 선�합니다.
 
   2. 커서를 � 페�지� 처�으로 옮긴 후, Ctrl-g 를 입력하여 그 줄� 줄번호를
diff --git a/runtime/tutor/tutor.nb b/runtime/tutor/tutor.nb
index 17178df785..2f1d14c290 100644
--- a/runtime/tutor/tutor.nb
+++ b/runtime/tutor/tutor.nb
@@ -658,7 +658,7 @@ Merk: Hvis du n
   4. Trykk  w TEST  , der TEST er et filnavn som ikke finnes enda. Kontroller
      at du ser	:'<,'>w TEST  før du trykker Enter.
 
-  5. Vim vil skrive de valgte linjene til filen TEST. Bruk  :!dir  eller  !ls
+  5. Vim vil skrive de valgte linjene til filen TEST. Bruk  :!dir  eller  :!ls
      for å se den. Ikke slett den enda! Vi vil bruke den i neste leksjon.
 
 MERK: Ved å trykke  v  startes visuelt valg. Du kan flytte markøren rundt for
diff --git a/runtime/tutor/tutor.nb.utf-8 b/runtime/tutor/tutor.nb.utf-8
index a7826b7830..f9d49c2a24 100644
--- a/runtime/tutor/tutor.nb.utf-8
+++ b/runtime/tutor/tutor.nb.utf-8
@@ -658,7 +658,7 @@ Merk: Hvis du nå hadde avsluttet Vim og startet på nytt igjen med «vim TEST»
   4. Trykk  w TEST  , der TEST er et filnavn som ikke finnes enda. Kontroller
      at du ser	:'<,'>w TEST  før du trykker Enter.
 
-  5. Vim vil skrive de valgte linjene til filen TEST. Bruk  :!dir  eller  !ls
+  5. Vim vil skrive de valgte linjene til filen TEST. Bruk  :!dir  eller  :!ls
      for å se den. Ikke slett den enda! Vi vil bruke den i neste leksjon.
 
 MERK: Ved å trykke  v  startes visuelt valg. Du kan flytte markøren rundt for
diff --git a/runtime/tutor/tutor.no b/runtime/tutor/tutor.no
index 17178df785..2f1d14c290 100644
--- a/runtime/tutor/tutor.no
+++ b/runtime/tutor/tutor.no
@@ -658,7 +658,7 @@ Merk: Hvis du n
   4. Trykk  w TEST  , der TEST er et filnavn som ikke finnes enda. Kontroller
      at du ser	:'<,'>w TEST  før du trykker Enter.
 
-  5. Vim vil skrive de valgte linjene til filen TEST. Bruk  :!dir  eller  !ls
+  5. Vim vil skrive de valgte linjene til filen TEST. Bruk  :!dir  eller  :!ls
      for å se den. Ikke slett den enda! Vi vil bruke den i neste leksjon.
 
 MERK: Ved å trykke  v  startes visuelt valg. Du kan flytte markøren rundt for
diff --git a/runtime/tutor/tutor.no.utf-8 b/runtime/tutor/tutor.no.utf-8
index a7826b7830..f9d49c2a24 100644
--- a/runtime/tutor/tutor.no.utf-8
+++ b/runtime/tutor/tutor.no.utf-8
@@ -658,7 +658,7 @@ Merk: Hvis du nå hadde avsluttet Vim og startet på nytt igjen med «vim TEST»
   4. Trykk  w TEST  , der TEST er et filnavn som ikke finnes enda. Kontroller
      at du ser	:'<,'>w TEST  før du trykker Enter.
 
-  5. Vim vil skrive de valgte linjene til filen TEST. Bruk  :!dir  eller  !ls
+  5. Vim vil skrive de valgte linjene til filen TEST. Bruk  :!dir  eller  :!ls
      for å se den. Ikke slett den enda! Vi vil bruke den i neste leksjon.
 
 MERK: Ved å trykke  v  startes visuelt valg. Du kan flytte markøren rundt for
diff --git a/runtime/tutor/tutor.sk b/runtime/tutor/tutor.sk
index 2291aad61d..bae139837a 100644
--- a/runtime/tutor/tutor.sk
+++ b/runtime/tutor/tutor.sk
@@ -671,7 +671,7 @@ Pozn
   4. Napí¹ w TEST  , kde TEST je meno súboru, ktorý zatial neexistuje.
      Skontroluj, e vidí¹  :'<,'>w TEST  predtým ne¾ stlaèí¹ Enter.
 
-  5. Vim zapí¹e oznaèené riadky do súboru TEST. Pou¾i :!dir  alebo  !ls
+  5. Vim zapí¹e oznaèené riadky do súboru TEST. Pou¾i :!dir  alebo  :!ls
      pre overenie. Zatial ho e¹te nema¾! Pou¾ijeme ho v ïal¹ej lekcii.
 
 POZNÁMKA: Stlaèením klávesy  v  sa spustí vizuálne oznaèovanie.
diff --git a/runtime/tutor/tutor.sk.cp1250 b/runtime/tutor/tutor.sk.cp1250
index f32c9b12a3..c4e7b3d3ea 100644
--- a/runtime/tutor/tutor.sk.cp1250
+++ b/runtime/tutor/tutor.sk.cp1250
@@ -671,7 +671,7 @@ Pozn
   4. Napíš w TEST  , kde TEST je meno súboru, ktorý zatial neexistuje.
      Skontroluj, e vidíš  :'<,'>w TEST  predtým než stlaèíš Enter.
 
-  5. Vim zapíše oznaèené riadky do súboru TEST. Použi :!dir  alebo  !ls
+  5. Vim zapíše oznaèené riadky do súboru TEST. Použi :!dir  alebo  :!ls
      pre overenie. Zatial ho ešte nemaž! Použijeme ho v ïalšej lekcii.
 
 POZNÁMKA: Stlaèením klávesy  v  sa spustí vizuálne oznaèovanie.
diff --git a/runtime/tutor/tutor.sk.utf-8 b/runtime/tutor/tutor.sk.utf-8
index c4e0c4f5d8..51c5b4f181 100644
--- a/runtime/tutor/tutor.sk.utf-8
+++ b/runtime/tutor/tutor.sk.utf-8
@@ -671,7 +671,7 @@ Poznámka: že ak ukon�íš prácu s editorom Vim a znovu ho spustíš príkazo
   4. Napíš w TEST  , kde TEST je meno súboru, ktorý zatial neexistuje.
      Skontroluj, e vidíš  :'<,'>w TEST  predtým než stla�íš Enter.
 
-  5. Vim zapíše ozna�ené riadky do súboru TEST. Použi :!dir  alebo  !ls
+  5. Vim zapíše ozna�ené riadky do súboru TEST. Použi :!dir  alebo  :!ls
      pre overenie. Zatial ho ešte nemaž! Použijeme ho v �alšej lekcii.
 
 POZN�MKA: Stla�ením klávesy  v  sa spustí vizuálne ozna�ovanie.
diff --git a/runtime/tutor/tutor.utf-8 b/runtime/tutor/tutor.utf-8
index daf42b6bb2..da28a15313 100644
--- a/runtime/tutor/tutor.utf-8
+++ b/runtime/tutor/tutor.utf-8
@@ -658,7 +658,7 @@ NOTE: If you were to exit Vim and start it again with  vim TEST , the file
   4. Type  w TEST  , where TEST is a filename that does not exist yet.  Verify
      that you see  :'<,'>w TEST  before you press <ENTER>.
 
-  5. Vim will write the selected lines to the file TEST.  Use  :!dir  or  !ls
+  5. Vim will write the selected lines to the file TEST.  Use  :!dir  or  :!ls
      to see it.  Do not remove it yet!  We will use it in the next lesson.
 
 NOTE:  Pressing  v  starts Visual selection.  You can move the cursor around
diff --git a/runtime/tutor/tutor.zh.euc b/runtime/tutor/tutor.zh.euc
index 7f80f690b9..df59c32089 100644
--- a/runtime/tutor/tutor.zh.euc
+++ b/runtime/tutor/tutor.zh.euc
@@ -1,30 +1,32 @@
 ===============================================================================
-=      »¶     Ó­     ÔÄ     ¶Á   ¡¶ V I M  ½Ì  ³Ì ¡·   ¡ª¡ª     °æ±¾ 1.5      =
+=      »¶     Ó­     ÔÄ     ¶Á   ¡¶ V I M  ½Ì  ³Ì ¡·   ¡ª¡ª      °æ±¾ 1.7       =
 ===============================================================================
-     vim ÊÇÒ»¸ö¾ßÓкܶàÃüÁîµÄ¹¦Äܷdz£Ç¿´óµÄ±à¼­Æ÷¡£ÏÞÓÚƪ·ù£¬ÔÚ±¾½Ì³Ìµ±ÖÐ
+
+     Vim ÊÇÒ»¸ö¾ßÓкܶàÃüÁîµÄ¹¦Äܷdz£Ç¿´óµÄ±à¼­Æ÷¡£ÏÞÓÚƪ·ù£¬ÔÚ±¾½Ì³Ìµ±ÖÐ
      ¾Í²»Ïêϸ½éÉÜÁË¡£±¾½Ì³ÌµÄÉè¼ÆÄ¿±êÊǽ²ÊöһЩ±ØÒªµÄ»ù±¾ÃüÁ¶øÕÆÎÕºÃÕâ
-     ЩÃüÁÄú¾ÍÄܹ»ºÜÈÝÒ×½«vimµ±×÷Ò»¸öͨÓõÄÍòÄܱ༭Æ÷À´Ê¹ÓÃÁË¡£
+     ЩÃüÁÄú¾ÍÄܹ»ºÜÈÝÒ׵ؽ« Vim µ±×÷Ò»¸öͨÓñ༭Æ÷À´Ê¹ÓÃÁË¡£
 
      Íê³É±¾½Ì³ÌµÄÄÚÈÝ´óÔ¼ÐèÒª25-30·ÖÖÓ£¬È¡¾öÓÚÄúѵÁ·µÄʱ¼ä¡£
 
+     ×¢Ò⣺
      ÿһ½ÚµÄÃüÁî²Ù×÷½«»á¸ü¸Ä±¾ÎÄ¡£ÍƼöÄú¸´ÖƱ¾ÎĵÄÒ»¸ö¸±±¾£¬È»ºóÔÚ¸±±¾ÉÏ
      ½øÐÐѵÁ·(Èç¹ûÄúÊÇͨ¹ý"vimtutor"À´Æô¶¯½Ì³ÌµÄ£¬ÄÇô±¾ÎľÍÒѾ­ÊǸ±±¾ÁË)¡£
 
-     ÇмÇÒ»µã¡Ã±¾½Ì³ÌµÄÉè¼Æ˼·ÊÇÔÚʹÓÃÖнøÐÐѧϰµÄ¡£Ò²¾ÍÊÇ˵£¬ÄúÐèҪͨ¹ý
+     ÇмÇÒ»µã£º±¾½Ì³ÌµÄÉè¼Æ˼·ÊÇÔÚʹÓÃÖнøÐÐѧϰµÄ¡£Ò²¾ÍÊÇ˵£¬ÄúÐèҪͨ¹ý
      Ö´ÐÐÃüÁîÀ´Ñ§Ï°ËüÃDZ¾ÉíµÄÕýÈ·Ó÷¨¡£Èç¹ûÄúÖ»ÊÇÔĶÁ¶ø²»²Ù×÷£¬ÄÇôÄú¿ÉÄÜ
      »áºÜ¿ìÒÅÍüÕâЩÃüÁîµÄ£¡
 
      ºÃÁË£¬ÏÖÔÚÇëÈ·¶¨ÄúµÄShift-Lock(´óСдËø¶¨¼ü)»¹Ã»Óа´Ï£¬È»ºó°´¼üÅÌÉÏ
-     µÄ×Öĸ¼ü j ×ã¹»¶àµÄ´ÎÊýÀ´Òƶ¯¹â±ê£¬Ö±µ½µÚÒ»½ÚµÄÄÚÈÝÄܹ»ÍêÈ«³äÂúÆÁÄ»¡£
+     µÄ×Öĸ¼ü j ×ã¹»¶à´ÎÀ´Òƶ¯¹â±ê£¬Ö±µ½µÚÒ»½ÚµÄÄÚÈÝÄܹ»ÍêÈ«³äÂúÆÁÄ»¡£
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			µÚÒ»½²µÚÒ»½Ú¡ÃÒƶ¯¹â±ê
+			µÚÒ»½²µÚÒ»½Ú£ºÒƶ¯¹â±ê
 
 
-   ¡ù¡ù ÒªÒƶ¯¹â±ê£¬ÇëÒÀÕÕ˵Ã÷·Ö±ð°´Ï h¡¢j¡¢k¡¢l ¼ü¡£ ¡ù¡ù
+	     ** ÒªÒƶ¯¹â±ê£¬ÇëÒÀÕÕ˵Ã÷·Ö±ð°´Ï h¡¢j¡¢k¡¢l ¼ü¡£ **
 
 	     ^
-	     k		    Ìáʾ¡Ã h µÄ¼üλÓÚ×ó±ß£¬Ã¿´Î°´Ï¾ͻáÏò×óÒƶ¯¡£
+	     k		    Ìáʾ£º h µÄ¼üλÓÚ×ó±ß£¬Ã¿´Î°´Ï¾ͻáÏò×óÒƶ¯¡£
        < h	 l >		   l µÄ¼üλÓÚÓұߣ¬Ã¿´Î°´Ï¾ͻáÏòÓÒÒƶ¯¡£
 	     j			   j ¼ü¿´ÆðÀ´ºÜÏóÒ»Ö§¼â¶Ë·½Ïò³¯ÏµļýÍ·¡£
 	     v
@@ -35,43 +37,38 @@
 
 ---> ÏÖÔÚÄúÓ¦¸ÃÒѾ­Ñ§»áÈçºÎÒƶ¯µ½ÏÂÒ»½²°É¡£
 
-  3. ÏÖÔÚÇëʹÓÃÏÂÐмü£¬½«¹â±êÒƶ¯µ½µÚ¶þ½²¡£
+  3. ÏÖÔÚÇëʹÓÃÏÂÐмü£¬½«¹â±êÒƶ¯µ½µÚÒ»½²µÚ¶þ½Ú¡£
 
-Ìáʾ¡ÃÈç¹ûÄú²»¸ÒÈ·¶¨ÄúËù°´ÏµÄ×Öĸ£¬Çë°´ÏÂ<ESC>¼ü»Øµ½Õý³£(Normal)ģʽ¡£
+Ìáʾ£ºÈç¹ûÄú²»¸ÒÈ·¶¨ÄúËù°´ÏµÄ×Öĸ£¬Çë°´ÏÂ<ESC>¼ü»Øµ½Õý³£(Normal)ģʽ¡£
       È»ºóÔٴδӼüÅÌÊäÈëÄúÏëÒªµÄÃüÁî¡£
 
-Ìáʾ¡Ã¹â±ê¼üÓ¦µ±Ò²ÄÜÕý³£¹¤×÷µÄ¡£µ«ÊÇʹÓÃhjkl¼ü£¬ÔÚÏ°¹ßÖ®ºóÄú¾ÍÄܹ»¿ìËÙ
-      µØÔÚÆÁÄ»ÄÚËÄ´¦Òƶ¯¹â±êÁË¡£
+Ìáʾ£º¹â±ê¼üÓ¦µ±Ò²ÄÜÕý³£¹¤×÷µÄ¡£µ«ÊÇʹÓÃhjkl¼ü£¬ÔÚÏ°¹ßÖ®ºóÄú¾ÍÄܹ»¸ü¿ì
+      µØÔÚÆÁÄ»ÄÚËÄ´¦Òƶ¯¹â±ê¡£ÕæµÄÊÇÕâÑù£¡
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			µÚÒ»½²µÚ¶þ½Ú¡ÃVIMµÄ½øÈëºÍÍ˳ö
+			µÚÒ»½²µÚ¶þ½Ú£ºVIMµÄ½øÈëºÍÍ˳ö
 
 
-  !! ÌرðÌáʾ¡Ã¾´ÇëÔĶÁÍêÕû±¾Ò»½ÚµÄÄÚÈÝ£¬È»ºó²ÅÄÜÖ´ÐÐÒÔÏÂËù½²½âµÄÃüÁî¡£
+  !! ÌرðÌáʾ£º¾´ÇëÔĶÁ±¾Ò»½ÚµÄÍêÕûÄÚÈÝ£¬È»ºóÔÙÖ´ÐÐÒÔÏÂËù½²½âµÄÃüÁî¡£
 
-  1. Çë°´<ESC>¼ü(ÕâÊÇΪÁËÈ·±£Äú´¦ÔÚÕý³£Ä£Ê½)¡£
+  1. °´<ESC>¼ü(ÕâÊÇΪÁËÈ·±£Äú´¦ÔÚÕý³£Ä£Ê½)¡£
 
-  2. È»ºóÊäÈë¡Ã			:q! <»Ø³µ>
+  2. È»ºóÊäÈ룺			:q! <»Ø³µ>
+     ÕâÖÖ·½Ê½µÄÍ˳ö±à¼­Æ÷»á¶ªÆúÄú½øÈë±à¼­Æ÷ÒÔÀ´Ëù×öµÄ¸Ä¶¯¡£
 
----> ÕâÖÖ·½Ê½µÄÍ˳ö±à¼­Æ÷¾ø²»»á±£´æÄú½øÈë±à¼­Æ÷ÒÔÀ´Ëù×öµÄ¸Ä¶¯¡£
-     Èç¹ûÄúÏë±£´æ¸ü¸ÄÔÙÍ˳ö£¬ÇëÊäÈë¡Ã
-				:wq  <»Ø³µ>
-
-  3. Èç¹ûÄú¿´µ½ÁËÃüÁîÐÐÌáʾ·û£¬ÇëÊäÈëÄܹ»´øÄú»Øµ½±¾½Ì³ÌµÄÃüÁÄǾÍÊÇ¡Ã
-
-		vimtutor <»Ø³µ>
-
-     ͨ³£Çé¿öÏÂÄúÒ²¿ÉÒÔÓÃÕâÖÖ·½Ê½¡Ã
-
-		vim tutor <»Ø³µ>
-
----> ÕâÀïµÄ 'vim' ±íʾ½øÈëvim±à¼­Æ÷£¬¶ø 'tutor'ÔòÊÇÄú×¼±¸Òª±à¼­µÄÎļþ¡£
+  3. Èç¹ûÄú¿´µ½ÁËÃüÁîÐÐÌáʾ·û£¬ÇëÊäÈëÄܹ»´øÄú»Øµ½±¾½Ì³ÌµÄÃüÁÄǾÍÊÇ£º
+     vimtutor <»Ø³µ>
 
   4. Èç¹ûÄú×ÔÐÅÒѾ­ÀÎÀμÇסÁËÕâЩ²½ÖèµÄ»°£¬Çë´Ó²½Öè1Ö´Ðе½²½Öè3Í˳ö£¬È»
-     ºóÔٴνøÈë±à¼­Æ÷¡£½Ó׎«¹â±êÒƶ¯µ½µÚÒ»½²µÚÈý½ÚÀ´¼ÌÐøÎÒÃǵĽ̳̽²½â¡£
+     ºóÔٴνøÈë±à¼­Æ÷¡£
+
+Ìáʾ£º :q! <»Ø³µ> »á¶ªÆúÄúËù×öµÄÈκθĶ¯¡£¼¸½²Ö®ºóÄú½«Ñ§»áÈçºÎ±£´æ¸Ä¶¯µ½Îļþ¡£
+
+  5. ½«¹â±êÏÂÒƵ½µÚÒ»½²µÚÈý½Ú¡£
+
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			µÚÒ»½²µÚÈý½Ú¡ÃÎı¾±à¼­Ö®É¾³ý
+			µÚÒ»½²µÚÈý½Ú£ºÎı¾±à¼­Ö®É¾³ý
 
 
    ** ÔÚÕý³£(Normal)ģʽÏ£¬¿ÉÒÔ°´Ï x ¼üÀ´É¾³ý¹â±êËùÔÚλÖõÄ×Ö·û¡£**
@@ -86,35 +83,79 @@
 
 ---> The ccow jumpedd ovverr thhe mooon.
 
-  5. ºÃÁË£¬¸ÃÐÐÒѾ­ÐÞÕýÁË£¬ÏÂÒ»½ÚÄÚÈÝÊǵÚÒ»½²µÚËĽڡ£
+  5. ºÃÁË£¬¸ÃÐÐÒѾ­ÐÞÕýÁË£¬ÏÂÃæÊǵÚÒ»½²µÚËĽڡ£
 
-ÌرðÌáʾ¡ÃÔÚÄúä¯ÀÀ±¾½Ì³Ìʱ£¬²»ÒªÇ¿ÐмÇÒä¡£¼Çסһµã¡ÃÔÚʹÓÃÖÐѧϰ¡£
+ÌرðÌáʾ£ºÔÚä¯ÀÀ±¾½Ì³Ìʱ£¬²»ÒªÇ¿ÐмÇÒä¡£¼Çסһµã£ºÔÚʹÓÃÖÐѧϰ¡£
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     µÚÒ»½²µÚËĽڡÃÎı¾±à¼­Ö®²åÈë
+		     µÚÒ»½²µÚËĽڣºÎı¾±à¼­Ö®²åÈë
 
 
 	 ** ÔÚÕý³£Ä£Ê½Ï£¬¿ÉÒÔ°´Ï i ¼üÀ´²åÈëÎı¾¡£**
 
   1. Ç뽫¹â±êÒƶ¯µ½±¾½ÚÖÐÏÂÃæ±ê¼ÇÓÐ ---> µÄµÚÒ»ÐС£
 
-  2. ΪÁËʹµÃµÚÒ»ÐÐÄÚÈÝÀ×ͬÓÚµÚ¶þÐУ¬Ç뽫¹â±êÒÆÖÁÎı¾µÚÒ»¸ö×Ö·û×¼±¸²åÈë
+  2. ΪÁËʹµÃµÚÒ»ÐÐÄÚÈÝÀ×ͬÓÚµÚ¶þÐУ¬Ç뽫¹â±êÒÆÖÁÎı¾µÚÒ»¸ö×¼±¸²åÈë×Ö·û
      µÄλÖá£
 
   3. È»ºó°´Ï i ¼ü£¬½Ó×ÅÊäÈë±ØÒªµÄÎı¾×Ö·û¡£
 
-  4. ËùÓÐÎı¾¶¼ÐÞÕýÍê±Ï£¬Çë°´Ï <ESC> ¼ü·µ»ØÕý³£Ä£Ê½¡£
+  4. ÿ¸ö´íÎóÐÞÕýÍê±Ïºó£¬Çë°´Ï <ESC> ¼ü·µ»ØÕý³£Ä£Ê½¡£
      Öظ´²½Öè2ÖÁ²½Öè4ÒÔ±ãÐÞÕý¾ä×Ó¡£
 
 ---> There is text misng this .
 ---> There is some text missing from this line.
 
-  5. Èç¹ûÄú¶ÔÎı¾²åÈë²Ù×÷ÒѾ­ºÜÂúÒ⣬Çë½Ó×ÅÔĶÁÏÂÃæµÄС½á¡£
+  5. Èç¹ûÄú¶ÔÎı¾²åÈë²Ù×÷ÒѾ­ºÜÂúÒ⣬Çë½Ó×ÅÔĶÁÏÂÃæµÄµÚÒ»½²µÚÎå½Ú¡£
 
 
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     µÚÒ»½²µÚÎå½Ú£ºÎı¾±à¼­Ö®Ìí¼Ó
+
+
+			** °´ A ¼üÒÔÌí¼ÓÎı¾¡£ **
+
+  1. Òƶ¯¹â±êµ½ÏÂÃæµÚÒ»¸ö±ê¼ÇÓÐ ---> µÄÒ»ÐС£
+     ¹â±ê·ÅÔÚÄÇÒ»ÐеÄÄĸö×Ö·ûÉϲ¢²»ÖØÒª¡£
+
+  2. °´ A ¼üÊäÈë±ØÒªµÄÌí¼ÓÄÚÈÝ¡£
+
+  3. Îı¾Ìí¼ÓÍê±Ïºó£¬°´ <ESC> ¼ü»Øµ½Õý³£Ä£Ê½¡£
+
+  4. Òƶ¯¹â±êµ½ÏÂÃæµÚ¶þ¸ö±ê¼ÇÓÐ ---> µÄÒ»ÐС£Öظ´²½Öè2ºÍ²½Öè3ÒÔ¸ÄÕýÕâ¸ö¾ä×Ó¡£
+
+---> There is some text missing from th
+     There is some text missing from this line.
+---> There is also some text miss
+     There is also some text missing here.
+
+  5. µ±Äú¶ÔÌí¼ÓÎı¾²Ù×÷¸Ðµ½ÂúÒâʱ£¬Çë¼ÌÐøѧϰµÚÒ»½²µÚÁù½Ú¡£
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     µÚÒ»½²µÚÁù½Ú£º±à¼­Îļþ
+
+		    ** ʹÓà :wq ÒÔ±£´æÎļþ²¢Í˳ö¡£ **
+
+  ÌرðÌáʾ£ºÔÚÖ´ÐÐÒÔϲ½Öè֮ǰ£¬ÇëÏȶÁÍêÕû¸öС½Ú£¡
+
+  1. ÈçÄúÔÚµÚÒ»½²µÚ¶þ½ÚÖÐËù×öµÄÄÇÑùÍ˳ö±¾½Ì³Ì£º :q!
+     »òÕߣ¬Èç¹ûÄú¿ÉÒÔ·ÃÎÊÁíÒ»¸öÖնˣ¬ÇëÔÚÄÇÀïÖ´ÐÐÒÔϲÙ×÷¡£
+
+  2. ÔÚ shell µÄÌáʾ·ûÏÂÊäÈëÃüÁ vim tutor <»Ø³µ>
+     'vim'ÊÇÆô¶¯ Vim ±à¼­Æ÷µÄÃüÁ'tutor'ÊÇÄúÏ£Íû±à¼­µÄÎļþµÄÃû×Ö¡£
+     ÇëʹÓÃÒ»¸ö¿ÉÒԸĶ¯µÄÎļþ¡£
+
+  3. ʹÓÃÄúÔÚÇ°ÃæµÄ½Ì³ÌÖÐѧµ½µÄÃüÁî²åÈëɾ³ýÎı¾¡£
+
+  4. ±£´æ¸Ä¶¯¹ýµÄÎļþ²¢Í˳ö Vim£¬°´ÕâЩ¼ü£º :wq  <»Ø³µ>
+
+  5. Èç¹ûÄúÔÚ²½Öè1ÖÐÒѾ­Í˳ö vimtutor£¬ÇëÖØÆô vimtutor Òƶ¯µ½ÏÂÃæµÄС½áÒ»½Ú¡£
+
+  6. ÔĶÁÍêÒÔÉϲ½Ö裬Ū¶®ËüÃǵÄÒâÒ壬ȻºóÔÚʵ¼ùÖнøÐÐÁ·Ï°¡£
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			       µÚÒ»½²Ð¡½á
 
@@ -122,53 +163,50 @@
   1. ¹â±êÔÚÆÁÄ»Îı¾ÖеÄÒƶ¯¼È¿ÉÒÔÓüýÍ·¼ü£¬Ò²¿ÉÒÔʹÓà hjkl ×Öĸ¼ü¡£
 	 h (×óÒÆ)	j (ÏÂÐÐ)       k (ÉÏÐÐ)	    l (ÓÒÒÆ)
 
-  2. Óû½øÈëvim±à¼­Æ÷(´ÓÃüÁîÐÐÌáʾ·û)£¬ÇëÊäÈë¡Ãvim ÎļþÃû <»Ø³µ>
+  2. Óû½øÈë Vim ±à¼­Æ÷(´ÓÃüÁîÐÐÌáʾ·û)£¬ÇëÊäÈ룺vim ÎļþÃû <»Ø³µ>
 
-  3. ÓûÍ˳övim±à¼­Æ÷£¬ÇëÊäÈëÒÔÏÂÃüÁî·ÅÆúËùÓÐÐ޸ġÃ
+  3. ÓûÍ˳ö Vim ±à¼­Æ÷£¬ÇëÊäÈë <ESC>   :q!   <»Ø³µ> ·ÅÆúËùÓиĶ¯¡£
+                      »òÕßÊäÈë <ESC>   :wq   <»Ø³µ> ±£´æ¸Ä¶¯¡£
 
-	<ESC>   :q!	 <»Ø³µ>
+  4. ÔÚÕý³£Ä£Ê½ÏÂɾ³ý¹â±êËùÔÚλÖõÄ×Ö·û£¬Çë°´£º x
 
-     »òÕßÊäÈëÒÔÏÂÃüÁî±£´æËùÓÐÐ޸ġÃ
+  5. Óû²åÈë»òÌí¼ÓÎı¾£¬ÇëÊäÈ룺
 
-	<ESC>   :wq	 <»Ø³µ>
+	 i   ÊäÈëÓû²åÈëÎı¾   <ESC>		ÔÚ¹â±êÇ°²åÈëÎı¾
+	 A   ÊäÈëÓûÌí¼ÓÎı¾   <ESC>             ÔÚÒ»ÐкóÌí¼ÓÎı¾
 
-  4. ÔÚÕý³£Ä£Ê½ÏÂɾ³ý¹â±êËùÔÚλÖõÄ×Ö·û£¬Çë°´¡Ã x
-
-  5. ÔÚÕý³£Ä£Ê½ÏÂÒªÔÚ¹â±êËùÔÚλÖÿªÊ¼²åÈëÎı¾£¬Çë°´¡Ã
-
-	 i     ÊäÈë±ØÒªÎı¾	<ESC>
-
-ÌرðÌáʾ¡Ã°´Ï <ESC> ¼ü»á´øÄú»Øµ½Õý³£Ä£Ê½»òÕßÈ¡ÏûÒ»¸ö²»ÆÚÍû»òÕß²¿·ÖÍê³É
+ÌرðÌáʾ£º°´Ï <ESC> ¼ü»á´øÄú»Øµ½Õý³£Ä£Ê½»òÕß³·ÏûÒ»¸ö²»ÏëÊäÈë»ò²¿·ÖÍêÕû
 µÄÃüÁî¡£
 
 ºÃÁË£¬µÚÒ»½²µ½´Ë½áÊø¡£ÏÂÃæ½ÓÏÂÀ´¼ÌÐøµÚ¶þ½²µÄÄÚÈÝ¡£
 
 
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			µÚ¶þ½²µÚÒ»½Ú¡Ãɾ³ýÀàÃüÁî
+			µÚ¶þ½²µÚÒ»½Ú£ºÉ¾³ýÀàÃüÁî
 
 
-	    ** ÊäÈë dw ¿ÉÒÔ´Ó¹â±ê´¦É¾³ýÖÁÒ»¸öµ¥×Ö/µ¥´ÊµÄĩβ¡£**
+	    ** ÊäÈë dw ¿ÉÒÔ´Ó¹â±ê´¦É¾³ýÖÁÒ»¸öµ¥´ÊµÄĩβ¡£**
 
   1. Çë°´Ï <ESC> ¼üÈ·±£Äú´¦ÓÚÕý³£Ä£Ê½¡£
 
   2. Ç뽫¹â±êÒƶ¯µ½±¾½ÚÖÐÏÂÃæ±ê¼ÇÓÐ ---> µÄÄÇÒ»ÐС£
 
-  3. Ç뽫¹â±êÒÆÖÁ×¼±¸ÒªÉ¾³ýµÄµ¥´ÊµÄ¿ªÊ¼¡£
+  3. Ç뽫¹â±êÒÆÖÁ×¼±¸ÒªÉ¾³ýµÄµ¥´ÊµÄÆðʼ´¦¡£
 
   4. ½Ó×ÅÊäÈë dw ɾ³ýµô¸Ãµ¥´Ê¡£
 
-  ÌرðÌáʾ¡ÃÄúËùÊäÈëµÄ dw »áÔÚÄúÊäÈëµÄͬʱ³öÏÖÔÚÆÁÄ»µÄ×îºóÒ»ÐС£Èç¹ûÄúÊä
-  ÈëÓÐÎó£¬Çë°´Ï <ESC> ¼üÈ¡Ïû£¬È»ºóÖØÐÂÔÙÀ´¡£
+  ÌرðÌáʾ£ºµ±ÄúÊäÈëʱ£¬×Öĸ d »áͬʱ³öÏÖÔÚÆÁÄ»µÄ×îºóÒ»ÐС£Vim ÔڵȴýÄúÊäÈë
+  ×Öĸ w¡£Èç¹ûÄú¿´µ½µÄÊdzý d ÍâµÄÆäËû×Ö·û£¬ÄDZíÃ÷Äú°´´íÁË£»Çë°´Ï <ESC> ¼ü£¬
+  È»ºóÖØÐÂÔÙÀ´¡£
 
 ---> There are a some words fun that don't belong paper in this sentence.
 
-  5. Öظ´²½Öè3ÖÁ²½Öè4£¬Ö±ÖÁ¾ä×ÓÐÞÕýÍê±Ï¡£½Ó׿ÌÐøµÚ¶þ½²µÚ¶þ½ÚÄÚÈÝ¡£
-
+  5. Öظ´²½Öè3ºÍ²½Öè4£¬Ö±ÖÁ¾ä×ÓÐÞÕýÍê±Ï¡£½Ó׿ÌÐøµÚ¶þ½²µÚ¶þ½ÚÄÚÈÝ¡£
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      µÚ¶þ½²µÚ¶þ½Ú¡ÃÆäËûɾ³ýÀàÃüÁî
+		      µÚ¶þ½²µÚ¶þ½Ú£º¸ü¶àɾ³ýÀàÃüÁî
 
 
 		   ** ÊäÈë d$ ´Óµ±Ç°¹â±êɾ³ýµ½ÐÐÄ©¡£**
@@ -191,58 +229,102 @@
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     µÚ¶þ½²µÚÈý½Ú¡Ã¹ØÓÚÃüÁîºÍ¶ÔÏó
+		     µÚ¶þ½²µÚÈý½Ú£º¹ØÓÚÃüÁîºÍ¶ÔÏó
 
 
-  ɾ³ýÃüÁî d µÄ¸ñʽÈçÏ¡Ã
+  Ðí¶à¸Ä±äÎı¾µÄÃüÁÓÉÒ»¸ö²Ù×÷·ûºÍÒ»¸ö¶¯×÷¹¹³É¡£
+  ʹÓÃɾ³ý²Ù×÷·û d µÄɾ³ýÃüÁîµÄ¸ñʽÈçÏ£º
 
-	 [number]   d	object	    »òÕß     d	 [number]   object
+	d   motion
 
-  ÆäÒâÈçÏ¡Ã
-    number - ´ú±íÖ´ÐÐÃüÁîµÄ´ÎÊý(¿ÉÑ¡ÏȱʡÉèÖÃΪ 1 )¡£
-    d - ´ú±íɾ³ý¡£
-    object - ´ú±íÃüÁîËùÒª²Ù×÷µÄ¶ÔÏó(ÏÂÃæÓÐÏà¹Ø½éÉÜ)¡£
+  ÆäÖУº
+    d      - ɾ³ý²Ù×÷·û¡£
+    motion - ²Ù×÷·ûµÄ²Ù×÷¶ÔÏó(ÔÚÏÂÃæÁгö)¡£
 
-  Ò»¸ö¼ò¶ÌµÄ¶ÔÏóÁбí¡Ã
-    w - ´Óµ±Ç°¹â±êµ±Ç°Î»ÖÃÖ±µ½µ¥×Ö/µ¥´Êĩ⣬°üÀ¨¿Õ¸ñ¡£
-    e - ´Óµ±Ç°¹â±êµ±Ç°Î»ÖÃÖ±µ½µ¥×Ö/µ¥´Êĩ⣬µ«ÊÇ *²»* °üÀ¨¿Õ¸ñ¡£
+  Ò»¸ö¼ò¶ÌµÄ¶¯×÷ÁÐ±í£º
+    w - ´Óµ±Ç°¹â±êµ±Ç°Î»ÖÃÖ±µ½ÏÂÒ»¸öµ¥´ÊÆðʼ´¦£¬²»°üÀ¨ËüµÄµÚÒ»¸ö×Ö·û¡£
+    e - ´Óµ±Ç°¹â±êµ±Ç°Î»ÖÃÖ±µ½µ¥´Êĩ⣬°üÀ¨×îºóÒ»¸ö×Ö·û¡£
     $ - ´Óµ±Ç°¹â±êµ±Ç°Î»ÖÃÖ±µ½µ±Ç°ÐÐÄ©¡£
 
-ÌرðÌáʾ¡Ã
-    ¶ÔÓÚÓÂÓÚ̽Ë÷Õߣ¬ÇëÔÚÕý³£Ä£Ê½ÏÂÃæ½ö°´´ú±íÏàÓ¦¶ÔÏóµÄ¼ü¶ø²»Ê¹ÓÃÃüÁÔò
+  Òò´ËÊäÈë de »á´Óµ±Ç°¹â±êλÖÃɾ³ýµ½µ¥´Êĩβ¡£
+
+ÌرðÌáʾ£º
+    ¶ÔÓÚÓÂÓÚ̽Ë÷Õߣ¬ÇëÔÚÕý³£Ä£Ê½ÏÂÃæ½ö°´´ú±íÏàÓ¦¶¯×÷µÄ¼ü¶ø²»Ê¹ÓòÙ×÷·û£¬Äú
     ½«¿´µ½¹â±êµÄÒƶ¯ÕýÈçÉÏÃæµÄ¶ÔÏóÁбíËù´ú±íµÄÒ»Ñù¡£
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     µÚ¶þ½²µÚËĽڣºÊ¹ÓüÆÊýÖ¸¶¨¶¯×÷
+
+
+             ** ÔÚ¶¯×÷Ç°ÊäÈëÊý×Ö»áʹËüÖظ´ÄÇô¶à´Î¡£ **
+
+  1. Òƶ¯¹â±êµ½ÏÂÃæ±ê¼ÇÓÐ ---> µÄÒ»ÐеĿªÊ¼¡£
+
+  2. ÊäÈë 2w ʹ¹â±êÏòÇ°Òƶ¯Á½¸öµ¥´Ê¡£
+
+  3. ÊäÈë 3e ʹ¹â±êÏòÇ°Òƶ¯µ½µÚÈý¸öµ¥´ÊµÄĩβ¡£
+
+  4. ÊäÈë 0 (Êý×ÖÁã) Òƶ¯¹â±êµ½ÐÐÊס£
+
+  5. Öظ´²½Öè2ºÍ²½Öè3£¬³¢ÊÔ²»Í¬µÄÊý×Ö¡£
+
+---> This is just a line with words you can move around in.
+
+  6. Çë¼ÌÐøѧϰµÚ¶þ½²µÚÎå½Ú¡£
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		       µÚ¶þ½²µÚÎå½Ú£ºÊ¹ÓüÆÊýÒÔɾ³ý¸ü¶à
+
+
+	       ** ʹÓòÙ×÷·ûʱÊäÈëÊý×Ö¿ÉÒÔʹËüÖظ´ÄÇô¶à´Î¡£ **
+
+  ÉÏÃæÒѾ­Ìáµ½¹ýɾ³ý²Ù×÷·ûºÍ¶¯×÷µÄ×éºÏ£¬Äú¿ÉÒÔÔÚ×éºÏÖж¯×÷֮ǰ²åÈëÒ»¸öÊý×ÖÒÔ
+  ɾ³ý¸ü¶à£º
+	 d   number(Êý×Ö)   motion
+
+  1. Òƶ¯¹â±êµ½ÏÂÃæ±ê¼ÇÓÐ ---> µÄÒ»ÐÐÖеÚÒ»¸ö´óд×Öĸµ¥´ÊÉÏ¡£
+
+  2. ÊäÈë d2w ÒÔɾ³ýÁ½¸ö´óд×Öĸµ¥´Ê¡£
+
+  3. Öظ´²½Öè1ºÍ²½Öè2£¬Ê¹Óò»Í¬µÄÊý×ÖʹµÃÓÃÒ»¸öÃüÁî¾ÍÄÜɾ³ýÈ«²¿ÏàÁڵĴóд×Öĸ
+     µ¥´Ê
+
+--->  this ABC DE line FGHI JK LMN OP of words is Q RS TUV cleaned up.
+
+
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		µÚ¶þ½²µÚËĽڡöÔÏóÃüÁîµÄÌØÊâÇé¿ö
+			    µÚ¶þ½²µÚÁù½Ú£º²Ù×÷ÕûÐÐ
 
 
-	       ** ÊäÈë dd ¿ÉÒÔɾ³ýÕûÒ»¸öµ±Ç°ÐС£ **
+		     ** ÊäÈë dd ¿ÉÒÔɾ³ýÕûÒ»¸öµ±Ç°ÐС£ **
 
-  ¼øÓÚÕûÐÐɾ³ýµÄ¸ßƵ¶È£¬VIM µÄÉè¼ÆÕß¾ö¶¨Òª¼ò»¯ÕûÐÐɾ³ý£¬½öÐèÒªÔÚͬһÐÐÉÏ
+  ¼øÓÚÕûÐÐɾ³ýµÄ¸ßƵ¶È£¬Vi µÄÉè¼ÆÕß¾ö¶¨Òª¼ò»¯ÕûÐÐɾ³ý²Ù×÷£¬Äú½öÐèÒªÔÚͬһÐÐÉÏ
   »÷´òÁ½´Î d ¾Í¿ÉÒÔɾ³ýµô¹â±êËùÔÚµÄÕûÐÐÁË¡£
 
   1. Ç뽫¹â±êÒƶ¯µ½±¾½ÚÖÐÏÂÃæµÄ¶Ì¾ä¶ÎÂäÖеĵڶþÐС£
   2. ÊäÈë dd ɾ³ý¸ÃÐС£
   3. È»ºóÒƶ¯µ½µÚËÄÐС£
-  4. ½Ó×ÅÊäÈë 2dd (»¹¼ÇµÃÇ°Ãæ½²¹ýµÄ number-command-object Âð£¿) ɾ³ýÁ½ÐС£
+  4. ½Ó×ÅÊäÈë 2dd ɾ³ýÁ½ÐС£
 
-      1)  Roses are red,
-      2)  Mud is fun,
-      3)  Violets are blue,
-      4)  I have a car,
-      5)  Clocks tell time,
-      6)  Sugar is sweet
-      7)  And so are you.
+--->  1)  Roses are red,
+--->  2)  Mud is fun,
+--->  3)  Violets are blue,
+--->  4)  I have a car,
+--->  5)  Clocks tell time,
+--->  6)  Sugar is sweet
+--->  7)  And so are you.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 µÚ¶þ½²µÚÎå½Ú¡Ã³·ÏûÀàÃüÁî
+			   µÚ¶þ½²µÚÆß½Ú£º³·ÏûÀàÃüÁî
 
 
-	 ** ÊäÈë u À´³·Ïû×îºóÖ´ÐеÄÃüÁÊäÈë U À´ÐÞÕýÕûÐС£**
+	** ÊäÈë u À´³·Ïû×îºóÖ´ÐеÄÃüÁÊäÈë U À´³·Ïû¶ÔÕûÐеÄÐ޸ġ£ **
 
   1. Ç뽫¹â±êÒƶ¯µ½±¾½ÚÖÐÏÂÃæ±ê¼ÇÓÐ ---> µÄÄÇÒ»ÐУ¬²¢½«ÆäÖÃÓÚµÚÒ»¸ö´íÎó
      ´¦¡£
@@ -251,8 +333,8 @@
   4. Õâ´ÎҪʹÓà x ÐÞÕý±¾ÐеÄËùÓдíÎó¡£
   5. ÏÖÔÚÊäÈëÒ»¸ö´óдµÄ U £¬»Ö¸´µ½¸ÃÐеÄԭʼ״̬¡£
   6. ½Ó×Ŷà´ÎÊäÈë u ÒÔ³·Ïû U ÒÔ¼°¸üÇ°µÄÃüÁî¡£
-  7. È»ºó¶à´ÎÊäÈë CTRL-R (ÏÈ°´Ï CTRL ¼ü²»·Å¿ª£¬½Ó×ÅÊäÈë R ¼ü) £¬ÕâÑù¾Í
-     ¿ÉÒÔÖ´Ðлָ´ÃüÁҲ¾ÍÊdz·Ïûµô³·ÏûÃüÁî¡£
+  7. È»ºó¶à´ÎÊäÈë CTRL-R (ÏÈ°´Ï CTRL ¼ü²»·Å¿ª£¬½Ó×Å°´ R ¼ü)£¬ÕâÑù¾Í
+     ¿ÉÒÔÖØ×ö±»³·ÏûµÄÃüÁҲ¾ÍÊdz·Ïûµô³·ÏûÃüÁî¡£
 
 ---> Fiix the errors oon thhis line and reeplace them witth undo.
 
@@ -265,105 +347,105 @@
 			       µÚ¶þ½²Ð¡½á
 
 
-  1. Óû´Óµ±Ç°¹â±êɾ³ýÖÁµ¥×Ö/µ¥´Êĩ⣬ÇëÊäÈë¡Ãdw
+  1. Óû´Óµ±Ç°¹â±êɾ³ýÖÁÏÂÒ»¸öµ¥´Ê£¬ÇëÊäÈ룺dw
+  2. Óû´Óµ±Ç°¹â±êɾ³ýÖÁµ±Ç°ÐÐĩ⣬ÇëÊäÈ룺d$
+  3. Óûɾ³ýÕûÐУ¬ÇëÊäÈ룺dd
 
-  2. Óû´Óµ±Ç°¹â±êɾ³ýÖÁµ±Ç°ÐÐĩ⣬ÇëÊäÈë¡Ãd$
+  4. ÓûÖظ´Ò»¸ö¶¯×÷£¬ÇëÔÚËüÇ°Ãæ¼ÓÉÏÒ»¸öÊý×Ö£º2w
+  5. ÔÚÕý³£Ä£Ê½ÏÂÐÞ¸ÄÃüÁîµÄ¸ñʽÊÇ£º
+               operator   [number]   motion
+     ÆäÖУº
+       operator - ²Ù×÷·û£¬´ú±íÒª×öµÄÊÂÇ飬±ÈÈç d ´ú±íɾ³ý
+       [number] - ¿ÉÒÔ¸½¼ÓµÄÊý×Ö£¬´ú±í¶¯×÷Öظ´µÄ´ÎÊý
+       motion   - ¶¯×÷£¬´ú±íÔÚËù²Ù×÷µÄÎı¾ÉϵÄÒƶ¯£¬ÀýÈç w ´ú±íµ¥´Ê(word)£¬
+		  $ ´ú±íÐÐÄ©µÈµÈ¡£
 
-  3. Óûɾ³ýÕûÐУ¬ÇëÊäÈë¡Ãdd
+  6. ÓûÒƶ¯¹â±êµ½ÐÐÊ×£¬Çë°´Êý×Ö0¼ü£º0
 
-  4. ÔÚÕý³£Ä£Ê½ÏÂÒ»¸öÃüÁîµÄ¸ñʽÊÇ¡Ã
-
-       [number]   command   object     »òÕß     command	[number]   object
-     ÆäÒâÊÇ¡Ã
-       number - ´ú±íµÄÊÇÃüÁîÖ´ÐеĴÎÊý
-       command - ´ú±íÒª×öµÄÊÂÇ飬±ÈÈç d ´ú±íɾ³ý
-       object - ´ú±íÒª²Ù×÷µÄ¶ÔÏ󣬱ÈÈç w ´ú±íµ¥×Ö/µ¥´Ê£¬$ ´ú±íµ½ÐÐÄ©µÈµÈ¡£
-		$ (to the end of line), etc.
-
-  5. Óû³·ÏûÒÔÇ°µÄ²Ù×÷£¬ÇëÊäÈë¡Ãu (СдµÄu)
-     Óû³·ÏûÔÚÒ»ÐÐÖÐËù×öµÄ¸Ä¶¯£¬ÇëÊäÈë¡ÃU (´óдµÄU)
-     Óû³·ÏûÒÔÇ°µÄ³·ÏûÃüÁ»Ö¸´ÒÔÇ°µÄ²Ù×÷½á¹û£¬ÇëÊäÈë¡ÃCTRL-R
+  7. Óû³·ÏûÒÔÇ°µÄ²Ù×÷£¬ÇëÊäÈ룺u (СдµÄu)
+     Óû³·ÏûÔÚÒ»ÐÐÖÐËù×öµÄ¸Ä¶¯£¬ÇëÊäÈ룺U (´óдµÄU)
+     Óû³·ÏûÒÔÇ°µÄ³·ÏûÃüÁ»Ö¸´ÒÔÇ°µÄ²Ù×÷½á¹û£¬ÇëÊäÈ룺CTRL-R
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 µÚÈý½²µÚÒ»½Ú¡ÃÖÃÈëÀàÃüÁî
+			   µÚÈý½²µÚÒ»½Ú£ºÖÃÈëÀàÃüÁî
 
 
-	       ** ÊäÈë p ½«×îºóÒ»´Îɾ³ýµÄÄÚÈÝÖÃÈë¹â±êÖ®ºó **
+		** ÊäÈë p ½«×îºóÒ»´Îɾ³ýµÄÄÚÈÝÖÃÈë¹â±êÖ®ºó¡£ **
 
-  1. Ç뽫¹â±êÒƶ¯µ½±¾½ÚÖÐÏÂÃæʾ·¶¶ÎÂäµÄÊ×ÐС£
+  1. Ç뽫¹â±êÒƶ¯µ½±¾½ÚÖÐÏÂÃæµÚÒ»¸ö±ê¼ÇÓÐ ---> µÄÒ»ÐС£
 
-  2. ÊäÈë dd ½«¸ÃÐÐɾ³ý£¬ÕâÑù»á½«¸ÃÐб£´æµ½vimµÄ»º³åÇøÖС£
+  2. ÊäÈë dd ½«¸ÃÐÐɾ³ý£¬ÕâÑù»á½«¸ÃÐб£´æµ½ Vim µÄÒ»¸ö¼Ä´æÆ÷ÖС£
 
-  3. ½Ó׎«¹â±êÒƶ¯µ½×¼±¸ÖÃÈëµÄλÖõÄÉÏ·½¡£¼Çס¡ÃÊÇÉÏ·½Å¶¡£
+  3. ½Ó׎«¹â±êÒƶ¯µ½ c) Ò»ÐУ¬¼´×¼±¸ÖÃÈëµÄλÖõÄÉÏ·½¡£¼Çס£ºÊÇÉÏ·½Å¶¡£
 
-  4. È»ºóÔÚÕý³£Ä£Ê½ÏÂ(<ESC>¼ü½øÈë)£¬ÊäÈë p ½«¸ÃÐÐÕ³ÌùÖÃÈë¡£
+  4. È»ºóÔÚÕý³£Ä£Ê½ÏÂ(<ESC>¼ü½øÈë)ÊäÈë p ½«¸ÃÐÐÕ³ÌùÖÃÈë¡£
 
   5. Öظ´²½Öè2ÖÁ²½Öè4£¬½«ËùÓеÄÐÐÒÀÐò·ÅÖõ½ÕýÈ·µÄλÖÃÉÏ¡£
 
-     d) Can you learn too?
-     b) Violets are blue,
-     c) Intelligence is learned,
-     a) Roses are red,
+---> d) Can you learn too?
+---> b) Violets are blue,
+---> c) Intelligence is learned,
+---> a) Roses are red,
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       µÚÈý½²µÚ¶þ½Ú¡ÃÌæ»»ÀàÃüÁî
+			   µÚÈý½²µÚ¶þ½Ú£ºÌæ»»ÀàÃüÁî
 
 
 	  ** ÊäÈë r ºÍÒ»¸ö×Ö·ûÌæ»»¹â±êËùÔÚλÖõÄ×Ö·û¡£**
 
   1. Ç뽫¹â±êÒƶ¯µ½±¾½ÚÖÐÏÂÃæ±ê¼ÇÓÐ ---> µÄµÚÒ»ÐС£
 
-  2. ÇëÒƶ¯¹â±êµ½µÚÒ»¸ö´íÎóµÄÊʵ±Î»Öá£
+  2. ÇëÒƶ¯¹â±êµ½µÚÒ»¸ö³ö´íµÄλÖá£
 
-  3. ½Ó×ÅÊäÈë r £¬ÕâÑù¾ÍÄܽ«´íÎóÌæ»»µôÁË¡£
+  3. ½Ó×ÅÊäÈë r ºÍÒªÌæ»»³ÉµÄ×Ö·û£¬ÕâÑù¾ÍÄܽ«´íÎóÌæ»»µôÁË¡£
 
   4. Öظ´²½Öè2ºÍ²½Öè3£¬Ö±µ½µÚÒ»ÐÐÒѾ­ÐÞ¸ÄÍê±Ï¡£
 
 --->  Whan this lime was tuoed in, someone presswd some wrojg keys!
 --->  When this line was typed in, someone pressed some wrong keys!
 
-  5. È»ºóÎÒÃǼÌÐøѧУµÚÈý½²µÚÈý½Ú¡£
+  5. È»ºóÎÒÃǼÌÐøѧϰµÚÈý½²µÚÈý½Ú¡£
 
-ÌرðÌáʾ¡ÃÇмÇÄúÒªÔÚʹÓÃÖÐѧϰ£¬¶ø²»ÊÇÔÚ¼ÇÒäÖÐѧϰ¡£
+ÌرðÌáʾ£ºÇмÇÄúÒªÔÚʹÓÃÖÐѧϰ£¬¶ø²»ÊÇÔÚ¼ÇÒäÖÐѧϰ¡£
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			µÚÈý½²µÚÈý½Ú¡Ã¸ü¸ÄÀàÃüÁî
+			µÚÈý½²µÚÈý½Ú£º¸ü¸ÄÀàÃüÁî
 
 
-	   ** Òª¸Ä±äÒ»¸öµ¥×Ö/µ¥´ÊµÄ²¿·Ö»òÕßÈ«²¿£¬ÇëÊäÈë cw **
+		 ** Òª¸Ä±äÎı¾Ö±µ½Ò»¸öµ¥´ÊµÄĩ⣬ÇëÊäÈë ce **
 
   1. Ç뽫¹â±êÒƶ¯µ½±¾½ÚÖÐÏÂÃæ±ê¼ÇÓÐ ---> µÄµÚÒ»ÐС£
 
   2. ½Ó×Űѹâ±ê·ÅÔÚµ¥´Ê lubw µÄ×Öĸ u µÄλÖÃÄÇÀï¡£
 
-  3. È»ºóÊäÈë cw ¾Í¿ÉÒÔÐÞÕý¸Ãµ¥´ÊÁË(ÔÚ±¾ÀýÕâÀïÊÇÊäÈë ine ¡£)
+  3. È»ºóÊäÈë cw ÒÔ¼°ÕýÈ·µÄµ¥´Ê(ÔÚ±¾ÀýÖÐÊÇÊäÈë ine )¡£
 
   4. ×îºó°´ <ESC> ¼ü£¬È»ºó¹â±ê¶¨Î»µ½ÏÂÒ»¸ö´íÎóµÚÒ»¸ö×¼±¸¸ü¸ÄµÄ×Öĸ´¦¡£
 
   5. Öظ´²½Öè3ºÍ²½Öè4£¬Ö±µ½µÚÒ»¸ö¾ä×ÓÍêÈ«À×ͬµÚ¶þ¸ö¾ä×Ó¡£
 
----> This lubw has a few wptfd that mrrf changing usf the change command.
----> This line has a few words that need changing using the change command.
+---> This lubw has a few wptfd that mrrf changing usf the change operator.
+---> This line has a few words that need changing using the change operator.
 
-Ìáʾ¡ÃÇë×¢Òâ cw ÃüÁî²»½ö½öÊÇÌæ»»ÁËÒ»¸öµ¥´Ê£¬Ò²ÈÃÄú½øÈëÎı¾²åÈë״̬ÁË¡£
+Ìáʾ£ºÇë×¢Òâ ce ÃüÁî²»½ö½öÊÇɾ³ýÁËÒ»¸öµ¥´Ê£¬ËüÒ²ÈÃÄú½øÈë²åÈëģʽÁË¡£
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       µÚÈý½²µÚËĽڡÃʹÓÃcÖ¸ÁîµÄÆäËû¸ü¸ÄÀàÃüÁî
+		       µÚÈý½²µÚËĽڣºÊ¹ÓÃc¸ü¸Ä¸ü¶à
 
 
-	     ** ¸ü¸ÄÀàÖ¸Áî¿ÉÒÔʹÓÃͬɾ³ýÀàÃüÁîËùʹÓõĶÔÏó²ÎÊý¡£**
+	   ** ¸ü¸ÄÀà²Ù×÷·û¿ÉÒÔÓëɾ³ýÖÐʹÓõÄͬÑùµÄ¶¯×÷ÅäºÏʹÓᣠ**
 
-  1. ¸ü¸ÄÀàÖ¸ÁîµÄ¹¤×÷·½Ê½¸úɾ³ýÀàÃüÁîÊÇÒ»Öµġ£²Ù×÷¸ñʽÊÇ¡Ã
+  1. ¸ü¸ÄÀà²Ù×÷·ûµÄ¹¤×÷·½Ê½¸úɾ³ýÀàÊÇÒ»Öµġ£²Ù×÷¸ñʽÊÇ£º
 
-       [number]   c   object	   »òÕß	    c	[number]   object
+         c    [number]   motion
 
-  2. ¶ÔÏó²ÎÊýÒ²ÊÇÒ»ÑùµÄ£¬±ÈÈç w ´ú±íµ¥×Ö/µ¥´Ê£¬$´ú±íÐÐÄ©µÈµÈ¡£
+  2. ¶¯×÷²ÎÊý(motion)Ò²ÊÇÒ»ÑùµÄ£¬±ÈÈç w ´ú±íµ¥´Ê£¬$´ú±íÐÐÄ©µÈµÈ¡£
 
   3. Ç뽫¹â±êÒƶ¯µ½±¾½ÚÖÐÏÂÃæ±ê¼ÇÓÐ ---> µÄµÚÒ»ÐС£
 
@@ -377,55 +459,56 @@
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       µÚÈý½²Ð¡½á
+				  µÚÈý½²Ð¡½á
 
 
-  1. ÒªÖØÐÂÖÃÈëÒѾ­É¾³ýµÄÎı¾ÄÚÈÝ£¬ÇëÊäÈëСд×Öĸ p¡£¸Ã²Ù×÷¿ÉÒÔ½«ÒÑɾ³ý
+  1. ÒªÖØÐÂÖÃÈëÒѾ­É¾³ýµÄÎı¾ÄÚÈÝ£¬Ç밴Сд×Öĸ p ¼ü¡£¸Ã²Ù×÷¿ÉÒÔ½«ÒÑɾ³ý
      µÄÎı¾ÄÚÈÝÖÃÓÚ¹â±êÖ®ºó¡£Èç¹û×îºóÒ»´Îɾ³ýµÄÊÇÒ»¸öÕûÐУ¬ÄÇô¸ÃÐн«ÖÃ
      ÓÚµ±Ç°¹â±êËùÔÚÐеÄÏÂÒ»ÐС£
 
   2. ÒªÌæ»»¹â±êËùÔÚλÖõÄ×Ö·û£¬ÇëÊäÈëСдµÄ r ºÍÒªÌæ»»µôԭλÖÃ×Ö·ûµÄÐÂ×Ö
      ·û¼´¿É¡£
 
-  3. ¸ü¸ÄÀàÃüÁîÔÊÐíÄú¸Ä±äÖ¸¶¨µÄ¶ÔÏ󣬴ӵ±Ç°¹â±êËùÔÚλÖÃÖ±µ½¶ÔÏóµÄĩβ¡£
-     ±ÈÈçÊäÈë cw ¿ÉÒÔÌæ»»µ±Ç°¹â±êµ½µ¥´ÊµÄĩβµÄÄÚÈÝ£»ÊäÈë c$ ¿ÉÒÔÌæ»»µ±
+  3. ¸ü¸ÄÀàÃüÁîÔÊÐíÄú¸Ä±ä´Óµ±Ç°¹â±êËùÔÚλÖÃÖ±µ½¶¯×÷ָʾµÄλÖÃÖмäµÄÎı¾¡£
+     ±ÈÈçÊäÈë ce ¿ÉÒÔÌæ»»µ±Ç°¹â±êµ½µ¥´ÊµÄĩβµÄÄÚÈÝ£»ÊäÈë c$ ¿ÉÒÔÌæ»»µ±
      Ç°¹â±êµ½ÐÐÄ©µÄÄÚÈÝ¡£
 
-  4. ¸ü¸ÄÀàÃüÁîµÄ¸ñʽÊÇ¡Ã
+  4. ¸ü¸ÄÀàÃüÁîµÄ¸ñʽÊÇ£º
 
-	 [number]   c	object	      »òÕß	c   [number]   object
+	 c   [number]   motion
 
-ÏÂÃæÎÒÃǼÌÐøѧϰÏÂÒ»½²¡£
+ÏÖÔÚÎÒÃǼÌÐøѧϰÏÂÒ»½²¡£
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     µÚËĽ²µÚÒ»½Ú¡Ã¶¨Î»¼°Îļþ״̬
+		     µÚËĽ²µÚÒ»½Ú£º¶¨Î»¼°Îļþ״̬
 
+  ** ÊäÈë CTRL-G ÏÔʾµ±Ç°±à¼­ÎļþÖе±Ç°¹â±êËùÔÚÐÐλÖÃÒÔ¼°Îļþ״̬ÐÅÏ¢¡£
+     ÊäÈë´óд G ÔòÖ±½ÓÌøתµ½ÎļþÖеÄijһָ¶¨ÐС£**
 
-  ** ÊäÈë CTRL-g ÏÔʾµ±Ç°±à¼­ÎļþÖе±Ç°¹â±êËùÔÚÐÐλÖÃÒÔ¼°Îļþ״̬ÐÅÏ¢¡£
-     ÊäÈë SHIFT-G ÔòÖ±½ÓÌøתµ½ÎļþÖеÄijһָ¶¨ÐС£**
+  Ìáʾ£ºÇмÇÒªÏÈͨ¶Á±¾½ÚÄÚÈÝ£¬Ö®ºó²Å¿ÉÒÔÖ´ÐÐÒÔϲ½Öè!!!
 
-  Ìáʾ¡ÃÇмÇÒªÏÈͨ¶Á±¾½ÚÄÚÈÝ£¬Ö®ºó²Å¿ÉÒÔÖ´ÐÐÒÔϲ½Öè!!!
+  1. °´Ï CTRL ¼ü²»·Å¿ªÈ»ºó°´ g ¼ü¡£ÎÒÃdzÆÕâ¸ö¼ü×éºÏΪ CTRL-G¡£
+     Äú»á¿´µ½Ò³Ãæ×îµ×²¿³öÏÖÒ»¸ö״̬ÐÅÏ¢ÐУ¬ÏÔʾµÄÄÚÈÝÊǵ±Ç°±à¼­µÄÎļþÃû
+     ºÍÎļþÖйâ±êλÖá£Çë¼ÇסÐкţ¬Ëü»áÔÚ²½Öè3ÖÐÓõ½¡£
 
-  1. °´Ï CTRL ¼ü²»·Å¿ªÈ»ºó°´ g ¼ü¡£È»ºó¾Í»á¿´µ½Ò³Ãæ×îµ×²¿³öÏÖÒ»¸ö״̬ÐÅ
-     Ï¢ÐУ¬ÏÔʾµÄÄÚÈÝÊǵ±Ç°±à¼­µÄÎļþÃûºÍÎļþµÄ×ÜÐÐÊý¡£Çë¼Çס²½Öè3µÄÐкš£
+Ìáʾ£ºÄúÒ²Ðí»áÔÚÆÁÄ»µÄÓÒϽǿ´µ½¹â±êλÖã¬Õâ»áÔÚ 'ruler' Ñ¡ÏîÉèÖÃʱ·¢Éú
+      (²Î¼û :help 'ruler')
 
-  2. °´Ï SHIFT-G ¼ü¿ÉÒÔʹµÃµ±Ç°¹â±êÖ±½ÓÌøתµ½Îļþ×îºóÒ»ÐС£
-
-  3. ÊäÈëÄúÔøÍ£ÁôµÄÐкţ¬È»ºó°´Ï SHIFT-G¡£ÕâÑù¾Í¿ÉÒÔ·µ»Øµ½ÄúµÚÒ»´Î°´ÏÂ
-     CTRL-g ʱËùÔÚµÄÐкÃÁË¡£×¢Òâ¡ÃÊäÈëÐкÅʱ£¬ÐкÅÊDz»»áÔÚÆÁÄ»ÉÏÏÔʾ³öÀ´
-     µÄ¡£
-
-  4. Èç¹ûÔ¸Ò⣬Äú¿ÉÒÔ¼ÌÐøÖ´Ðв½Öè1ÖÁ²½ÖèÈý¡£
+  2. ÊäÈë´óд G ¿ÉÒÔʹµÃµ±Ç°¹â±êÖ±½ÓÌøתµ½Îļþ×îºóÒ»ÐС£
+     ÊäÈë gg ¿ÉÒÔʹµÃµ±Ç°¹â±êÖ±½ÓÌøתµ½ÎļþµÚÒ»ÐС£
 
+  3. ÊäÈëÄúÔøÍ£ÁôµÄÐкţ¬È»ºóÊäÈë´óд G¡£ÕâÑù¾Í¿ÉÒÔ·µ»Øµ½ÄúµÚÒ»´Î°´ÏÂ
+     CTRL-G ʱËùÔÚµÄÐÐÁË¡£
 
+  4. Èç¹ûÄú¾õµÃûÎÊÌâµÄ»°£¬ÇëÖ´Ðв½Öè1ÖÁ²½Öè3µÄ²Ù×÷½øÐÐÁ·Ï°¡£
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			µÚËĽ²µÚ¶þ½Ú¡ÃËÑË÷ÀàÃüÁî
+			µÚËĽ²µÚ¶þ½Ú£ºËÑË÷ÀàÃüÁî
 
 
-     ** ÊäÈë / ÒÔ¼°Î²ËæµÄ×Ö·û´®¿ÉÒÔÓÃÒÔÔÚµ±Ç°ÎļþÖвéÕÒ¸Ã×Ö·û´®¡£**
+     ** ÊäÈë / ¼ÓÉÏÒ»¸ö×Ö·û´®¿ÉÒÔÓÃÒÔÔÚµ±Ç°ÎļþÖвéÕÒ¸Ã×Ö·û´®¡£**
 
   1. ÔÚÕý³£Ä£Ê½ÏÂÊäÈë / ×Ö·û¡£Äú´Ëʱ»á×¢Òâµ½¸Ã×Ö·ûºÍ¹â±ê¶¼»á³öÏÖÔÚÆÁÄ»µ×
      ²¿£¬Õâ¸ú : ÃüÁîÊÇÒ»ÑùµÄ¡£
@@ -433,23 +516,22 @@
   2. ½Ó×ÅÊäÈë errroor <»Ø³µ>¡£ÄǸöerrroor¾ÍÊÇÄúÒª²éÕÒµÄ×Ö·û´®¡£
 
   3. Òª²éÕÒͬÉÏÒ»´ÎµÄ×Ö·û´®£¬Ö»ÐèÒª°´ n ¼ü¡£ÒªÏòÏà·´·½Ïò²éÕÒͬÉÏÒ»´ÎµÄ×Ö
-     ·û´®£¬ÇëÊäÈë Shift-N ¼´¿É¡£
+     ·û´®£¬ÇëÊäÈë´óд N ¼´¿É¡£
 
   4. Èç¹ûÄúÏëÄæÏò²éÕÒ×Ö·û´®£¬ÇëʹÓà ? ´úÌæ / ½øÐС£
 
----> When the search reaches the end of the file it will continue at the start.
-
-  "errroor" is not the way to spell error;  errroor is an error.
-
-  Ìáʾ¡ÃÈç¹û²éÕÒÒѾ­µ½´ïÎļþĩ⣬²éÕÒ»á×Ô¶¯´ÓÎļþÍ·²¿¼ÌÐø²éÕÒ¡£
-
+  5. Òª»Øµ½Äú֮ǰµÄλÖð´ CTRL-O (°´×¡ Ctrl ¼ü²»·Åͬʱ°´ÏÂ×Öĸ o)¡£Öظ´°´¿ÉÒÔ
+     »ØÍ˸ü¶à²½¡£CTRL-I »áÌøתµ½½ÏеÄλÖá£
 
+--->  "errroor" is not the way to spell error;  errroor is an error.
+Ìáʾ£ºÈç¹û²éÕÒÒѾ­µ½´ïÎļþĩ⣬²éÕÒ»á×Ô¶¯´ÓÎļþÍ·²¿¼ÌÐø²éÕÒ£¬³ý·Ç
+      'wrapscan' Ñ¡Ïî±»¸´Î»¡£
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		   µÚËĽ²µÚÈý½Ú¡ÃÅä¶ÔÀ¨ºÅµÄ²éÕÒ
+		   µÚËĽ²µÚÈý½Ú£ºÅä¶ÔÀ¨ºÅµÄ²éÕÒ
 
 
-	      ** °´ % ¿ÉÒÔ²éÕÒÅä¶ÔµÄÀ¨ºÅ )¡¢]¡¢}¡£**
+	      ** ÊäÈë % ¿ÉÒÔ²éÕÒÅä¶ÔµÄÀ¨ºÅ )¡¢]¡¢}¡£**
 
   1. °Ñ¹â±ê·ÅÔÚ±¾½ÚÏÂÃæ±ê¼ÇÓÐ --> ÄÇÒ»ÐÐÖеÄÈκÎÒ»¸ö (¡¢[ »ò { ´¦¡£
 
@@ -459,17 +541,17 @@
 
   4. Ôٴΰ´ % ¾Í¿ÉÒÔÌø»ØÅä¶ÔµÄµÚÒ»¸öÀ¨ºÅ´¦¡£
 
+  5. Òƶ¯¹â±êµ½ÁíÒ»¸ö (¡¢)¡¢[¡¢]¡¢{ »ò } ´¦£¬°´ % ²é¿´ÆäËù×÷ËùΪ¡£
+
 ---> This ( is a test line with ('s, ['s ] and {'s } in it. ))
 
-Ìáʾ¡ÃÔÚ³ÌÐòµ÷ÊÔʱ£¬Õâ¸ö¹¦ÄÜÓÃÀ´²éÕÒ²»Åä¶ÔµÄÀ¨ºÅÊǺÜÓÐÓõġ£
-
-
 
+Ìáʾ£ºÔÚ³ÌÐòµ÷ÊÔʱ£¬Õâ¸ö¹¦ÄÜÓÃÀ´²éÕÒ²»Åä¶ÔµÄÀ¨ºÅÊǺÜÓÐÓõġ£
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      µÚËĽ²µÚËĽڡÃÐÞÕý´íÎóµÄ·½·¨Ö®Ò»
+		      µÚËĽ²µÚËĽڣºÌæ»»ÃüÁî
 
 
 		** ÊäÈë :s/old/new/g ¿ÉÒÔÌæ»» old Ϊ new¡£**
@@ -479,46 +561,48 @@
   2. ÊäÈë :s/thee/the <»Ø³µ> ¡£Çë×¢Òâ¸ÃÃüÁîÖ»¸Ä±ä¹â±êËùÔÚÐеĵÚÒ»¸öÆ¥Åä
      ´®¡£
 
-  3. ÊäÈë :s/thee/the/g	ÔòÊÇÌ滻ȫÐеÄÆ¥Åä´®¡£
-
----> the best time to see thee flowers is in thee spring.
-
-  4. ÒªÌæ»»Á½ÐÐÖ®¼ä³öÏÖµÄÿ¸öÆ¥Åä´®£¬ÇëÊäÈë :#,#s/old/new/g (#,#´ú±íµÄÊÇ
-     Á½ÐеÄÐкÅ)¡£ÊäÈë :%s/old/new/g ÔòÊÇÌæ»»Õû¸öÎļþÖеÄÿ¸öÆ¥Åä´®¡£
-
+  3. ÊäÈë :s/thee/the/g	ÔòÊÇÌ滻ȫÐеÄÆ¥Åä´®£¬¸ÃÐÐÖÐËùÓÐµÄ "thee" ¶¼»á±»
+     ¸Ä±ä¡£
 
+---> thee best time to see thee flowers is in thee spring.
 
+  4. ÒªÌæ»»Á½ÐÐÖ®¼ä³öÏÖµÄÿ¸öÆ¥Åä´®£¬Çë
+     ÊäÈë   :#,#s/old/new/g   ÆäÖÐ #,# ´ú±íµÄÊÇÌæ»»²Ù×÷µÄÈô¸ÉÐÐÖÐ
+                              Ê×βÁ½ÐеÄÐкš£
+     ÊäÈë   :%s/old/new/g     ÔòÊÇÌæ»»Õû¸öÎļþÖеÄÿ¸öÆ¥Åä´®¡£
+     ÊäÈë   :%s/old/new/gc    »áÕÒµ½Õû¸öÎļþÖеÄÿ¸öÆ¥Åä´®£¬²¢ÇÒ¶Ôÿ¸öÆ¥Åä´®
+                              ÌáʾÊÇ·ñ½øÐÐÌæ»»¡£
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			       µÚËĽ²Ð¡½á
 
 
-  1. Ctrl-g ÓÃÓÚÏÔʾµ±Ç°¹â±êËùÔÚλÖúÍÎļþ״̬ÐÅÏ¢¡£Shift-G ÓÃÓÚ½«¹â±êÌø
-     תÖÁÎļþ×îºóÒ»ÐС£ÏÈÇÃÈëÒ»¸öÐкÅÈ»ºó°´ Shift-G ÔòÊǽ«¹â±êÒƶ¯ÖÁ¸ÃÐÐ
-     ºÅ´ú±íµÄÐС£
+  1. CTRL-G ÓÃÓÚÏÔʾµ±Ç°¹â±êËùÔÚλÖúÍÎļþ״̬ÐÅÏ¢¡£
+     G ÓÃÓÚ½«¹â±êÌøתÖÁÎļþ×îºóÒ»ÐС£
+     ÏÈÇÃÈëÒ»¸öÐкÅÈ»ºóÊäÈë´óд G ÔòÊǽ«¹â±êÒƶ¯ÖÁ¸ÃÐкŴú±íµÄÐС£
+     gg ÓÃÓÚ½«¹â±êÌøתÖÁÎļþµÚÒ»ÐС£
 
-  2. ÊäÈë / È»ºó½ôËæÒ»¸ö×Ö·û´®ÊÇÔòÊÇÔÚµ±Ç°Ëù±à¼­µÄÎĵµÖÐÏòºó²éÕÒ¸Ã×Ö·û´®¡£
-     ÊäÈëÎʺŠ? È»ºó½ôËæÒ»¸ö×Ö·û´®ÊÇÔòÊÇÔÚµ±Ç°Ëù±à¼­µÄÎĵµÖÐÏòÇ°²éÕÒ¸Ã×Ö
-     ·û´®¡£Íê³ÉÒ»´Î²éÕÒÖ®ºó°´ n ¼üÔòÊÇÖظ´ÉÏÒ»´ÎµÄÃüÁ¿ÉÔÚͬһ·½ÏòÉϲé
-     ÕÒÏÂÒ»¸ö×Ö·û´®ËùÔÚ£»»òÕß°´ Shift-N ÏòÏà·´·½Ïò²éÕÒϸÃ×Ö·û´®ËùÔÚ¡£
+  2. ÊäÈë / È»ºó½ôËæÒ»¸ö×Ö·û´®ÊÇÔÚµ±Ç°Ëù±à¼­µÄÎĵµÖÐÕýÏò²éÕÒ¸Ã×Ö·û´®¡£
+     ÊäÈë ? È»ºó½ôËæÒ»¸ö×Ö·û´®ÔòÊÇÔÚµ±Ç°Ëù±à¼­µÄÎĵµÖз´Ïò²éÕÒ¸Ã×Ö·û´®¡£
+     Íê³ÉÒ»´Î²éÕÒÖ®ºó°´ n ¼üÊÇÖظ´ÉÏÒ»´ÎµÄÃüÁ¿ÉÔÚͬһ·½ÏòÉϲé
+     ÕÒÏÂÒ»¸öÆ¥Åä×Ö·û´®ËùÔÚ£»»òÕß°´´óд N ÏòÏà·´·½Ïò²éÕÒÏÂһƥÅä×Ö·û´®ËùÔÚ¡£
+     CTRL-O ´øÄúÌøת»Ø½Ï¾ÉµÄλÖã¬CTRL-I Ôò´øÄúµ½½ÏеÄλÖá£
 
-  3. Èç¹û¹â±êµ±Ç°Î»ÖÃÊÇÀ¨ºÅ(¡¢)¡¢[¡¢]¡¢{¡¢}£¬°´ % ¿ÉÒÔ½«¹â±êÒƶ¯µ½Åä¶ÔµÄ
-     À¨ºÅÉÏ¡£
+  3. Èç¹û¹â±êµ±Ç°Î»ÖÃÊÇÀ¨ºÅ(¡¢)¡¢[¡¢]¡¢{¡¢}£¬°´ % »á½«¹â±êÒƶ¯µ½Åä¶ÔµÄÀ¨ºÅÉÏ¡£
 
   4. ÔÚÒ»ÐÐÄÚÌ滻ͷһ¸ö×Ö·û´® old ΪеÄ×Ö·û´® new£¬ÇëÊäÈë  :s/old/new
      ÔÚÒ»ÐÐÄÚÌæ»»ËùÓеÄ×Ö·û´® old ΪеÄ×Ö·û´® new£¬ÇëÊäÈë  :s/old/new/g
      ÔÚÁ½ÐÐÄÚÌæ»»ËùÓеÄ×Ö·û´® old ΪеÄ×Ö·û´® new£¬ÇëÊäÈë  :#,#s/old/new/g
      ÔÚÎļþÄÚÌæ»»ËùÓеÄ×Ö·û´® old ΪеÄ×Ö·û´® new£¬ÇëÊäÈë  :%s/old/new/g
-     ½øÐÐÈ«ÎÄÌ滻ʱѯÎÊÓû§È·ÈÏÿ¸öÌæ»»ÐèÌí¼Ó c Ñ¡ÏÇëÊäÈë :%s/old/new/gc
-
+     ½øÐÐÈ«ÎÄÌ滻ʱѯÎÊÓû§È·ÈÏÿ¸öÌæ»»ÐèÌí¼Ó c ±êÖ¾        :%s/old/new/gc
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		µÚÎå½²µÚÒ»½Ú¡ÃÔÚ VIM ÄÚÖ´ÐÐÍⲿÃüÁîµÄ·½·¨
+		µÚÎå½²µÚÒ»½Ú£ºÔÚ VIM ÄÚÖ´ÐÐÍⲿÃüÁîµÄ·½·¨
 
 
-	   ** ÊäÈë :! È»ºó½ôËæÖøÊäÈëÒ»¸öÍⲿÃüÁî¿ÉÒÔÖ´ÐиÃÍⲿÃüÁî¡£**
+	   ** ÊäÈë :! È»ºó½ô½Ó×ÅÊäÈëÒ»¸öÍⲿÃüÁî¿ÉÒÔÖ´ÐиÃÍⲿÃüÁî¡£**
 
-  1. °´ÏÂÎÒÃÇËùÊìϤµÄ : ÃüÁîÉèÖùâ±êµ½ÆÁÄ»µ×²¿¡£ÕâÑù¾Í¿ÉÒÔÈÃÄúÊäÈëÃüÁîÁË¡£
+  1. °´ÏÂÎÒÃÇËùÊìϤµÄ : ÃüÁîʹ¹â±êÒƶ¯µ½ÆÁÄ»µ×²¿¡£ÕâÑùÄú¾Í¿ÉÒÔÊäÈëÒ»ÐÐÃüÁîÁË¡£
 
   2. ½Ó×ÅÊäÈë¸Ð̾ºÅ ! Õâ¸ö×Ö·û£¬ÕâÑù¾ÍÔÊÐíÄúÖ´ÐÐÍⲿµÄ shell ÃüÁîÁË¡£
 
@@ -526,15 +610,17 @@
      ÄÚÈÝ£¬¾ÍÈçͬÄúÔÚÃüÁîÐÐÌáʾ·ûÏÂÊäÈë ls ÃüÁîµÄ½á¹ûÒ»Ñù¡£Èç¹û !ls ûÆð
      ×÷Óã¬Äú¿ÉÒÔÊÔÊÔ :!dir ¿´¿´¡£
 
----> Ìáʾ¡Ã ËùÓеÄÍⲿÃüÁ¿ÉÒÔÒÔÕâÖÖ·½Ê½Ö´ÐС£
+Ìáʾ£ºËùÓеÄÍⲿÃüÁ¿ÉÒÔÒÔÕâÖÖ·½Ê½Ö´ÐУ¬°üÀ¨´øÃüÁîÐвÎÊýµÄÄÇЩ¡£
+
+Ìáʾ£ºËùÓÐµÄ : ÃüÁ±ØÐëÒÔÇà <»Ø³µ> ¼ü½áÊø¡£´Ó½ñÒÔºóÎÒÃǾͲ»»á×ÜÊÇÌáµ½ÕâÒ»µã
+      ÁË¡£
 
----> Ìáʾ¡Ã ËùÓÐµÄ : ÃüÁ±ØÐëÒÔ <»Ø³µ> ¸æÖÕ¡£
 
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      µÚÎå½²µÚ¶þ½Ú¡Ã¹ØÓÚ±£´æÎļþµÄ¸ü¶àÐÅÏ¢
+		      µÚÎå½²µÚ¶þ½Ú£º¹ØÓÚ±£´æÎļþµÄ¸ü¶àÐÅÏ¢
 
 
 	     ** Òª½«¶ÔÎļþµÄ¸Ä¶¯±£´æµ½ÎļþÖУ¬ÇëÊäÈë :w FILENAME ¡£**
@@ -542,60 +628,63 @@
   1. ÊäÈë :!dir »òÕß :!ls »ñÖªµ±Ç°Ä¿Â¼µÄÄÚÈÝ¡£ÄúÓ¦µ±ÒÑÖªµÀ×îºó»¹µÃÇÃ
      <»Ø³µ> °É¡£
 
-  2. Ñ¡ÔñÒ»¸öÉÐδ´æÔÚÎļþÃû£¬±ÈÈç TEST ¡£
+  2. Ñ¡ÔñÒ»¸öδ±»Óõ½µÄÎļþÃû£¬±ÈÈç TEST¡£
 
   3. ½Ó×ÅÊäÈë :w TEST  (´Ë´¦ TEST ÊÇÄúËùÑ¡ÔñµÄÎļþÃû¡£)
 
-  4. ¸ÃÃüÁî»áÒÔ TEST ΪÎļþÃû±£´æÕû¸öÎļþ (VIM ½Ì³Ì)¡£ÎªÁËÈ·±£ÕýÈ·±£´æ£¬
-     ÇëÔÙ´ÎÊäÈë :!dir ²é¿´ÄúµÄĿ¼ÁбíÄÚÈÝ¡£
+  4. ¸ÃÃüÁî»áÒÔ TEST ΪÎļþÃû±£´æÕû¸öÎļþ (Vim ½Ì³Ì)¡£ÎªÁËÑéÖ¤ÕâÒ»µã£¬
+     ÇëÔÙ´ÎÊäÈë :!dir »ò :!ls ²é¿´ÄúµÄĿ¼ÁбíÄÚÈÝ¡£
 
----> Çë×¢Òâ¡ÃÈç¹ûÄúÍ˳ö VIM È»ºóÔÚÒÔÎļþÃû TEST Ϊ²ÎÊý½øÈ룬ÄÇô¸ÃÎļþÄÚ
+Çë×¢Ò⣺Èç¹ûÄúÍ˳ö Vim È»ºóÔÚÒÔÃüÁî vim TEST ÔÙ´ÎÆô¶¯ Vim£¬ÄÇô¸ÃÎļþÄÚ
      ÈÝÓ¦¸ÃͬÄú±£´æʱµÄÎļþÄÚÈÝÊÇÍêÈ«Ò»ÑùµÄ¡£
 
-  5. ÏÖÔÚÄú¿ÉÒÔͨ¹ýÊäÈë :!rm TEST À´É¾³ý TEST ÎļþÁË¡£
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    µÚÎå½²µÚÈý½Ú¡ÃÒ»¸ö¾ßÓÐÑ¡ÔñÐԵı£´æÃüÁî
-
-
-		** Òª±£´æÎļþµÄ²¿·ÖÄÚÈÝ£¬ÇëÊäÈë :#,# w FILENAME **
-
-  1. ÔÙÀ´Ö´ÐÐÒ»´Î :!dir »òÕß :!ls »ñÖªµ±Ç°Ä¿Â¼µÄÄÚÈÝ£¬È»ºóÑ¡ÔñÒ»¸öºÏÊʵÄ
-     ²»ÖØÃûµÄÎļþÃû£¬±ÈÈç TEST ¡£
-
-  2. ½Ó׎«¹â±êÒƶ¯ÖÁ±¾Ò³µÄ×¶Ë£¬È»ºó°´ CTRL-g ÕÒµ½¸ÃÐеÄÐкš£±ðÍüÁË
-     ÐкÅŶ¡£
-
-  3. ½Ó×Űѹâ±êÒƶ¯ÖÁ±¾Ò³µÄ×îµ×¶Ë£¬ÔÙ°´Ò»´Î CTRL-g ¡£Ò²±ðÍüÁËÕâ¸öÐкÃŶ¡£
-
-  4. ΪÁËÖ»±£´æÎÄÕµÄij¸ö²¿·Ö£¬ÇëÊäÈë :#,# w TEST ¡£ÕâÀïµÄ #,# ¾ÍÊÇÉÏÃæ
-     ÒªÇóÄú¼ÇסµÄÐкÅ(¶¥¶ËÐкÅ,µ×¶ËÐкÅ)£¬¶ø TEST ¾ÍÊÇÑ¡¶¨µÄÎļþÃû¡£
-
-  5. ×îºó£¬Óà :!dir È·ÈÏÎļþÊÇ·ñÕýÈ·±£´æ¡£µ«ÊÇÕâ´ÎÏȱðɾ³ýµô¡£
-
-
+  5. ÏÖÔÚÄú¿ÉÒÔɾ³ý TEST ÎļþÁË¡£ÔÚ MS-DOS Ï£¬ÇëÊäÈ룺   :!del TEST
+                                 ÔÚ Unix Ï£¬ÇëÊäÈ룺     :!rm TEST
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		   µÚÎå½²µÚËĽڡÃÌáÈ¡ºÍºÏ²¢Îļþ
+		    µÚÎå½²µÚÈý½Ú£ºÒ»¸ö¾ßÓÐÑ¡ÔñÐԵı£´æÃüÁî
+
+
+	    ** Òª±£´æÎļþµÄ²¿·ÖÄÚÈÝ£¬ÇëÊäÈë v motion :w FILENAME **
+
+  1. Òƶ¯¹â±êµ½±¾ÐС£
+
+  2. ½Ó×Å°´ v ¼ü£¬½«¹â±êÒƶ¯ÖÁÏÂÃæµÚÎå¸öÌõÄ¿ÉÏ¡£Äú»á×¢Òâµ½Ö®¼äµÄÎı¾±»¸ßÁÁÁË¡£
+
+  3. È»ºó°´ : ×Ö·û¡£Äú½«¿´µ½ÆÁÄ»µ×²¿»á³öÏÖ :'<,'> ¡£
+
+  4. ÏÖÔÚÇëÊäÈë w TEST£¬ÆäÖÐ TEST ÊÇÒ»¸öδ±»Ê¹ÓõÄÎļþÃû¡£È·ÈÏÄú¿´µ½ÁË
+     :'<,'>w TEST Ö®ºó°´ <»Ø³µ> ¼ü¡£
+
+  5. Õâʱ Vim »á°ÑÑ¡ÖеÄÐÐдÈëµ½ÒÔ TEST ÃüÃûµÄÎļþÖÐÈ¥¡£Ê¹Óà :!dir »ò :!ls
+     È·ÈÏÎļþ±»ÕýÈ·±£´æ¡£Õâ´ÎÏȱðɾ³ýËü£¡ÎÒÃÇÔÚÏÂÒ»½²ÖлáÓõ½Ëü¡£
+
+Ìáʾ£º°´ v ¼üʹ Vim ½øÈë¿ÉÊÓģʽ½øÐÐÑ¡È¡¡£Äú¿ÉÒÔËÄ´¦Òƶ¯¹â±êʹѡȡÇøÓò±ä´ó»ò
+      ±äС¡£½Ó×ÅÄú¿ÉÒÔʹÓÃÒ»¸ö²Ù×÷·û¶ÔÑ¡ÖÐÎı¾½øÐвÙ×÷¡£ÀýÈ磬°´ d ¼ü»áɾ³ý
+      Ñ¡ÖеÄÎı¾ÄÚÈÝ¡£
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		   µÚÎå½²µÚËĽڣºÌáÈ¡ºÍºÏ²¢Îļþ
 
 
        ** ÒªÏòµ±Ç°ÎļþÖвåÈëÁíÍâµÄÎļþµÄÄÚÈÝ£¬ÇëÊäÈë :r FILENAME **
 
-  1. Çë¼üÈë :!dir È·ÈÏÄúÇ°Ãæ´´½¨µÄ TEST Îļþ»¹ÔÚ¡£
+  1. Çë°Ñ¹â±êÒƶ¯µ½±¾ÐÐÉÏÃæÒ»ÐС£
 
-  2. È»ºó½«¹â±êÒƶ¯ÖÁµ±Ç°Ò³ÃæµÄ¶¥¶Ë¡£
+ÌرðÌáʾ£ºÖ´Ðв½Öè2Ö®ºóÄú½«¿´µ½µÚÎå½²µÚÈý½ÚµÄÎÄ×Ö£¬Çë½ìʱÍùÏÂÒƶ¯
+          ÒÔÔٴο´µ½±¾½²ÄÚÈÝ¡£
 
-ÌرðÌáʾ¡Ã Ö´Ðв½Öè3Ö®ºóÄú½«¿´µ½µÚÎå½²µÚÈý½Ú£¬Çë½ìʱÔÙÍùÏÂÒƶ¯»Øµ½ÕâÀïÀ´¡£
+  2. ½Ó×Åͨ¹ýÃüÁî :r TEST ½«Ç°Ãæ´´½¨µÄÃûΪ TEST µÄÎļþÌáÈ¡½øÀ´¡£
+     ÄúËùÌáÈ¡½øÀ´µÄÎļþ½«´Ó¹â±êËùÔÚλÖô¦¿ªÊ¼ÖÃÈë¡£
 
-  3. ½Ó×Åͨ¹ý :r TEST ½«Ç°Ãæ´´½¨µÄÃûΪ TEST µÄÎļþÌáÈ¡½øÀ´¡£
+  3. ΪÁËÈ·ÈÏÎļþÒѾ­ÌáÈ¡³É¹¦£¬Òƶ¯¹â±ê»Øµ½Ô­À´µÄλÖþͿÉÒÔ×¢ÒâÓÐÁ½·ÝµÚ
+     Îå½²µÚÈý½ÚµÄÄÚÈÝ£¬Ò»·ÝÊÇԭʼÄÚÈÝ£¬ÁíÍâÒ»·ÝÊÇÀ´×ÔÎļþµÄ¸±±¾¡£
 
-ÌرðÌáʾ¡ÃÄúËùÌáÈ¡½øÀ´µÄÎļþ½«´Ó¹â±êËùÔÚλÖô¦¿ªÊ¼ÖÃÈë¡£
+Ìáʾ£ºÄú»¹¿ÉÒÔ¶ÁÈ¡ÍⲿÃüÁîµÄÊä³ö¡£ÀýÈ磬 :r !ls ¿ÉÒÔ¶ÁÈ¡ ls ÃüÁîµÄÊä³ö£¬²¢
+      °ÑËü·ÅÖÃÔÚ¹â±êÏÂÃæ¡£
 
-  4. ΪÁËÈ·ÈÏÎļþÒѾ­ÌáÈ¡³É¹¦£¬Òƶ¯¹â±ê»Øµ½Ô­À´µÄλÖþͿÉÒÔ×¢ÒâÓÐÁ½·ÝµÚ
-     Îå½²µÚÈý½Ú£¬Ò»·ÝÊÇÔ­±¾£¬ÁíÍâÒ»·ÝÊÇÀ´×ÔÎļþµÄ¸±±¾¡£
 
 
 
@@ -605,237 +694,293 @@
 
   1. :!command ÓÃÓÚÖ´ÐÐÒ»¸öÍⲿÃüÁî command¡£
 
-     Ç뿴һЩʵ¼ÊÀý×Ó¡Ã
-	  :!dir  -  ÓÃÓÚÏÔʾµ±Ç°Ä¿Â¼µÄÄÚÈÝ¡£
-	  :!rm FILENAME  -	ÓÃÓÚɾ³ýÃûΪ FILENAME µÄÎļþ¡£
+     Ç뿴һЩʵ¼ÊÀý×Ó£º
+	 (MS-DOS)	  (Unix)
+	  :!dir		   :!ls		   -  ÓÃÓÚÏÔʾµ±Ç°Ä¿Â¼µÄÄÚÈÝ¡£
+	  :!del FILENAME   :!rm FILENAME   -  ÓÃÓÚɾ³ýÃûΪ FILENAME µÄÎļþ¡£
 
   2. :w FILENAME  ¿É½«µ±Ç° VIM ÖÐÕýÔڱ༭µÄÎļþ±£´æµ½ÃûΪ FILENAME µÄÎÄ
      ¼þÖС£
 
-  3. :#,#w FILENAME ¿É½«µ±Ç°±à¼­ÎļþµÚ # ÐÐÖÁµÚ # ÐеÄÄÚÈݱ£´æµ½Îļþ
+  3. v motion :w FILENAME ¿É½«µ±Ç°±à¼­ÎļþÖпÉÊÓģʽÏÂÑ¡ÖеÄÄÚÈݱ£´æµ½Îļþ
      FILENAME ÖС£
 
   4. :r FILENAME ¿ÉÌáÈ¡´ÅÅÌÎļþ FILENAME ²¢½«Æä²åÈëµ½µ±Ç°ÎļþµÄ¹â±êλÖÃ
      ºóÃæ¡£
 
-
-
-
-
+  5. :r !dir ¿ÉÒÔ¶ÁÈ¡ dir ÃüÁîµÄÊä³ö²¢½«Æä·ÅÖõ½µ±Ç°ÎļþµÄ¹â±êλÖúóÃæ¡£
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 µÚÁù½²µÚÒ»½Ú¡Ã´ò¿ªÀàÃüÁî
+			 µÚÁù½²µÚÒ»½Ú£º´ò¿ªÀàÃüÁî
 
 
 	 ** ÊäÈë o ½«ÔÚ¹â±êµÄÏ·½´ò¿ªÐµÄÒ»Ðв¢½øÈë²åÈëģʽ¡£**
 
   1. Ç뽫¹â±êÒƶ¯µ½±¾½ÚÖÐÏÂÃæ±ê¼ÇÓÐ ---> µÄÄÇÒ»ÐС£
 
-  2. ½Ó×ÅÊäÈëСдµÄ o ÔÚ¹â±ê *Ï·½* ´ò¿ªÐµÄÒ»Ðв¢½øÈë²åÈëģʽ¡£
+  2. ½Ó×ÅÊäÈëСдµÄ o ÔÚ¹â±ê *Ï·½* ´ò¿ªÐµÄÒ»ÐУ¬Õâ¸öÃüÁî»áʹÄú
+     ½øÈë²åÈëģʽ¡£
 
-  3. È»ºó¸´ÖƱê¼ÇÓÐ ---> µÄÐв¢°´ <ESC> ¼üÍ˳ö²åÈëģʽ¶ø½øÈëÕý³£Ä£Ê½¡£
+  3. È»ºóÊäÈëһЩÎÄ×Ö£¬Ö®ºó°´ <ESC> ¼üÍ˳ö²åÈëģʽ¶ø½øÈëÕý³£Ä£Ê½¡£
 
 ---> After typing  o  the cursor is placed on the open line in Insert mode.
 
   4. ΪÁËÔÚ¹â±ê *ÉÏ·½* ´ò¿ªÐµÄÒ»ÐУ¬Ö»ÐèÒªÊäÈë´óдµÄ O ¶ø²»ÊÇСдµÄ o
-     ¾Í¿ÉÒÔÁË¡£ÇëÔÚÏÂÐвâÊÔһϰɡ£µ±¹â±ê´¦ÔÚÔÚ¸ÃÐÐÉÏʱ£¬°´ Shift-O¿ÉÒÔ
-     ÔÚ¸ÃÐÐÉÏ·½Ð¿ªÒ»ÐС£
-
-Open up a line above this by typing Shift-O while the cursor is on this line.
+     ¾Í¿ÉÒÔÁË¡£ÇëÔÚÏÂÐвâÊÔһϰɡ£
 
+---> Open up a line above this by typing O while the cursor is on this line.
 
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			µÚÁù½²µÚ¶þ½Ú¡Ã¹â±êºó²åÈëÀàÃüÁî
+			µÚÁù½²µÚ¶þ½Ú£º¸½¼ÓÀàÃüÁî
 
 
 		     ** ÊäÈë a ½«¿ÉÔÚ¹â±êÖ®ºó²åÈëÎı¾¡£ **
 
-  1. ÇëÔÚÕý³£Ä£Ê½ÏÂͨ¹ýÊäÈë $ ½«¹â±êÒƶ¯µ½±¾½ÚÖÐÏÂÃæ±ê¼ÇÓÐ ---> µÄµÚÒ»ÐÐ
-     µÄĩβ¡£
+  1. ÇëÔÚÕý³£Ä£Ê½Ï½«¹â±êÒƶ¯µ½±¾½ÚÖÐÏÂÃæ±ê¼ÇÓÐ ---> µÄµÚÒ»ÐеÄÐÐÊס£
 
-  2. ½Ó×ÅÊäÈëСдµÄ a Ôò¿ÉÔÚ¹â±êÖ®ºó²åÈëÎı¾ÁË¡£´óдµÄ A Ôò¿ÉÒÔÖ±½ÓÔÚÐÐ
-     Ä©²åÈëÎı¾¡£
+  2. ½Ó×ÅÊäÈë e Ö±µ½¹â±êλÓÚ li µÄĩβ¡£
 
-Ìáʾ¡ÃÊäÈë´óд A µÄ²Ù×÷·½·¨¿ÉÒÔÔÚÐÐÄ©²åÈëÎı¾£¬±ÜÃâÁËÊäÈë i£¬¹â±ê¶¨Î»µ½
-      ×îºóÒ»¸ö×Ö·û£¬ÊäÈëµÄÎı¾£¬<ESC> »Ø¸´Õý³£Ä£Ê½£¬¼ýÍ·ÓÒ¼üÒƶ¯¹â±êÒÔ¼°
-      x ɾ³ýµ±Ç°¹â±êËùÔÚλÖÃ×Ö·ûµÈµÈÖî¶à·±ÔӵIJÙ×÷¡£
+  3. ÊäÈëСдµÄ a Ôò¿ÉÔÚ¹â±êÖ®ºó²åÈëÎı¾ÁË¡£
 
-  3. ²Ù×÷Ö®ºóµÚÒ»ÐоͿÉÒÔ²¹³äÍêÕûÁË¡£Çë×¢Òâ¹â±êºó²åÈëÎı¾Óë²åÈëģʽÊÇ»ù
-     ±¾ÍêÈ«Ò»Öµģ¬Ö»ÊÇÎı¾²åÈëµÄλÖö¨Î»ÉÔÓв»Í¬°ÕÁË¡£
+  4. ½«µ¥´Ê²¹³äÍêÕû£¬¾ÍÏñÏÂÒ»ÐÐÖеÄÄÇÑù¡£Ö®ºó°´ <ESC> ¼üÍ˳ö²åÈëģʽ»Øµ½
+     Õý³£Ä£Ê½¡£
 
----> This line will allow you to practice
----> This line will allow you to practice appending text to the end of a line.
+  5. ʹÓà e Òƶ¯¹â±êµ½ÏÂÒ»²½²»ÍêÕûµÄµ¥´Ê£¬Öظ´²½Öè3ºÍ²½Öè4¡£
 
+---> This li will allow you to pract appendi text to a line.
+---> This line will allow you to practice appending text to a line.
+
+Ìáʾ£ºa¡¢i ºÍ A ¶¼»á´øÄú½øÈë²åÈëģʽ£¬Î©Ò»µÄÇø±ðÔÚÓÚ×Ö·û²åÈëµÄλÖá£
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    µÚÁù½²µÚÈý½Ú¡ÃÁíÍâÒ»¸öÖû»ÀàÃüÁîµÄ°æ±¾
+		    µÚÁù½²µÚÈý½Ú£ºÁíÍâÒ»¸öÖû»ÀàÃüÁîµÄ°æ±¾
 
 
 		      ** ÊäÈë´óдµÄ R ¿ÉÁ¬ÐøÌæ»»¶à¸ö×Ö·û¡£**
 
-  1. Ç뽫¹â±êÒƶ¯µ½±¾½ÚÖÐÏÂÃæ±ê¼ÇÓÐ ---> µÄµÚÒ»ÐС£
+  1. Ç뽫¹â±êÒƶ¯µ½±¾½ÚÖÐÏÂÃæ±ê¼ÇÓÐ ---> µÄµÚÒ»ÐС£Òƶ¯¹â±êµ½µÚÒ»¸ö xxx µÄ
+     ÆðʼλÖá£
 
-  2. Òƶ¯¹â±êµ½µÚÒ»ÐÐÖв»Í¬ÓÚ±êÓÐ ---> µÄµÚ¶þÐеĵÚÒ»¸öµ¥´ÊµÄ¿ªÊ¼£¬¼´µ¥
-     ´Ê last ´¦¡£
-
-  3. È»ºóÊäÈë´óдµÄ R ¿ªÊ¼°ÑµÚÒ»ÐÐÖеIJ»Í¬ÓÚµÚ¶þÐеÄÊ£Óà×Ö·ûÖðÒ»ÊäÈ룬¾Í
+  2. È»ºóÊäÈë´óдµÄ R ¿ªÊ¼°ÑµÚÒ»ÐÐÖеIJ»Í¬ÓÚµÚ¶þÐеÄÊ£Óà×Ö·ûÖðÒ»ÊäÈ룬¾Í
      ¿ÉÒÔÈ«²¿Ìæ»»µôÔ­ÓеÄ×Ö·û¶øʹµÃµÚÒ»ÐÐÍêÈ«À×ͬµÚ¶þÐÐÁË¡£
 
----> To make the first line the same as the last on this page use the keys.
----> To make the first line the same as the second, type R and the new text.
-
-  4. Çë×¢Òâ¡ÃÈç¹ûÄú°´ <ESC> Í˳öÖû»Ä£Ê½»Ø¸´Õý³£Ä£Ê½£¬ÉÐδÌæ»»µÄÎı¾½«ÈÔ
-     È»±£³ÖÔ­×´¡£
-
+  3. ½Ó×Å°´ <ESC> ¼üÍ˳öÌ滻ģʽ»Øµ½Õý³£Ä£Ê½¡£Äú¿ÉÒÔ×¢Òâµ½ÉÐδÌæ»»µÄÎı¾
+     ÈÔÈ»±£³ÖÔ­×´¡£
 
+  4. Öظ´ÒÔÉϲ½Ö裬½«Ê£ÓàµÄ xxx Ò²Ìæ»»µô¡£
 
+---> Adding 123 to xxx gives you xxx.
+---> Adding 123 to 456 gives you 579.
 
+Ìáʾ£ºÌ滻ģʽÓë²åÈëģʽÏàËÆ£¬²»¹ýÿ¸öÊäÈëµÄ×Ö·û¶¼»áɾ³ýÒ»¸öÒÑÓеÄ×Ö·û¡£
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			    µÚÁù½²µÚËĽڡÃÉèÖÃÀàÃüÁîµÄÑ¡Ïî
+			  µÚÁù½²µÚËĽڣº¸´ÖÆÕ³ÌùÎı¾
+
+
+		 ** ʹÓòÙ×÷·û y ¸´ÖÆÎı¾£¬Ê¹Óà p Õ³ÌùÎı¾ **
+
+  1. ¶¨Î»µ½ÏÂÃæ±ê¼ÇÓÐ ---> µÄÒ»ÐУ¬½«¹â±êÒƶ¯µ½ "a)" Ö®ºó¡£
+
+  2. ½Ó×ÅʹÓà v ½øÈë¿ÉÊÓģʽ£¬Òƶ¯¹â±êµ½ "first" µÄÇ°Ãæ¡£
+
+  3. ÏÖÔÚÊäÈë y ÒÔ³é³ö(¸´ÖÆ)¸ßÁÁµÄÎı¾¡£
+
+  4. È»ºóÒƶ¯¹â±êµ½ÏÂÒ»ÐеÄĩβ£ºj$
+
+  5. ½Ó×ÅÊäÈë p ÒÔ·ÅÖÃ(Õ³Ìù)¸´ÖÆÁ˵ÄÎı¾¡£È»ºóÊäÈ룺a second <ESC>¡£
+
+  6. ʹÓÿÉÊÓģʽѡÖÐ " item."£¬Óà y ¸´ÖÆ£¬ÔÙÓà j$ ½«¹â±êÒƶ¯µ½ÏÂÒ»ÐÐĩ⣬
+     Óà p ½«Îı¾Õ³Ìùµ½ÄÇÀï¡£
+
+--->  a) this is the first item.
+      b)
+
+  Ìáʾ£ºÄú»¹¿ÉÒÔ°Ñ y µ±×÷²Ù×÷·ûÀ´Ê¹Óã»ÀýÈç yw ¿ÉÒÔÓÃÀ´¸´ÖÆÒ»¸öµ¥´Ê¡£
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			    µÚÁù½²µÚÎå½Ú£ºÉèÖÃÀàÃüÁîµÄÑ¡Ïî
 
 
 		  ** ÉèÖÿÉʹ²éÕÒ»òÕßÌæ»»¿ÉºöÂÔ´óСдµÄÑ¡Ïî **
 
+  1. Òª²éÕÒµ¥´Ê ignore ¿ÉÔÚÕý³£Ä£Ê½ÏÂÊäÈë /ignore <»Ø³µ>¡£
+     ÒªÖظ´²éÕҸôʣ¬¿ÉÒÔÖظ´°´ n ¼ü¡£
 
-  1. Òª²éÕÒµ¥´Ê ignore ¿ÉÔÚÕý³£Ä£Ê½ÏÂÊäÈë /ignore ¡£ÒªÖظ´²éÕҸôʣ¬¿ÉÒÔ
-     Öظ´°´ n ¼ü¡£
+  2. È»ºóÉèÖà ic Ñ¡Ïî(Ignore Case£¬ºöÂÔ´óСд)£¬ÇëÊäÈ룺 :set ic
 
-  2. È»ºóÉèÖà ic Ñ¡Ïî(ic¾ÍÊÇÓ¢ÎĺöÂÔ´óСдIgnore CaseµÄÊ××ÖĸËõд´Ê)£¬¼´
-     ÊäÈë¡Ã
-	:set ic
+  3. ÏÖÔÚ¿ÉÒÔͨ¹ý¼üÈë n ¼üÔٴβéÕÒµ¥´Ê ignore¡£×¢Òâµ½ Ignore ºÍ IGNORE ÏÖÔÚ
+     Ò²±»ÕÒµ½ÁË¡£
 
-  3. ÏÖÔÚ¿ÉÒÔͨ¹ý¼üÈë n ¼üÔٴβéÕÒµ¥´Ê ignore¡£Öظ´²éÕÒ¿ÉÒÔÖظ´¼üÈë n ¼ü¡£
+  4. È»ºóÉèÖà hlsearch ºÍ incsearch ÕâÁ½¸öÑ¡ÏÇëÊäÈ룺 :set hls is
 
-  4. È»ºóÉèÖà hlsearch ºÍ incsearch ÕâÁ½¸öÑ¡ÏÊäÈëÒÔÏÂÄÚÈÝ¡Ã
-     :set hls is
+  5. ÏÖÔÚ¿ÉÒÔÔÙ´ÎÊäÈë²éÕÒÃüÁ¿´¿´»áÓÐʲôЧ¹û£º /ignore <»Ø³µ>
 
-  5. ÏÖÔÚ¿ÉÒÔÔÙ´ÎÊäÈë²éÕÒÃüÁ¿´¿´»áÓÐʲôЧ¹û¡Ã
-     /ignore
+  6. Òª½ûÓúöÂÔ´óСд£¬ÇëÊäÈ룺 :set noic
 
+Ìáʾ£ºÒªÒƳýÆ¥ÅäÏîµÄ¸ßÁÁÏÔʾ£¬ÇëÊäÈ룺  :nohlsearch
+Ìáʾ£ºÈç¹ûÄúÏëÒª½öÔÚÒ»´Î²éÕÒʱºöÂÔ×Öĸ´óСд£¬Äú¿ÉÒÔʹÓà \c£º
+      /ignore\c <»Ø³µ>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			       µÚÁù½²Ð¡½á
 
-
-  1. ÊäÈëСдµÄ o ¿ÉÒÔÔÚ¹â±êÏ·½´ò¿ªÐµÄÒ»Ðв¢½«¹â±êÖÃÓÚпªµÄÐÐÊ×£¬½øÈë
-     ²åÈëģʽ¡£
-     ÊäÈë´óдµÄ O ¿ÉÒÔÔÚ¹â±êÉÏ·½´ò¿ªÐµÄÒ»Ðв¢½«¹â±êÖÃÓÚпªµÄÐÐÊ×£¬½øÈë
-     ²åÈëģʽ¡£
+  1. ÊäÈëСдµÄ o ¿ÉÒÔÔÚ¹â±êÏ·½´ò¿ªÐµÄÒ»Ðв¢½øÈë²åÈëģʽ¡£
+     ÊäÈë´óдµÄ O ¿ÉÒÔÔÚ¹â±êÉÏ·½´ò¿ªÐµÄÒ»ÐС£
 
   2. ÊäÈëСдµÄ a ¿ÉÒÔÔÚ¹â±êËùÔÚλÖÃÖ®ºó²åÈëÎı¾¡£
      ÊäÈë´óдµÄ A ¿ÉÒÔÔÚ¹â±êËùÔÚÐеÄÐÐÄ©Ö®ºó²åÈëÎı¾¡£
 
-  3. ÊäÈë´óдµÄ R ½«½øÈëÌ滻ģʽ£¬Ö±ÖÁ°´ <ESC> ¼üÍ˳öÌ滻ģʽ¶ø½øÈëÕý³£
-     ģʽ¡£
-
-  4. ÊäÈë :set xxx ¿ÉÒÔÉèÖà xxx Ñ¡Ïî¡£
-
-
-
-
+  3. e ÃüÁî¿ÉÒÔʹ¹â±êÒƶ¯µ½µ¥´Êĩβ¡£
 
+  4. ²Ù×÷·û y ¸´ÖÆÎı¾£¬p Õ³ÌùÏÈÇ°¸´ÖƵÄÎı¾¡£
 
+  5. ÊäÈë´óдµÄ R ½«½øÈëÌ滻ģʽ£¬Ö±ÖÁ°´ <ESC> ¼ü»Øµ½Õý³£Ä£Ê½¡£
 
+  6. ÊäÈë :set xxx ¿ÉÒÔÉèÖà xxx Ñ¡ÏһЩÓÐÓõÄÑ¡ÏîÈçÏ£º
+  	'ic' 'ignorecase'	²éÕÒʱºöÂÔ×Öĸ´óСд
+	'is' 'incsearch'	²éÕÒ¶ÌÓïʱÏÔʾ²¿·ÖÆ¥Åä
+	'hls' 'hlsearch'	¸ßÁÁÏÔʾËùÓеÄÆ¥Åä¶ÌÓï
+     Ñ¡ÏîÃû¿ÉÒÔÓÃÍêÕû°æ±¾£¬Ò²¿ÉÒÔÓÃËõÂÔ°æ±¾¡£
 
+  7. ÔÚÑ¡ÏîÇ°¼ÓÉÏ no ¿ÉÒԹرÕÑ¡Ï  :set noic
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       µÚÆß½²¡ÃÔÚÏß°ïÖúÃüÁî
+			  µÚÆß½²µÚÒ»½Ú£º»ñÈ¡°ïÖúÐÅÏ¢
+
 
 		      ** ʹÓÃÔÚÏß°ïÖúϵͳ **
 
   Vim ÓµÓÐÒ»¸öϸÖÂÈ«ÃæµÄÔÚÏß°ïÖúϵͳ¡£ÒªÆô¶¯¸Ã°ïÖúϵͳ£¬ÇëÑ¡ÔñÈçÏÂÈýÖÖ·½
-  ·¨Ö®Ò»¡Ã
+  ·¨Ö®Ò»£º
 	- °´Ï <HELP> ¼ü (Èç¹û¼üÅÌÉÏÓеĻ°)
 	- °´Ï <F1> ¼ü (Èç¹û¼üÅÌÉÏÓеĻ°)
 	- ÊäÈë	:help <»Ø³µ>
 
+  ÇëÔĶÁ°ïÖú´°¿ÚÖеÄÎÄ×ÖÒÔÁ˽â°ïÖúÊÇÈçºÎ¹¤×÷µÄ¡£
+  ÊäÈë CTRL-W CTRL-W   ¿ÉÒÔʹÄúÔÚ´°¿ÚÖ®¼äÌøת¡£
   ÊäÈë :q <»Ø³µ> ¿ÉÒԹرհïÖú´°¿Ú¡£
 
   Ìṩһ¸öÕýÈ·µÄ²ÎÊý¸ø":help"ÃüÁÄú¿ÉÒÔÕÒµ½¹ØÓÚ¸ÃÖ÷ÌâµÄ°ïÖú¡£ÇëÊÔÑéÒÔ
-  ϲÎÊý(¿É±ðÍüÁË°´»Ø³µ¼üŶ¡£:)¡Ã
+  ϲÎÊý(¿É±ðÍüÁË°´»Ø³µ¼üŶ)£º
 
-	  :help w <»Ø³µ>
-	  :help c_<T <»Ø³µ>
-	  :help insert-index <»Ø³µ>
-	  :help user-manual <»Ø³µ>
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       µÚ°Ë½²¡Ã´´½¨Ò»¸öÆô¶¯½Å±¾
-
-			  ** ÆôÓÃvimµÄ¹¦ÄÜ **
-
-  VimµÄ¹¦ÄÜÌØÐÔÒª±Èvi¶àµÃ¶à£¬µ«´ó²¿·Ö¹¦Äܶ¼Ã»ÓÐȱʡ¼¤»î¡£ÎªÁËÆô¶¯¸ü¶àµÄ
-  ¹¦ÄÜ£¬ÄúµÃ´´½¨Ò»¸övimrcÎļþ¡£
-
-  1. ¿ªÊ¼±à¼­vimrcÎļþ£¬ÕâÈ¡¾öÓÚÄúËùʹÓõIJÙ×÷ϵͳ¡Ã
-
-     :edit ~/.vimrc		ÕâÊÇUnixϵͳËùʹÓõÄÃüÁî
-     :edit $VIM/_vimrc		ÕâÊÇWindowsϵͳËùʹÓõÄÃüÁî
-
-  2. ½Ó×ŵ¼Èëvimrc·¶ÀýÎļþ¡Ã
-
-     :read $VIMRUNTIME/vimrc_example.vim
-
-  3. ±£´æÎļþ£¬ÃüÁîΪ¡Ã
-
-     :write
-
-  ÔÚÏ´ÎÄúÆô¶¯vimµÄʱºò£¬±à¼­Æ÷¾Í»áÓÐÁËÓï·¨¸ßÁÁµÄ¹¦ÄÜ¡£Äú¿ÉÒÔ¼ÌÐø°ÑÄúϲ
-  »¶µÄÆäËü¹¦ÄÜÉèÖÃÌí¼Óµ½Õâ¸övimrcÎļþÖС£
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  vim ½Ì³Ìµ½´Ë½áÊø¡£±¾½Ì³ÌÖ»ÊÇΪÁ˼òÃ÷µØ½éÉÜÒ»ÏÂvim±à¼­Æ÷£¬µ«ÒÑ×ãÒÔÈÃÄú
-  ºÜÈÝÒ×ѧ»áʹÓñ¾±à¼­Æ÷ÁË¡£ÎãÓ¹ÖÊÒÉ£¬vim»¹ÓкܶàºÜ¶àµÄÃüÁ±¾½Ì³ÌËù½é
-  ÉܵĻ¹²îµÃÔ¶ÖøÄØ¡£ËùÒÔÄúÒª¾«Í¨µÄ»°£¬»¹Íû¼ÌÐøŬÁ¦Å¶¡£ÏÂÒ»²½Äú¿ÉÒÔÔĶÁ
-  vimÊֲᣬʹÓõÄÃüÁîÊÇ¡Ã
+	:help w
+	:help c_CTRL-D
+	:help insert-index
 	:help user-manual
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			  µÚÆß½²µÚ¶þ½Ú£º´´½¨Æô¶¯½Å±¾
 
-  ΪÁ˸ü½øÒ»²½µÄ²Î¿¼ºÍѧϰ£¬ÒÔÏÂÕâ±¾ÊéÖµµÃÍƼö¡Ã
 
-	Vim - Vi Improved - ×÷Õß¡ÃSteve Oualline
-	³ö°æÉç¡ÃNew Riders
+			  ** ÆôÓà Vim µÄÌØÐÔ **
 
-  ÕâÊǵÚÒ»±¾ÍêÈ«½²½âvimµÄÊé¼®¡£¶ÔÓÚ³õѧÕßÌرðÓÐÓá£ÆäÖл¹°üº¬ÓдóÁ¿ÊµÀý
-  ºÍͼʾ¡£ÓûÖªÏêÇ飬Çë·ÃÎÊ http://iccf-holland.org/click5.html
+  Vim µÄ¹¦ÄÜÌØÐÔÒª±È Vi ¶àµÃ¶à£¬µ«ÆäÖд󲿷ֶ¼Ã»ÓÐȱʡÆôÓá£ÎªÁËʹÓøü¶àµÄ
+  ÌØÐÔ£¬ÄúµÃ´´½¨Ò»¸ö vimrc Îļþ¡£
 
-  ÒÔÏÂÕâ±¾Êé±È½ÏÀÏÁ˶øÇÒÄÚÈÝÖ÷ÒªÊÇvi¶ø²»ÊÇvim£¬µ«ÊÇÒ²ÖµµÃÍƼö¡Ã
+  1. ¿ªÊ¼±à¼­ vimrc Îļþ£¬¾ßÌåÃüÁîÈ¡¾öÓÚÄúËùʹÓõIJÙ×÷ϵͳ£º
+        :edit ~/.vimrc		ÕâÊÇ Unix ϵͳËùʹÓõÄÃüÁî
+        :edit $VIM/_vimrc	ÕâÊÇ MS-Windows ϵͳËùʹÓõÄÃüÁî
 
-	Learning the Vi Editor - ×÷Õß¡ÃLinda Lamb
-	³ö°æÉç¡ÃO'Reilly & Associates Inc.
+  2. ½Ó×ŶÁÈ¡ vimrc ʾÀýÎļþµÄÄÚÈÝ£º
+        :r $VIMRUNTIME/vimrc_example.vim
 
-  ÕâÊÇÒ»±¾²»´íµÄÊ飬ͨ¹ýËüÄú¼¸ºõÄܹ»Á˽⵽ȫ²¿viÄܹ»×öµ½µÄÊÂÇé¡£´ËÊéµÄµÚ
-  Áù¸ö°æ±¾Ò²°üº¬ÁËһЩ¹ØÓÚvimµÄÐÅÏ¢¡£
+  3. ±£´æÎļþ£¬ÃüÁîΪ£º
+        :write
 
-  ±¾½Ì³ÌÊÇÓÉÀ´×ÔCalorado School of MineseµÄMichael C. Pierce¡¢Robert K.
-  Ware Ëù±àдµÄ£¬ÆäÖÐÀ´×ÔColorado State UniversityµÄCharles SmithÌṩÁË
-  ºÜ¶à´´Òâ¡£±àÕßͨÐŵØÖ·ÊÇ¡Ã
+  Ï´ÎÄúÆô¶¯ Vim ʱ£¬±à¼­Æ÷¾Í»áÓÐÁËÓï·¨¸ßÁÁµÄ¹¦ÄÜ¡£
+  Äú¿ÉÒÔ°ÑÄúϲ»¶µÄ¸÷ÖÖÉèÖÃÌí¼Óµ½Õâ¸ö vimrc ÎļþÖС£
+  ÒªÁ˽â¸ü¶àÐÅÏ¢ÇëÊäÈë :help vimrc-intro
 
-	bware@mines.colorado.edu
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			    µÚÆß½²µÚÈý½Ú£º²¹È«¹¦ÄÜ
 
-  ±¾½Ì³ÌÒÑÓÉBram MoolenaarרΪvim½øÐÐÐÞ¶©¡£
+
+	      ** ʹÓà CTRL-D ºÍ <TAB> ¿ÉÒÔ½øÐÐÃüÁîÐв¹È« **
+
+  1. ÇëÈ·±£ Vim ²»ÊÇÔÚÒÔ¼æÈÝģʽÔËÐУº :set nocp
+
+  2. ²é¿´Ò»Ïµ±Ç°Ä¿Â¼ÏÂÒѾ­´æÔÚÄÄЩÎļþ£¬ÊäÈ룺 :!ls   »òÕß  :!dir
+
+  3. ÏÖÔÚÊäÈëÒ»¸öĿ¼µÄÆðʼ²¿·Ö£¬ÀýÈçÊäÈ룺 :e
+
+  4. ½Ó×Å°´ CTRL-D ¼ü£¬Vim »áÏÔʾÒÔ e ¿ªÊ¼µÄÃüÁîµÄÁÐ±í¡£
+
+  5. È»ºó°´ <TAB> ¼ü£¬Vim »á²¹È«ÃüÁîΪ :edit ¡£
+
+  6. ÏÖÔÚÌí¼ÓÒ»¸ö¿Õ¸ñ£¬ÒÔ¼°Ò»¸öÒÑÓÐÎļþµÄÎļþÃûµÄÆðʼ²¿·Ö£¬ÀýÈ磺 :edit FIL
+
+  7. ½Ó×Å°´ <TAB> ¼ü£¬Vim »á²¹È«ÎļþÃû(Èç¹ûËüÊÇΩһƥÅäµÄ)¡£
+
+Ìáʾ£º²¹È«¶ÔÓÚÐí¶àÃüÁÓÐЧ¡£ÄúÖ»Ðè³¢ÊÔ°´ CTRL-D ºÍ <TAB>¡£
+      Ëü¶ÔÓÚ :help ÃüÁî·Ç³£ÓÐÓá£
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+				  µÚÆß½²Ð¡½á
+
+
+  1. ÊäÈë :help »òÕß°´ <F1> ¼ü»ò <Help> ¼ü¿ÉÒÔ´ò¿ª°ïÖú´°¿Ú¡£
+
+  2. ÊäÈë :help cmd ¿ÉÒÔÕÒµ½¹ØÓÚ cmd ÃüÁîµÄ°ïÖú¡£
+
+  3. ÊäÈë CTRL-W CTRL-W  ¿ÉÒÔʹÄúÔÚ´°¿ÚÖ®¼äÌøת¡£
+
+  4. ÊäÈë :q ÒԹرհïÖú´°¿Ú
+
+  5. Äú¿ÉÒÔ´´½¨Ò»¸ö vimrc Æô¶¯½Å±¾ÎļþÓÃÀ´±£´æÄúÆ«ºÃµÄÉèÖá£
+
+  6. µ±ÊäÈë : ÃüÁîʱ£¬°´ CTRL-D ¿ÉÒԲ鿴¿ÉÄܵIJ¹È«½á¹û¡£
+     °´ <TAB> ¿ÉÒÔʹÓÃÒ»¸ö²¹È«¡£
 
 
 
-  ÒëÖÆÕ߸½ÑÔ¡Ã
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  vim ½Ì³Ìµ½´Ë¾Í½áÊøÁË¡£±¾½Ì³ÌÖ»ÊÇΪÁ˼òÃ÷µØ½éÉÜһϠVim ±à¼­Æ÷£¬µ«ÒÑ×ãÒÔÈÃÄú
+  ºÜÈÝÒ×ʹÓÃÕâ¸ö±à¼­Æ÷ÁË¡£ÎãÓ¹ÖÊÒÉ£¬vim»¹ÓкܶàºÜ¶àµÄÃüÁ±¾½Ì³ÌËù½é
+  ÉܵľàÀëÍêÕûµÄ²îµÃºÜÔ¶¡£ËùÒÔÄúÒª¾«Í¨µÄ»°£¬»¹Íû¼ÌÐøŬÁ¦Å¶¡£ÏÂÒ»²½Äú¿ÉÒÔÔĶÁ
+  Vim µÄÓû§ÊֲᣬʹÓõÄÃüÁîÊÇ£º :help user-manual
+
+  ÏÂÃæÕâ±¾ÊéÖµµÃÍƼöÓÃÓÚ¸ü½øÒ»²½µÄÔĶÁºÍѧϰ£º
+	Vim - Vi Improved - ×÷ÕߣºSteve Oualline
+	³ö°æÉ磺New Riders
+  ÕâÊǵÚÒ»±¾ÍêÈ«½²½â Vim µÄÊé¼®¡£Ëü¶ÔÓÚ³õѧÕßÌرðÓÐÓá£ÆäÖаüº¬ÓдóÁ¿ÊµÀý
+  ºÍͼʾ¡£
+  ÓûÖªÏêÇ飬Çë·ÃÎÊ http://iccf-holland.org/click5.html
+
+  ÒÔÏÂÕâ±¾Êé±È½ÏÀÏÁ˶øÇÒÄÚÈݸü¶àÊǹØÓÚ Vi ¶ø·Ç Vim£¬µ«ÊÇÒ²ÖµµÃÍƼö£º
+	Learning the Vi Editor - ×÷ÕߣºLinda Lamb
+	³ö°æÉ磺O'Reilly & Associates Inc.
+  ÕâÊÇÒ»±¾²»´íµÄÊ飬ͨ¹ýËüÄú¼¸ºõÄܹ»Á˽⵽ÈκÎÄúÏëҪʹÓà Vi ×öµÄÊÂÇé¡£
+  ´ËÊéµÄµÚÁù¸ö°æ±¾Ò²°üº¬ÁËһЩ¹ØÓÚ Vim µÄÐÅÏ¢¡£
+
+  ±¾½Ì³ÌÊÇÓÉÀ´×Ô Calorado School of Mines µÄ Michael C. Pierce ºÍ
+  Robert K. Ware Ëù±àдµÄ£¬ÆäÖкܶഴÒâÓÉÀ´×Ô Colorado State University µÄ
+  Charles Smith Ìṩ¡£±àÕߵĵç×ÓÓÊÏäÊÇ£ºbware@mines.colorado.edu
+
+  ±¾½Ì³ÌÒÑÓÉ Bram Moolenaar רΪ Vim ½øÐÐÐÞ¶©¡£
+
+  ÒëÖÆÕ߸½ÑÔ£º
   ===========
       ¼òÌåÖÐÎĽ̷̳­Òë°æÖ®ÒëÖÆÕßΪÁº²ýÌ© <beos@turbolinux.com.cn>£¬»¹ÓÐ
-      ÁíÍâÒ»¸öÁªÏµµØÖ·¡Ãlinuxrat@gnuchina.org¡£
+      ÁíÍâÒ»¸öÁªÏµµØÖ·£ºlinuxrat@gnuchina.org¡£
 
       ·±ÌåÖÐÎĽ̳ÌÊÇ´Ó¼òÌåÖÐÎĽ̷̳­Òë°æʹÓà Debian GNU/Linux ÖÐÎÄÏîĿС
       ×éµÄÓÚ¹ã»ÔÏÈÉú±àдµÄÖÐÎĺº×ÖתÂëÆ÷  autoconvert ת»»¶ø³ÉµÄ£¬²¢¶Ôת
       »»µÄ½á¹û×öÁËһЩϸ½ÚµÄ¸Ä¶¯¡£
 
-  ±ä¸ü¼Ç¼¡Ã
+  ±ä¸ü¼Ç¼£º
   =========
+      2012Äê10ÔÂ01ÈÕ ÕÔÌÎ <alick9188@gmail.com>
+      ½« vimtutor ÖÐÒë°æ´Ó 1.5 Éý¼¶µ½ 1.7¡£
+
       2002Äê08ÔÂ30ÈÕ Áº²ýÌ© <beos@turbolinux.com.cn>
       ¸Ðл RMS@SMTH µÄÖ¸Õý£¬½«¶à´¦´íÎóÐÞÕý¡£
 
diff --git a/runtime/tutor/tutor.zh.utf-8 b/runtime/tutor/tutor.zh.utf-8
deleted file mode 100644
index 21d702051d..0000000000
--- a/runtime/tutor/tutor.zh.utf-8
+++ /dev/null
@@ -1,852 +0,0 @@
-===============================================================================
-=      歡     迎     閱     讀   《 V I M  教  程 》   ──     版本 1.5      =
-===============================================================================
-     vim 是一個具有很多命令的功能�常強大的編輯器。�于篇幅，在本教程當中
-     �就詳細介紹了。本教程的設計目標是講述一些必�的基本命令，而掌�好這
-     些命令，您就能夠很容易將vim當作一個通用的�能編輯器來使用了。
-
-     完�本教程的內容大約需�25-30分�，�決于您訓練的時間。
-
-     �一節的命令�作將會更改本文。推薦您復制本文的一個副本，然後在副本上
-     進行訓練(如果您是通�"vimtutor"來啟動教程的，那麼本文就已經是副本了)。
-
-     切記一點︰本教程的設計�路是在使用中進行學習的。也就是說，您需�通�
-     執行命令來學習它們本身的正確用法。如果您�是閱讀而��作，那麼您�能
-     會很快�忘這些命令的�
-
-     好了，�在請確定您的Shift-Lock(大�寫鎖定�)還沒有按下，然後按�盤上
-     的字�� j 足夠多的次數來移動光標，直到第一節的內容能夠完全充滿�幕。
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			第一講第一節︰移動光標
-
-
-   ※※ �移動光標，請�照說明分別按下 h�j�k�l �。 ※※
-
-	     ^
-	     k		    �示︰ h 的��于左邊，�次按下就會�左移動。
-       < h	 l >		   l 的��于�邊，�次按下就會��移動。
-	     j			   j �看起來很象一支尖端方��下的箭頭。
-	     v
-
-  1. 請隨�在�幕內移動光標，直至您覺得舒�為止。
-
-  2. 按下下行�(j)，直到出�光標�復下行。
-
----> �在您應該已經學會如何移動到下一講�。
-
-  3. �在請使用下行�，將光標移動到第二講。
-
-�示︰如果您�敢確定您所按下的字�，請按下<ESC>�回到正常(Normal)模�。
-      然後�次從�盤輸入您想�的命令。
-
-�示︰光標�應當也能正常工作的。但是使用hjkl�，在習慣之後您就能夠快速
-      地在�幕內四處移動光標了。
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			第一講第二節︰VIM的進入和退出
-
-
-  !! 特別�示︰敬請閱讀完整本一節的內容，然後�能執行以下所講解的命令。
-
-  1. 請按<ESC>�(這是為了確�您處在正常模�)。
-
-  2. 然後輸入︰			:q! <回車>
-
----> 這種方�的退出編輯器絕�會�存您進入編輯器以來所�的改動。
-     如果您想�存更改�退出，請輸入︰
-				:wq  <回車>
-
-  3. 如果您看到了命令行�示符，請輸入能夠帶您回到本教程的命令，那就是︰
-
-		vimtutor <回車>
-
-     通常情�下您也�以用這種方�︰
-
-		vim tutor <回車>
-
----> 這裡的 'vim' 表示進入vim編輯器，而 'tutor'則是您準備�編輯的文件。
-
-  4. 如果您自信已經牢牢記�了這些步驟的話，請從步驟1執行到步驟3退出，然
-     後�次進入編輯器。接著將光標移動到第一講第三節來繼續我們的教程講解。
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			第一講第三節︰文本編輯之刪除
-
-
-   ** 在正常(Normal)模�下，�以按下 x �來刪除光標所在�置的字符。**
-
-  1. 請將光標移動到本節中下�標記有 ---> 的那一行。
-
-  2. 為了修正輸入錯誤，請將光標移至準備刪除的字符的�置處。
-
-  3. 然後按下 x �將錯誤字符刪除掉。
-
-  4. �復步驟2到步驟4，直到��修正為止。
-
----> The ccow jumpedd ovverr thhe mooon.
-
-  5. 好了，該行已經修正了，下一節內容是第一講第四節。
-
-特別�示︰在您�覽本教程時，��強行記憶。記�一點︰在使用中學習。
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     第一講第四節︰文本編輯之�入
-
-
-	 ** 在正常模�下，�以按下 i �來�入文本。**
-
-  1. 請將光標移動到本節中下�標記有 ---> 的第一行。
-
-  2. 為了使得第一行內容雷�于第二行，請將光標移至文本第一個字符準備�入
-     的�置。
-
-  3. 然後按下 i �，接著輸入必�的文本字符。
-
-  4. 所有文本都修正完畢，請按下 <ESC> �返回正常模�。
-     �復步驟2至步驟4以便修正��。
-
----> There is text misng this .
----> There is some text missing from this line.
-
-  5. 如果您�文本�入�作已經很滿�，請接著閱讀下�的��。
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       第一講��
-
-
-  1. 光標在�幕文本中的移動既�以用箭頭�，也�以使用 hjkl 字��。
-	 h (左移)	j (下行)       k (上行)	    l (�移)
-
-  2. 欲進入vim編輯器(從命令行�示符)，請輸入︰vim 文件� <回車>
-
-  3. 欲退出vim編輯器，請輸入以下命令放棄所有修改︰
-
-	<ESC>   :q!	 <回車>
-
-     或者輸入以下命令�存所有修改︰
-
-	<ESC>   :wq	 <回車>
-
-  4. 在正常模�下刪除光標所在�置的字符，請按︰ x
-
-  5. 在正常模�下�在光標所在�置開始�入文本，請按︰
-
-	 i     輸入必�文本	<ESC>
-
-特別�示︰按下 <ESC> �會帶您回到正常模�或者�消一個�期望或者部分完�
-的命令。
-
-好了，第一講到此��。下�接下來繼續第二講的內容。
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			第二講第一節︰刪除類命令
-
-
-	    ** 輸入 dw �以從光標處刪除至一個單字/單詞的末尾。**
-
-  1. 請按下 <ESC> �確�您處于正常模�。
-
-  2. 請將光標移動到本節中下�標記有 ---> 的那一行。
-
-  3. 請將光標移至準備�刪除的單詞的開始。
-
-  4. 接著輸入 dw 刪除掉該單詞。
-
-  特別�示︰您所輸入的 dw 會在您輸入的�時出�在�幕的最後一行。如果您輸
-  入有誤，請按下 <ESC> ��消，然後�新�來。
-
----> There are a some words fun that don't belong paper in this sentence.
-
-  5. �復步驟3至步驟4，直至��修正完畢。接著繼續第二講第二節內容。
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      第二講第二節︰其他刪除類命令
-
-
-		   ** 輸入 d$ 從當�光標刪除到行末。**
-
-  1. 請按下 <ESC> �確�您處于正常模�。
-
-  2. 請將光標移動到本節中下�標記有 ---> 的那一行。
-
-  3. 請將光標移動到該行的尾部(也就是在第一個點號‘.’後�)。
-
-  4. 然後輸入 d$ 從光標處刪至當�行尾部。
-
----> Somebody typed the end of this line twice. end of this line twice.
-
-
-  5. 請繼續學習第二講第三節就知�是怎麼回事了。
-
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     第二講第三節︰關于命令和�象
-
-
-  刪除命令 d 的格�如下︰
-
-	 [number]   d	object	    或者     d	 [number]   object
-
-  其�如下︰
-    number - 代表執行命令的次數(��項，缺�設置為 1 )。
-    d - 代表刪除。
-    object - 代表命令所��作的�象(下�有相關介紹)。
-
-  一個簡短的�象列表︰
-    w - 從當�光標當��置直到單字/單詞末尾，包括空格。
-    e - 從當�光標當��置直到單字/單詞末尾，但是 *�* 包括空格。
-    $ - 從當�光標當��置直到當�行末。
-
-特別�示︰
-    �于勇于探索者，請在正常模�下�僅按代表相應�象的�而�使用命令，則
-    將看到光標的移動正如上�的�象列表所代表的一樣。
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		第二講第四節︰�象命令的特殊情�
-
-
-	       ** 輸入 dd �以刪除整一個當�行。 **
-
-  鑒于整行刪除的高頻度，VIM 的設計者決定�簡化整行刪除，僅需�在�一行上
-  擊打兩次 d 就�以刪除掉光標所在的整行了。
-
-  1. 請將光標移動到本節中下�的短�段�中的第二行。
-  2. 輸入 dd 刪除該行。
-  3. 然後移動到第四行。
-  4. 接著輸入 2dd (還記得��講�的 number-command-object 嗎？) 刪除兩行。
-
-      1)  Roses are red,
-      2)  Mud is fun,
-      3)  Violets are blue,
-      4)  I have a car,
-      5)  Clocks tell time,
-      6)  Sugar is sweet
-      7)  And so are you.
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 第二講第五節︰撤消類命令
-
-
-	 ** 輸入 u 來撤消最後執行的命令，輸入 U 來修正整行。**
-
-  1. 請將光標移動到本節中下�標記有 ---> 的那一行，並將其置于第一個錯誤
-     處。
-  2. 輸入 x 刪除第一個�想�留的字�。
-  3. 然後輸入 u 撤消最後執行的(一次)命令。
-  4. 這次�使用 x 修正本行的所有錯誤。
-  5. �在輸入一個大寫的 U ，�復到該行的原始狀態。
-  6. 接著多次輸入 u 以撤消 U 以�更�的命令。
-  7. 然後多次輸入 CTRL-R (先按下 CTRL ��放開，接著輸入 R �) ，這樣就
-     �以執行�復命令，也就是撤消掉撤消命令。
-
----> Fiix the errors oon thhis line and reeplace them witth undo.
-
-  8. 這些都是�常有用的命令。下�是第二講的��了。
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       第二講��
-
-
-  1. 欲從當�光標刪除至單字/單詞末尾，請輸入︰dw
-
-  2. 欲從當�光標刪除至當�行末尾，請輸入︰d$
-
-  3. 欲刪除整行，請輸入︰dd
-
-  4. 在正常模�下一個命令的格�是︰
-
-       [number]   command   object     或者     command	[number]   object
-     其�是︰
-       number - 代表的是命令執行的次數
-       command - 代表��的事情，比如 d 代表刪除
-       object - 代表��作的�象，比如 w 代表單字/單詞，$ 代表到行末等等。
-		$ (to the end of line), etc.
-
-  5. 欲撤消以�的�作，請輸入︰u (�寫的u)
-     欲撤消在一行中所�的改動，請輸入︰U (大寫的U)
-     欲撤消以�的撤消命令，�復以�的�作�果，請輸入︰CTRL-R
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 第三講第一節︰置入類命令
-
-
-	       ** 輸入 p 將最後一次刪除的內容置入光標之後 **
-
-  1. 請將光標移動到本節中下�示范段�的首行。
-
-  2. 輸入 dd 將該行刪除，這樣會將該行�存到vim的緩沖�中。
-
-  3. 接著將光標移動到準備置入的�置的上方。記�︰是上方哦。
-
-  4. 然後在正常模�下(<ESC>�進入)，輸入 p 將該行粘貼置入。
-
-  5. �復步驟2至步驟4，將所有的行��放置到正確的�置上。
-
-     d) Can you learn too?
-     b) Violets are blue,
-     c) Intelligence is learned,
-     a) Roses are red,
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       第三講第二節︰替�類命令
-
-
-	  ** 輸入 r 和一個字符替�光標所在�置的字符。**
-
-  1. 請將光標移動到本節中下�標記有 ---> 的第一行。
-
-  2. 請移動光標到第一個錯誤的�當�置。
-
-  3. 接著輸入 r ，這樣就能將錯誤替�掉了。
-
-  4. �復步驟2和步驟3，直到第一行已經修改完畢。
-
---->  Whan this lime was tuoed in, someone presswd some wrojg keys!
---->  When this line was typed in, someone pressed some wrong keys!
-
-  5. 然後我們繼續學校第三講第三節。
-
-特別�示︰切記您�在使用中學習，而�是在記憶中學習。
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			第三講第三節︰更改類命令
-
-
-	   ** �改變一個單字/單詞的部分或者全部，請輸入 cw **
-
-  1. 請將光標移動到本節中下�標記有 ---> 的第一行。
-
-  2. 接著把光標放在單詞 lubw 的字� u 的�置那裡。
-
-  3. 然後輸入 cw 就�以修正該單詞了(在本例這裡是輸入 ine 。)
-
-  4. 最後按 <ESC> �，然後光標定�到下一個錯誤第一個準備更改的字�處。
-
-  5. �復步驟3和步驟4，直到第一個��完全雷�第二個��。
-
----> This lubw has a few wptfd that mrrf changing usf the change command.
----> This line has a few words that need changing using the change command.
-
-�示︰請注� cw 命令�僅僅是替�了一個單詞，也讓您進入文本�入狀態了。
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       第三講第四節︰使用c指令的其他更改類命令
-
-
-	     ** 更改類指令�以使用�刪除類命令所使用的�象�數。**
-
-  1. 更改類指令的工作方�跟刪除類命令是一致的。�作格�是︰
-
-       [number]   c   object	   或者	    c	[number]   object
-
-  2. �象�數也是一樣的，比如 w 代表單字/單詞，$代表行末等等。
-
-  3. 請將光標移動到本節中下�標記有 ---> 的第一行。
-
-  4. 接著將光標移動到第一個錯誤處。
-
-  5. 然後輸入 c$ 使得該行剩下的部分更正得�第二行一樣。最後按 <ESC> �。
-
----> The end of this line needs some help to make it like the second.
----> The end of this line needs to be corrected using the  c$  command.
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       第三講��
-
-
-  1. ��新置入已經刪除的文本內容，請輸入�寫字� p。該�作�以將已刪除
-     的文本內容置于光標之後。如果最後一次刪除的是一個整行，那麼該行將置
-     于當�光標所在行的下一行。
-
-  2. �替�光標所在�置的字符，請輸入�寫的 r 和�替�掉原�置字符的新字
-     符��。
-
-  3. 更改類命令�許您改變指定的�象，從當�光標所在�置直到�象的末尾。
-     比如輸入 cw �以替�當�光標到單詞的末尾的內容；輸入 c$ �以替�當
-     �光標到行末的內容。
-
-  4. 更改類命令的格�是︰
-
-	 [number]   c	object	      或者	c   [number]   object
-
-下�我們繼續學習下一講。
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     第四講第一節︰定��文件狀態
-
-
-  ** 輸入 CTRL-g 顯示當�編輯文件中當�光標所在行�置以�文件狀態信�。
-     輸入 SHIFT-G 則直接跳轉到文件中的�一指定行。**
-
-  �示︰切記�先通讀本節內容，之後��以執行以下步驟!!!
-
-  1. 按下 CTRL ��放開然後按 g �。然後就會看到��最底部出�一個狀態信
-     �行，顯示的內容是當�編輯的文件�和文件的總行數。請記�步驟3的行號。
-
-  2. 按下 SHIFT-G ��以使得當�光標直接跳轉到文件最後一行。
-
-  3. 輸入您曾�留的行號，然後按下 SHIFT-G。這樣就�以返回到您第一次按下
-     CTRL-g 時所在的行好了。注�︰輸入行號時，行號是�會在�幕上顯示出來
-     的。
-
-  4. 如果願�，您�以繼續執行步驟1至步驟三。
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			第四講第二節︰�索類命令
-
-
-     ** 輸入 / 以�尾隨的字符串�以用以在當�文件中查找該字符串。**
-
-  1. 在正常模�下輸入 / 字符。您此時會注�到該字符和光標都會出�在�幕底
-     部，這跟 : 命令是一樣的。
-
-  2. 接著輸入 errroor <回車>。那個errroor就是您�查找的字符串。
-
-  3. �查找�上一次的字符串，�需�按 n �。��相�方�查找�上一次的字
-     符串，請輸入 Shift-N ��。
-
-  4. 如果您想逆�查找字符串，請使用 ? 代替 / 進行。
-
----> When the search reaches the end of the file it will continue at the start.
-
-  "errroor" is not the way to spell error;  errroor is an error.
-
-  �示︰如果查找已經到�文件末尾，查找會自動從文件頭部繼續查找。
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		   第四講第三節︰��括號的查找
-
-
-	      ** 按 % �以查找��的括號 )�]�}。**
-
-  1. 把光標放在本節下�標記有 --> 那一行中的任何一個 (�[ 或 { 處。
-
-  2. 接著按 % 字符。
-
-  3. 此時光標的�置應當是在��的括號處。
-
-  4. �次按 % 就�以跳回��的第一個括號處。
-
----> This ( is a test line with ('s, ['s ] and {'s } in it. ))
-
-�示︰在程�調試時，這個功能用來查找���的括號是很有用的。
-
-
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      第四講第四節︰修正錯誤的方法之一
-
-
-		** 輸入 :s/old/new/g �以替� old 為 new。**
-
-  1. 請將光標移動到本節中下�標記有 ---> 的那一行。
-
-  2. 輸入 :s/thee/the <回車> 。請注�該命令�改變光標所在行的第一個匹�
-     串。
-
-  3. 輸入 :s/thee/the/g	則是替�全行的匹�串。
-
----> the best time to see thee flowers is in thee spring.
-
-  4. �替�兩行之間出�的�個匹�串，請輸入 :#,#s/old/new/g (#,#代表的是
-     兩行的行號)。輸入 :%s/old/new/g 則是替�整個文件中的�個匹�串。
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       第四講��
-
-
-  1. Ctrl-g 用于顯示當�光標所在�置和文件狀態信�。Shift-G 用于將光標跳
-     轉至文件最後一行。先敲入一個行號然後按 Shift-G 則是將光標移動至該行
-     號代表的行。
-
-  2. 輸入 / 然後緊隨一個字符串是則是在當�所編輯的文檔中�後查找該字符串。
-     輸入�號 ? 然後緊隨一個字符串是則是在當�所編輯的文檔中��查找該字
-     符串。完�一次查找之後按 n �則是�復上一次的命令，�在�一方�上查
-     找下一個字符串所在；或者按 Shift-N �相�方�查找下該字符串所在。
-
-  3. 如果光標當��置是括號(�)�[�]�{�}，按 % �以將光標移動到��的
-     括號上。
-
-  4. 在一行內替�頭一個字符串 old 為新的字符串 new，請輸入  :s/old/new
-     在一行內替�所有的字符串 old 為新的字符串 new，請輸入  :s/old/new/g
-     在兩行內替�所有的字符串 old 為新的字符串 new，請輸入  :#,#s/old/new/g
-     在文件內替�所有的字符串 old 為新的字符串 new，請輸入  :%s/old/new/g
-     進行全文替�時詢�用戶確��個替�需添加 c �項，請輸入 :%s/old/new/gc
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		第五講第一節︰在 VIM 內執行外部命令的方法
-
-
-	   ** 輸入 :! 然後緊隨著輸入一個外部命令�以執行該外部命令。**
-
-  1. 按下我們所熟悉的 : 命令設置光標到�幕底部。這樣就�以讓您輸入命令了。
-
-  2. 接著輸入感嘆號 ! 這個字符，這樣就�許您執行外部的 shell 命令了。
-
-  3. 我們以 ls 命令為例。輸入 !ls <回車> 。該命令就會列舉出您當�目錄的
-     內容，就如�您在命令行�示符下輸入 ls 命令的�果一樣。如果 !ls 沒起
-     作用，您�以試試 :!dir 看看。
-
----> �示︰ 所有的外部命令都�以以這種方�執行。
-
----> �示︰ 所有的 : 命令都必須以 <回車> 告終。
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      第五講第二節︰關于�存文件的更多信�
-
-
-	     ** �將�文件的改動�存到文件中，請輸入 :w FILENAME **
-
-  1. 輸入 :!dir 或者 :!ls �知當�目錄的內容。您應當已知�最後還得敲
-     <回車> �。
-
-  2. �擇一個尚未存在文件�，比如 TEST 。
-
-  3. 接著輸入 :w TEST  (此處 TEST 是您所�擇的文件�。)
-
-  4. 該命令會以 TEST 為文件��存整個文件 (VIM 教程)。為了確�正確�存，
-     請�次輸入 :!dir 查看您的目錄列表內容。
-
----> 請注�︰如果您退出 VIM 然後在以文件� TEST 為�數進入，那麼該文件內
-     容應該�您�存時的文件內容是完全一樣的。
-
-  5. �在您�以通�輸入 :!rm TEST 來刪除 TEST 文件了。
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    第五講第三節︰一個具有�擇性的�存命令
-
-
-		** ��存文件的部分內容，請輸入 :#,# w FILENAME **
-
-  1. �來執行一次 :!dir 或者 :!ls �知當�目錄的內容，然後�擇一個��的
-     ���的文件�，比如 TEST 。
-
-  2. 接著將光標移動至本�的最頂端，然後按 CTRL-g 找到該行的行號。別忘了
-     行號哦。
-
-  3. 接著把光標移動至本�的最底端，�按一次 CTRL-g 。也別忘了這個行好哦。
-
-  4. 為了��存文章的�個部分，請輸入 :#,# w TEST 。這裡的 #,# 就是上�
-     �求您記�的行號(頂端行號,底端行號)，而 TEST 就是�定的文件�。
-
-  5. 最後，用 :!dir 確�文件是�正確�存。但是這次先別刪除掉。
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		   第五講第四節︰��和�並文件
-
-
-       ** ��當�文件中�入�外的文件的內容，請輸入 :r FILENAME **
-
-  1. 請�入 :!dir 確�您��創建的 TEST 文件還在。
-
-  2. 然後將光標移動至當���的頂端。
-
-特別�示︰ 執行步驟3之後您將看到第五講第三節，請屆時�往下移動回到這裡來。
-
-  3. 接著通� :r TEST 將��創建的�為 TEST 的文件��進來。
-
-特別�示︰您所��進來的文件將從光標所在�置處開始置入。
-
-  4. 為了確�文件已經���功，移動光標回到原來的�置就�以注�有兩份第
-     五講第三節，一份是原本，�外一份是來自文件的副本。
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       第五講��
-
-
-  1. :!command 用于執行一個外部命令 command。
-
-     請看一些實際例�︰
-	 :!dir		-  用于顯示當�目錄的內容。
-	 :!rm FILENAME	-  用于刪除�為 FILENAME 的文件。
-
-  2. :w FILENAME  �將當� VIM 中正在編輯的文件�存到�為 FILENAME
-     的文件中。
-
-  3. :#,#w FILENAME �將當�編輯文件第 # 行至第 # 行的內容�存到文件
-     FILENAME 中。
-
-  4. :r FILENAME ����盤文件 FILENAME 並將其�入到當�文件的光標�置
-     後�。
-
-
-
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 第六講第一節︰打開類命令
-
-
-	 ** 輸入 o 將在光標的下方打開新的一行並進入�入模�。**
-
-  1. 請將光標移動到本節中下�標記有 ---> 的那一行。
-
-  2. 接著輸入�寫的 o 在光標 *下方* 打開新的一行並進入�入模�。
-
-  3. 然後復制標記有 ---> 的行並按 <ESC> �退出�入模�而進入正常模�。
-
----> After typing  o  the cursor is placed on the open line in Insert mode.
-
-  4. 為了在光標 *上方* 打開新的一行，�需�輸入大寫的 O 而�是�寫的 o
-     就�以了。請在下行測試一下�。當光標處在在該行上時，按 Shift-O�以
-     在該行上方新開一行。
-
-Open up a line above this by typing Shift-O while the cursor is on this line.
-
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			第六講第二節︰光標後�入類命令
-
-
-		     ** 輸入 a 將�在光標之後�入文本。 **
-
-  1. 請在正常模�下通�輸入 $ 將光標移動到本節中下�標記有 ---> 的第一行
-     的末尾。
-
-  2. 接著輸入�寫的 a 則�在光標之後�入文本了。大寫的 A 則�以直接在行
-     末�入文本。
-
-�示︰輸入大寫 A 的�作方法�以在行末�入文本，��了輸入 i，光標定�到
-      最後一個字符，輸入的文本，<ESC> 回復正常模�，箭頭��移動光標以�
-      x 刪除當�光標所在�置字符等等諸多�雜的�作。
-
-  3. �作之後第一行就�以補充完整了。請注�光標後�入文本與�入模�是基
-     本完全一致的，�是文本�入的�置定��有��罷了。
-
----> This line will allow you to practice
----> This line will allow you to practice appending text to the end of a line.
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    第六講第三節︰�外一個置�類命令的版本
-
-
-		      ** 輸入大寫的 R �連續替�多個字符。**
-
-  1. 請將光標移動到本節中下�標記有 ---> 的第一行。
-
-  2. 移動光標到第一行中��于標有 ---> 的第二行的第一個單詞的開始，�單
-     詞 last 處。
-
-  3. 然後輸入大寫的 R 開始把第一行中的��于第二行的剩余字符�一輸入，就
-     �以全部替�掉原有的字符而使得第一行完全雷�第二行了。
-
----> To make the first line the same as the last on this page use the keys.
----> To make the first line the same as the second, type R and the new text.
-
-  4. 請注�︰如果您按 <ESC> 退出置�模�回復正常模�，尚未替�的文本將�
-     然��原狀。
-
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			    第六講第四節︰設置類命令的�項
-
-
-		  ** 設置�使查找或者替��忽略大�寫的�項 **
-
-
-  1. �查找單詞 ignore �在正常模�下輸入 /ignore 。��復查找該詞，�以
-     �復按 n �。
-
-  2. 然後設置 ic �項(ic就是英文忽略大�寫Ignore Case的首字�縮寫詞)，�
-     輸入︰
-	:set ic
-
-  3. �在�以通��入 n ��次查找單詞 ignore。�復查找�以�復�入 n �。
-
-  4. 然後設置 hlsearch 和 incsearch 這兩個�項，輸入以下內容︰
-     :set hls is
-
-  5. �在�以�次輸入查找命令，看看會有什麼效果︰
-     /ignore
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       第六講��
-
-
-  1. 輸入�寫的 o �以在光標下方打開新的一行並將光標置于新開的行首，進入
-     �入模�。
-     輸入大寫的 O �以在光標上方打開新的一行並將光標置于新開的行首，進入
-     �入模�。
-
-  2. 輸入�寫的 a �以在光標所在�置之後�入文本。
-     輸入大寫的 A �以在光標所在行的行末之後�入文本。
-
-  3. 輸入大寫的 R 將進入替�模�，直至按 <ESC> �退出替�模�而進入正常
-     模�。
-
-  4. 輸入 :set xxx �以設置 xxx �項。
-
-
-
-
-
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       第七講︰在線幫助命令
-
-		      ** 使用在線幫助系統 **
-
-  Vim �有一個細致全�的在線幫助系統。�啟動該幫助系統，請�擇如下三種方
-  法之一︰
-	- 按下 <HELP> � (如果�盤上有的話)
-	- 按下 <F1> � (如果�盤上有的話)
-	- 輸入	:help <回車>
-
-  輸入 :q <回車> �以關閉幫助窗�。
-
-  �供一個正確的�數給":help"命令，您�以找到關于該主題的幫助。請試驗以
-  下�數(�別忘了按回車�哦。:)︰
-
-	  :help w <回車>
-	  :help c_<T <回車>
-	  :help insert-index <回車>
-	  :help user-manual <回車>
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      第八講︰創建一個啟動腳本
-
-			 ** 啟用vim的功能 **
-
-  Vim的功能特性�比vi多得多，但大部分功能都沒有缺�激活。為了啟動更多的
-  功能，您得創建一個vimrc文件。
-
-  1. 開始編輯vimrc文件，這�決于您所使用的�作系統︰
-
-     :edit ~/.vimrc		這是Unix系統所使用的命令
-     :edit $VIM/_vimrc		這是Windows系統所使用的命令
-
-  2. 接著導入vimrc范例文件︰
-
-     :read $VIMRUNTIME/vimrc_example.vim
-
-  3. �存文件，命令為︰
-
-     :write
-
-  在下次您啟動vim的時候，編輯器就會有了語法高亮的功能。您�以繼續把您喜
-  歡的其它功能設置添加到這個vimrc文件中。
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  vim 教程到此��。本教程�是為了簡明地介紹一下vim編輯器，但已足以讓您
-  很容易學會使用本編輯器了。毋庸質疑，vim還有很多很多的命令，本教程所介
-  紹的還差得�著呢。所以您�精通的話，還望繼續努力哦。下一步您�以閱讀
-  vim手冊，使用的命令是︰
-	:help user-manual
-
-  為了更進一步的�考和學習，以下這本書值得推薦︰
-
-	Vim - Vi Improved - 作者︰Steve Oualline
-	出版社︰New Riders
-
-  這是第一本完全講解vim的書�。�于�學者特別有用。其中還包�有大�實例
-  和圖示。欲知詳情，請訪� http://iccf-holland.org/click5.html
-
-  以下這本書比較�了而且內容主�是vi而�是vim，但是也值得推薦︰
-
-	Learning the Vi Editor - 作者︰Linda Lamb
-	出版社︰O'Reilly & Associates Inc.
-
-  這是一本�錯的書，通�它您幾乎能夠了解到全部vi能夠�到的事情。此書的第
-  六個版本也包�了一些關于vim的信�。
-
-  本教程是由來自Calorado School of Minese的Michael C. Pierce�Robert K.
-  Ware 所編寫的，其中來自Colorado State University的Charles Smith�供了
-  很多創�。編者通信地�是︰
-
-	bware@mines.colorado.edu
-
-  本教程已由Bram Moolenaar專為vim進行修訂。
-
-
-
-  譯制者附言︰
-  ===========
-      簡體中文教程翻譯版之譯制者為�昌泰 <beos@turbolinux.com.cn>，還有
-      �外一個�系地�︰linuxrat@gnuchina.org。
-
-      �體中文教程是從簡體中文教程翻譯版使用 Debian GNU/Linux 中文項目�
-      組的于廣�先生編寫的中文漢字轉碼器  autoconvert 轉�而�的，並�轉
-      �的�果�了一些細節的改動。
-
-  變更記錄︰
-  =========
-      2002年08月30日 �昌泰 <beos@turbolinux.com.cn>
-      感� RMS@SMTH 的指正，將多處錯誤修正。
-
-      2002年04月22日 �昌泰 <linuxrat@gnuchina.org>
-      感� xuandong@sh163.net 的指正，將兩處錯別字修正。
-
-      2002年03月18日 �昌泰 <linuxrat@gnuchina.org>
-      根據Bram Molenaar先生在2002年03月16日的來信�求，將vimtutor1.4中譯
-      版�級到vimtutor1.5。
-
-      2001年11月15日 �昌泰 <linuxrat@gnuchina.org>
-      將vimtutor1.4中譯版�交給Bram Molenaar和Sven Guckes。
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/runtime/tutor/tutor.zh_cn.utf-8 b/runtime/tutor/tutor.zh_cn.utf-8
index 0821ef6e45..3ff031f7c5 100644
--- a/runtime/tutor/tutor.zh_cn.utf-8
+++ b/runtime/tutor/tutor.zh_cn.utf-8
@@ -1,30 +1,32 @@
 ===============================================================================
-=      欢     迎     阅     读   《 V I M  教  程 》   ——     版本 1.5      =
+=      欢     迎     阅     读   《 V I M  教  程 》   ——      版本 1.7       =
 ===============================================================================
-     vim 是一个具有很多命令的功能�常强大的编辑器。�于篇幅，在本教程当中
+
+     Vim 是一个具有很多命令的功能�常强大的编辑器。�于篇幅，在本教程当中
      就�详细介�了。本教程的设计目标是讲述一些必�的基本命令，而掌�好这
-     些命令，您就能够很容易将vim当作一个通用的万能编辑器�使用了。
+     些命令，您就能够很容易地将 Vim 当作一个通用编辑器�使用了。
 
      完�本教程的内容大约需�25-30分钟，�决于您训练的时间。
 
+     注�：
      �一节的命令�作将会更改本文。推�您�制本文的一个副本，然�在副本上
      进行训练(如果您是通过"vimtutor"��动教程的，那么本文就已�是副本了)。
 
-     切记一点∶本教程的设计�路是在使用中进行学习的。也就是说，您需�通过
+     切记一点：本教程的设计�路是在使用中进行学习的。也就是说，您需�通过
      执行命令�学习它们本身的正确用法。如果您�是阅读而��作，那么您�能
      会很快�忘这些命令的�
 
      好了，现在请确定您的Shift-Lock(大�写�定键)还没有按下，然�按键盘上
-     的字�键 j 足够多的次数�移动光标，直到第一节的内容能够完全充满�幕。
+     的字�键 j 足够多次�移动光标，直到第一节的内容能够完全充满�幕。
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			第一讲第一节∶移动光标
+			第一讲第一节：移动光标
 
 
-   ※※ �移动光标，请�照说明分别按下 h�j�k�l 键。 ※※
+	     ** �移动光标，请�照说明分别按下 h�j�k�l 键。 **
 
 	     ^
-	     k		    �示∶ h 的键�于左边，�次按下就会�左移动。
+	     k		    �示： h 的键�于左边，�次按下就会�左移动。
        < h	 l >		   l 的键�于�边，�次按下就会��移动。
 	     j			   j 键看起�很象一支尖端方��下的箭头。
 	     v
@@ -35,43 +37,38 @@
 
 ---> 现在您应该已�学会如何移动到下一讲�。
 
-  3. 现在请使用下行键，将光标移动到第二讲。
+  3. 现在请使用下行键，将光标移动到第一讲第二节。
 
-�示∶如果您�敢确定您所按下的字�，请按下<ESC>键回到正常(Normal)模�。
+�示：如果您�敢确定您所按下的字�，请按下<ESC>键回到正常(Normal)模�。
       然��次从键盘输入您想�的命令。
 
-�示∶光标键应当也能正常工作的。但是使用hjkl键，在习惯之�您就能够快速
-      地在�幕内四处移动光标了。
+�示：光标键应当也能正常工作的。但是使用hjkl键，在习惯之�您就能够更快
+      地在�幕内四处移动光标。真的是这样�
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			第一讲第二节∶VIM的进入和退出
+			第一讲第二节：VIM的进入和退出
 
 
-  !! 特别�示∶敬请阅读完整本一节的内容，然��能执行以下所讲解的命令。
+  !! 特别�示：敬请阅读本一节的完整内容，然��执行以下所讲解的命令。
 
-  1. 请按<ESC>键(这是为了确�您处在正常模�)。
+  1. 按<ESC>键(这是为了确�您处在正常模�)。
 
-  2. 然�输入∶			:q! <回车>
+  2. 然�输入：			:q! <回车>
+     这�方�的退出编辑器会丢弃您进入编辑器以�所�的改动。
 
----> 这�方�的退出编辑器��会�存您进入编辑器以�所�的改动。
-     如果您想�存更改�退出，请输入∶
-				:wq  <回车>
-
-  3. 如果您看到了命令行�示符，请输入能够带您回到本教程的命令，那就是∶
-
-		vimtutor <回车>
-
-     通常情况下您也�以用这�方�∶
-
-		vim tutor <回车>
-
----> 这里的 'vim' 表示进入vim编辑器，而 'tutor'则是您准备�编辑的文件。
+  3. 如果您看到了命令行�示符，请输入能够带您回到本教程的命令，那就是：
+     vimtutor <回车>
 
   4. 如果您自信已�牢牢记�了这些步骤的�，请从步骤1执行到步骤3退出，然
-     ��次进入编辑器。接�将光标移动到第一讲第三节�继续我们的教程讲解。
+     ��次进入编辑器。
+
+�示： :q! <回车> 会丢弃您所�的任何改动。几讲之�您将学会如何�存改动到文件。
+
+  5. 将光标下移到第一讲第三节。
+
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			第一讲第三节∶文本编辑之删除
+			第一讲第三节：文本编辑之删除
 
 
    ** 在正常(Normal)模�下，�以按下 x 键�删除光标所在�置的字符。**
@@ -86,35 +83,79 @@
 
 ---> The ccow jumpedd ovverr thhe mooon.
 
-  5. 好了，该行已�修正了，下一节内容是第一讲第四节。
+  5. 好了，该行已�修正了，下�是第一讲第四节。
 
-特别�示∶在您�览本教程时，��强行记忆。记�一点∶在使用中学习。
+特别�示：在�览本教程时，��强行记忆。记�一点：在使用中学习。
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     第一讲第四节∶文本编辑之�入
+		     第一讲第四节：文本编辑之�入
 
 
 	 ** 在正常模�下，�以按下 i 键��入文本。**
 
   1. 请将光标移动到本节中下�标记有 ---> 的第一行。
 
-  2. 为了使得第一行内容雷�于第二行，请将光标移至文本第一个字符准备�入
+  2. 为了使得第一行内容雷�于第二行，请将光标移至文本第一个准备�入字符
      的�置。
 
   3. 然�按下 i 键，接�输入必�的文本字符。
 
-  4. 所有文本都修正完毕，请按下 <ESC> 键返回正常模�。
+  4. �个错误修正完毕�，请按下 <ESC> 键返回正常模�。
      ��步骤2至步骤4以便修正��。
 
 ---> There is text misng this .
 ---> There is some text missing from this line.
 
-  5. 如果您对文本�入�作已�很满�，请接�阅读下�的�结。
+  5. 如果您对文本�入�作已�很满�，请接�阅读下�的第一讲第五节。
 
 
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     第一讲第五节：文本编辑之添加
+
+
+			** 按 A 键以添加文本。 **
+
+  1. 移动光标到下�第一个标记有 ---> 的一行。
+     光标放在那一行的哪个字符上并���。
+
+  2. 按 A 键输入必�的添加内容。
+
+  3. 文本添加完毕�，按 <ESC> 键回到正常模�。
+
+  4. 移动光标到下�第二个标记有 ---> 的一行。��步骤2和步骤3以改正这个��。
+
+---> There is some text missing from th
+     There is some text missing from this line.
+---> There is also some text miss
+     There is also some text missing here.
+
+  5. 当您对添加文本�作感到满�时，请继续学习第一讲第六节。
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     第一讲第六节：编辑文件
+
+		    ** 使用 :wq 以�存文件并退出。 **
+
+  特别�示：在执行以下步骤之�，请先读完整个�节�
+
+  1. 如您在第一讲第二节中所�的那样退出本教程： :q!
+     或者，如果您�以访问�一个终端，请在那里执行以下�作。
+
+  2. 在 shell 的�示符下输入命令： vim tutor <回车>
+     'vim'是�动 Vim 编辑器的命令，'tutor'是您希望编辑的文件的�字。
+     请使用一个�以改动的文件。
+
+  3. 使用您在��的教程中学到的命令�入删除文本。
+
+  4. �存改动过的文件并退出 Vim，按这些键： :wq  <回车>
+
+  5. 如果您在步骤1中已�退出 vimtutor，请�� vimtutor 移动到下�的�结一节。
+
+  6. 阅读完以上步骤，弄懂它们的�义，然�在实践中进行练习。
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			       第一讲�结
 
@@ -122,53 +163,50 @@
   1. 光标在�幕文本中的移动既�以用箭头键，也�以使用 hjkl 字�键。
 	 h (左移)	j (下行)       k (上行)	    l (�移)
 
-  2. 欲进入vim编辑器(从命令行�示符)，请输入∶vim 文件� <回车>
+  2. 欲进入 Vim 编辑器(从命令行�示符)，请输入：vim 文件� <回车>
 
-  3. 欲退出vim编辑器，请输入以下命令放弃所有修改∶
+  3. 欲退出 Vim 编辑器，请输入 <ESC>   :q!   <回车> 放弃所有改动。
+                      或者输入 <ESC>   :wq   <回车> �存改动。
 
-	<ESC>   :q!	 <回车>
+  4. 在正常模�下删除光标所在�置的字符，请按： x
 
-     或者输入以下命令�存所有修改∶
+  5. 欲�入或添加文本，请输入：
 
-	<ESC>   :wq	 <回车>
+	 i   输入欲�入文本   <ESC>		在光标��入文本
+	 A   输入欲添加文本   <ESC>             在一行�添加文本
 
-  4. 在正常模�下删除光标所在�置的字符，请按∶ x
-
-  5. 在正常模�下�在光标所在�置开始�入文本，请按∶
-
-	 i     输入必�文本	<ESC>
-
-特别�示∶按下 <ESC> 键会带您回到正常模�或者�消一个�期望或者部分完�
+特别�示：按下 <ESC> 键会带您回到正常模�或者撤消一个�想输入或部分完整
 的命令。
 
 好了，第一讲到此结�。下�接下�继续第二讲的内容。
 
 
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			第二讲第一节∶删除类命令
+			第二讲第一节：删除类命令
 
 
-	    ** 输入 dw �以从光标处删除至一个�字/��的末尾。**
+	    ** 输入 dw �以从光标处删除至一个��的末尾。**
 
   1. 请按下 <ESC> 键确�您处于正常模�。
 
   2. 请将光标移动到本节中下�标记有 ---> 的那一行。
 
-  3. 请将光标移至准备�删除的��的开始。
+  3. 请将光标移至准备�删除的��的起始处。
 
   4. 接�输入 dw 删除掉该��。
 
-  特别�示∶您所输入的 dw 会在您输入的�时出现在�幕的最�一行。如果您输
-  入有误，请按下 <ESC> 键�消，然��新��。
+  特别�示：当您输入时，字� d 会�时出现在�幕的最�一行。Vim 在等待您输入
+  字� w。如果您看到的是除 d 外的其他字符，那表明您按错了；请按下 <ESC> 键，
+  然��新��。
 
 ---> There are a some words fun that don't belong paper in this sentence.
 
-  5. ��步骤3至步骤4，直至��修正完毕。接�继续第二讲第二节内容。
-
+  5. ��步骤3和步骤4，直至��修正完毕。接�继续第二讲第二节内容。
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      第二讲第二节∶其他删除类命令
+		      第二讲第二节：更多删除类命令
 
 
 		   ** 输入 d$ 从当�光标删除到行末。**
@@ -191,58 +229,102 @@
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     第二讲第三节∶关于命令和对象
+		     第二讲第三节：关于命令和对象
 
 
-  删除命令 d 的格�如下∶
+  许多改�文本的命令都由一个�作符和一个动作构�。
+  使用删除�作符 d 的删除命令的格�如下：
 
-	 [number]   d	object	    或者     d	 [number]   object
+	d   motion
 
-  其�如下∶
-    number - 代表执行命令的次数(�选项，缺�设置为 1 )。
-    d - 代表删除。
-    object - 代表命令所��作的对象(下�有相关介�)。
+  其中：
+    d      - 删除�作符。
+    motion - �作符的�作对象(在下�列出)。
 
-  一个简短的对象列表∶
-    w - 从当�光标当��置直到�字/��末尾，包括空格。
-    e - 从当�光标当��置直到�字/��末尾，但是 *�* 包括空格。
+  一个简短的动作列表：
+    w - 从当�光标当��置直到下一个��起始处，�包括它的第一个字符。
+    e - 从当�光标当��置直到��末尾，包括最�一个字符。
     $ - 从当�光标当��置直到当�行末。
 
-特别�示∶
-    对于勇于探索者，请在正常模�下�仅按代表相应对象的键而�使用命令，则
+  因此输入 de 会从当�光标�置删除到��末尾。
+
+特别�示：
+    对于勇于探索者，请在正常模�下�仅按代表相应动作的键而�使用�作符，您
     将看到光标的移动正如上�的对象列表所代表的一样。
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		     第二讲第四节：使用计数指定动作
+
+
+             ** 在动作�输入数字会使它��那么多次。 **
+
+  1. 移动光标到下�标记有 ---> 的一行的开始。
+
+  2. 输入 2w 使光标��移动两个��。
+
+  3. 输入 3e 使光标��移动到第三个��的末尾。
+
+  4. 输入 0 (数字零) 移动光标到行首。
+
+  5. ��步骤2和步骤3，�试��的数字。
+
+---> This is just a line with words you can move around in.
+
+  6. 请继续学习第二讲第五节。
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		       第二讲第五节：使用计数以删除更多
+
+
+	       ** 使用�作符时输入数字�以使它��那么多次。 **
+
+  上�已��到过删除�作符和动作的组�，您�以在组�中动作之��入一个数字以
+  删除更多：
+	 d   number(æ•°å­—)   motion
+
+  1. 移动光标到下�标记有 ---> 的一行中第一个大写字���上。
+
+  2. 输入 d2w 以删除两个大写字���。
+
+  3. ��步骤1和步骤2，使用��的数字使得用一个命令就能删除全部相邻的大写字�
+     ��
+
+--->  this ABC DE line FGHI JK LMN OP of words is Q RS TUV cleaned up.
+
+
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		第二讲第四节∶对象命令的特殊情况
+			    第二讲第六节：�作整行
 
 
-	       ** 输入 dd �以删除整一个当�行。 **
+		     ** 输入 dd �以删除整一个当�行。 **
 
-  鉴于整行删除的高频度，VIM 的设计者决定�简化整行删除，仅需�在�一行上
+  鉴于整行删除的高频度，Vi 的设计者决定�简化整行删除�作，您仅需�在�一行上
   击打两次 d 就�以删除掉光标所在的整行了。
 
   1. 请将光标移动到本节中下�的短�段�中的第二行。
   2. 输入 dd 删除该行。
   3. 然�移动到第四行。
-  4. 接�输入 2dd (还记得��讲过的 number-command-object �？) 删除两行。
+  4. 接�输入 2dd 删除两行。
 
-      1)  Roses are red,
-      2)  Mud is fun,
-      3)  Violets are blue,
-      4)  I have a car,
-      5)  Clocks tell time,
-      6)  Sugar is sweet
-      7)  And so are you.
+--->  1)  Roses are red,
+--->  2)  Mud is fun,
+--->  3)  Violets are blue,
+--->  4)  I have a car,
+--->  5)  Clocks tell time,
+--->  6)  Sugar is sweet
+--->  7)  And so are you.
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 第二讲第五节∶撤消类命令
+			   第二讲第七节：撤消类命令
 
 
-	 ** 输入 u �撤消最�执行的命令，输入 U �修正整行。**
+	** 输入 u �撤消最�执行的命令，输入 U �撤消对整行的修改。 **
 
   1. 请将光标移动到本节中下�标记有 ---> 的那一行，并将其置于第一个错误
      处。
@@ -251,8 +333,8 @@
   4. 这次�使用 x 修正本行的所有错误。
   5. 现在输入一个大写的 U ，��到该行的原始状�。
   6. 接�多次输入 u 以撤消 U 以�更�的命令。
-  7. 然�多次输入 CTRL-R (先按下 CTRL 键�放开，接�输入 R 键) ，这样就
-     �以执行��命令，也就是撤消掉撤消命令。
+  7. 然�多次输入 CTRL-R (先按下 CTRL 键�放开，接�按 R 键)，这样就
+     �以��被撤消的命令，也就是撤消掉撤消命令。
 
 ---> Fiix the errors oon thhis line and reeplace them witth undo.
 
@@ -265,105 +347,105 @@
 			       第二讲�结
 
 
-  1. 欲从当�光标删除至�字/��末尾，请输入∶dw
+  1. 欲从当�光标删除至下一个��，请输入：dw
+  2. 欲从当�光标删除至当�行末尾，请输入：d$
+  3. 欲删除整行，请输入：dd
 
-  2. 欲从当�光标删除至当�行末尾，请输入∶d$
+  4. 欲��一个动作，请在它��加上一个数字：2w
+  5. 在正常模�下修改命令的格�是：
+               operator   [number]   motion
+     其中：
+       operator - �作符，代表��的事情，比如 d 代表删除
+       [number] - �以附加的数字，代表动作��的次数
+       motion   - 动作，代表在所�作的文本上的移动，例如 w 代表��(word)，
+		  $ 代表行末等等。
 
-  3. 欲删除整行，请输入∶dd
+  6. 欲移动光标到行首，请按数字0键：0
 
-  4. 在正常模�下一个命令的格�是∶
-
-       [number]   command   object     或者     command	[number]   object
-     其�是∶
-       number - 代表的是命令执行的次数
-       command - 代表��的事情，比如 d 代表删除
-       object - 代表��作的对象，比如 w 代表�字/��，$ 代表到行末等等。
-		$ (to the end of line), etc.
-
-  5. 欲撤消以�的�作，请输入∶u (�写的u)
-     欲撤消在一行中所�的改动，请输入∶U (大写的U)
-     欲撤消以�的撤消命令，��以�的�作结果，请输入∶CTRL-R
+  7. 欲撤消以�的�作，请输入：u (�写的u)
+     欲撤消在一行中所�的改动，请输入：U (大写的U)
+     欲撤消以�的撤消命令，��以�的�作结果，请输入：CTRL-R
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 第三讲第一节∶置入类命令
+			   第三讲第一节：置入类命令
 
 
-	       ** 输入 p 将最�一次删除的内容置入光标之� **
+		** 输入 p 将最�一次删除的内容置入光标之�。 **
 
-  1. 请将光标移动到本节中下�示范段�的首行。
+  1. 请将光标移动到本节中下�第一个标记有 ---> 的一行。
 
-  2. 输入 dd 将该行删除，这样会将该行�存到vim的缓冲区中。
+  2. 输入 dd 将该行删除，这样会将该行�存到 Vim 的一个寄存器中。
 
-  3. 接�将光标移动到准备置入的�置的上方。记�∶是上方哦。
+  3. 接�将光标移动到 c) 一行，�准备置入的�置的上方。记�：是上方哦。
 
-  4. 然�在正常模�下(<ESC>键进入)，输入 p 将该行粘贴置入。
+  4. 然�在正常模�下(<ESC>键进入)输入 p 将该行粘贴置入。
 
   5. ��步骤2至步骤4，将所有的行��放置到正确的�置上。
 
-     d) Can you learn too?
-     b) Violets are blue,
-     c) Intelligence is learned,
-     a) Roses are red,
+---> d) Can you learn too?
+---> b) Violets are blue,
+---> c) Intelligence is learned,
+---> a) Roses are red,
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       第三讲第二节∶替�类命令
+			   第三讲第二节：替�类命令
 
 
 	  ** 输入 r 和一个字符替�光标所在�置的字符。**
 
   1. 请将光标移动到本节中下�标记有 ---> 的第一行。
 
-  2. 请移动光标到第一个错误的适当�置。
+  2. 请移动光标到第一个出错的�置。
 
-  3. 接�输入 r ，这样就能将错误替�掉了。
+  3. 接�输入 r 和�替��的字符，这样就能将错误替�掉了。
 
   4. ��步骤2和步骤3，直到第一行已�修改完毕。
 
 --->  Whan this lime was tuoed in, someone presswd some wrojg keys!
 --->  When this line was typed in, someone pressed some wrong keys!
 
-  5. 然�我们继续学校第三讲第三节。
+  5. 然�我们继续学习第三讲第三节。
 
-特别�示∶切记您�在使用中学习，而�是在记忆中学习。
+特别�示：切记您�在使用中学习，而�是在记忆中学习。
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			第三讲第三节∶更改类命令
+			第三讲第三节：更改类命令
 
 
-	   ** �改�一个�字/��的部分或者全部，请输入 cw **
+		 ** �改�文本直到一个��的末尾，请输入 ce **
 
   1. 请将光标移动到本节中下�标记有 ---> 的第一行。
 
   2. 接�把光标放在�� lubw 的字� u 的�置那里。
 
-  3. 然�输入 cw 就�以修正该��了(在本例这里是输入 ine 。)
+  3. 然�输入 cw 以�正确的��(在本例中是输入 ine )。
 
   4. 最�按 <ESC> 键，然�光标定�到下一个错误第一个准备更改的字�处。
 
   5. ��步骤3和步骤4，直到第一个��完全雷�第二个��。
 
----> This lubw has a few wptfd that mrrf changing usf the change command.
----> This line has a few words that need changing using the change command.
+---> This lubw has a few wptfd that mrrf changing usf the change operator.
+---> This line has a few words that need changing using the change operator.
 
-�示∶请注� cw 命令�仅仅是替�了一个��，也让您进入文本�入状�了。
+�示：请注� ce 命令�仅仅是删除了一个��，它也让您进入�入模�了。
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       第三讲第四节∶使用c指令的其他更改类命令
+		       第三讲第四节：使用c更改更多
 
 
-	     ** 更改类指令�以使用�删除类命令所使用的对象�数。**
+	   ** 更改类�作符�以与删除中使用的�样的动作��使用。 **
 
-  1. 更改类指令的工作方�跟删除类命令是一致的。�作格�是∶
+  1. 更改类�作符的工作方�跟删除类是一致的。�作格�是：
 
-       [number]   c   object	   或者	    c	[number]   object
+         c    [number]   motion
 
-  2. 对象�数也是一样的，比如 w 代表�字/��，$代表行末等等。
+  2. 动作�数(motion)也是一样的，比如 w 代表��，$代表行末等等。
 
   3. 请将光标移动到本节中下�标记有 ---> 的第一行。
 
@@ -377,55 +459,56 @@
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       第三讲�结
+				  第三讲�结
 
 
-  1. ��新置入已�删除的文本内容，请输入�写字� p。该�作�以将已删除
+  1. ��新置入已�删除的文本内容，请按�写字� p 键。该�作�以将已删除
      的文本内容置于光标之�。如果最�一次删除的是一个整行，那么该行将置
      于当�光标所在行的下一行。
 
   2. �替�光标所在�置的字符，请输入�写的 r 和�替�掉原�置字符的新字
      符��。
 
-  3. 更改类命令�许您改�指定的对象，从当�光标所在�置直到对象的末尾。
-     比如输入 cw �以替�当�光标到��的末尾的内容；输入 c$ �以替�当
+  3. 更改类命令�许您改�从当�光标所在�置直到动作指示的�置中间的文本。
+     比如输入 ce �以替�当�光标到��的末尾的内容；输入 c$ �以替�当
      �光标到行末的内容。
 
-  4. 更改类命令的格�是∶
+  4. 更改类命令的格�是：
 
-	 [number]   c	object	      或者	c   [number]   object
+	 c   [number]   motion
 
-下�我们继续学习下一讲。
+现在我们继续学习下一讲。
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     第四讲第一节∶定��文件状�
+		     第四讲第一节：定��文件状�
 
+  ** 输入 CTRL-G 显示当�编辑文件中当�光标所在行�置以�文件状�信�。
+     输入大写 G 则直接跳转到文件中的�一指定行。**
 
-  ** 输入 CTRL-g 显示当�编辑文件中当�光标所在行�置以�文件状�信�。
-     输入 SHIFT-G 则直接跳转到文件中的�一指定行。**
+  �示：切记�先通读本节内容，之���以执行以下步骤!!!
 
-  �示∶切记�先通读本节内容，之���以执行以下步骤!!!
+  1. 按下 CTRL 键�放开然�按 g 键。我们称这个键组�为 CTRL-G。
+     您会看到页�最底部出现一个状�信�行，显示的内容是当�编辑的文件�
+     和文件中光标�置。请记�行�，它会在步骤3中用到。
 
-  1. 按下 CTRL 键�放开然�按 g 键。然�就会看到页�最底部出现一个状�信
-     �行，显示的内容是当�编辑的文件�和文件的总行数。请记�步骤3的行�。
+�示：您也许会在�幕的�下角看到光标�置，这会在 'ruler' 选项设置时�生
+      (�� :help 'ruler')
 
-  2. 按下 SHIFT-G 键�以使得当�光标直接跳转到文件最�一行。
-
-  3. 输入您曾�留的行�，然�按下 SHIFT-G。这样就�以返回到您第一次按下
-     CTRL-g 时所在的行好了。注�∶输入行�时，行�是�会在�幕上显示出�
-     的。
-
-  4. 如果愿�，您�以继续执行步骤1至步骤三。
+  2. 输入大写 G �以使得当�光标直接跳转到文件最�一行。
+     输入 gg �以使得当�光标直接跳转到文件第一行。
 
+  3. 输入您曾�留的行�，然�输入大写 G。这样就�以返回到您第一次按下
+     CTRL-G 时所在的行了。
 
+  4. 如果您觉得没问题的�，请执行步骤1至步骤3的�作进行练习。
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			第四讲第二节∶�索类命令
+			第四讲第二节：�索类命令
 
 
-     ** 输入 / 以�尾�的字符串�以用以在当�文件中查找该字符串。**
+     ** 输入 / 加上一个字符串�以用以在当�文件中查找该字符串。**
 
   1. 在正常模�下输入 / 字符。您此时会注�到该字符和光标都会出现在�幕底
      部，这跟 : 命令是一样的。
@@ -433,23 +516,22 @@
   2. 接�输入 errroor <回车>。那个errroor就是您�查找的字符串。
 
   3. �查找�上一次的字符串，�需�按 n 键。��相�方�查找�上一次的字
-     符串，请输入 Shift-N ��。
+     符串，请输入大写 N ��。
 
   4. 如果您想逆�查找字符串，请使用 ? 代替 / 进行。
 
----> When the search reaches the end of the file it will continue at the start.
-
-  "errroor" is not the way to spell error;  errroor is an error.
-
-  �示∶如果查找已�到达文件末尾，查找会自动从文件头部继续查找。
-
+  5. �回到您之�的�置按 CTRL-O (按� Ctrl 键�放�时按下字� o)。��按�以
+     回退更多步。CTRL-I 会跳转到较新的�置。
 
+--->  "errroor" is not the way to spell error;  errroor is an error.
+�示：如果查找已�到达文件末尾，查找会自动从文件头部继续查找，除�
+      'wrapscan' 选项被��。
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		   第四讲第三节∶�对括�的查找
+		   第四讲第三节：�对括�的查找
 
 
-	      ** 按 % �以查找�对的括� )�]�}。**
+	      ** 输入 % �以查找�对的括� )�]�}。**
 
   1. 把光标放在本节下�标记有 --> 那一行中的任何一个 (�[ 或 { 处。
 
@@ -459,17 +541,17 @@
 
   4. �次按 % 就�以跳回�对的第一个括�处。
 
+  5. 移动光标到�一个 (�)�[�]�{ 或 } 处，按 % 查看其所作所为。
+
 ---> This ( is a test line with ('s, ['s ] and {'s } in it. ))
 
-�示∶在程�调试时，这个功能用�查找��对的括�是很有用的。
-
-
 
+�示：在程�调试时，这个功能用�查找��对的括�是很有用的。
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      第四讲第四节∶修正错误的方法之一
+		      第四讲第四节：替�命令
 
 
 		** 输入 :s/old/new/g �以替� old 为 new。**
@@ -479,46 +561,48 @@
   2. 输入 :s/thee/the <回车> 。请注�该命令�改�光标所在行的第一个匹�
      串。
 
-  3. 输入 :s/thee/the/g	则是替�全行的匹�串。
-
----> the best time to see thee flowers is in thee spring.
-
-  4. �替�两行之间出现的�个匹�串，请输入 :#,#s/old/new/g (#,#代表的是
-     两行的行�)。输入 :%s/old/new/g 则是替�整个文件中的�个匹�串。
-
+  3. 输入 :s/thee/the/g	则是替�全行的匹�串，该行中所有的 "thee" 都会被
+     改�。
 
+---> thee best time to see thee flowers is in thee spring.
 
+  4. �替�两行之间出现的�个匹�串，请
+     输入   :#,#s/old/new/g   其中 #,# 代表的是替��作的若干行中
+                              首尾两行的行�。
+     输入   :%s/old/new/g     则是替�整个文件中的�个匹�串。
+     输入   :%s/old/new/gc    会找到整个文件中的�个匹�串，并且对�个匹�串
+                              �示是�进行替�。
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			       第四讲�结
 
 
-  1. Ctrl-g 用于显示当�光标所在�置和文件状�信�。Shift-G 用于将光标跳
-     转至文件最�一行。先敲入一个行�然�按 Shift-G 则是将光标移动至该行
-     �代表的行。
+  1. CTRL-G 用于显示当�光标所在�置和文件状�信�。
+     G 用于将光标跳转至文件最�一行。
+     先敲入一个行�然�输入大写 G 则是将光标移动至该行�代表的行。
+     gg 用于将光标跳转至文件第一行。
 
-  2. 输入 / 然�紧�一个字符串是则是在当�所编辑的文档中��查找该字符串。
-     输入问� ? 然�紧�一个字符串是则是在当�所编辑的文档中��查找该字
-     符串。完�一次查找之�按 n 键则是��上一次的命令，�在�一方�上查
-     找下一个字符串所在；或者按 Shift-N �相�方�查找下该字符串所在。
+  2. 输入 / 然�紧�一个字符串是在当�所编辑的文档中正�查找该字符串。
+     输入 ? 然�紧�一个字符串则是在当�所编辑的文档中��查找该字符串。
+     完�一次查找之�按 n 键是��上一次的命令，�在�一方�上查
+     找下一个匹�字符串所在；或者按大写 N �相�方�查找下一匹�字符串所在。
+     CTRL-O 带您跳转回较旧的�置，CTRL-I 则带您到较新的�置。
 
-  3. 如果光标当��置是括�(�)�[�]�{�}，按 % �以将光标移动到�对的
-     括�上。
+  3. 如果光标当��置是括�(�)�[�]�{�}，按 % 会将光标移动到�对的括�上。
 
   4. 在一行内替�头一个字符串 old 为新的字符串 new，请输入  :s/old/new
      在一行内替�所有的字符串 old 为新的字符串 new，请输入  :s/old/new/g
      在两行内替�所有的字符串 old 为新的字符串 new，请输入  :#,#s/old/new/g
      在文件内替�所有的字符串 old 为新的字符串 new，请输入  :%s/old/new/g
-     进行全文替�时询问用户确认�个替�需添加 c 选项，请输入 :%s/old/new/gc
-
+     进行全文替�时询问用户确认�个替�需添加 c 标志        :%s/old/new/gc
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		第五讲第一节∶在 VIM 内执行外部命令的方法
+		第五讲第一节：在 VIM 内执行外部命令的方法
 
 
-	   ** 输入 :! 然�紧�著输入一个外部命令�以执行该外部命令。**
+	   ** 输入 :! 然�紧接�输入一个外部命令�以执行该外部命令。**
 
-  1. 按下我们所熟悉的 : 命令设置光标到�幕底部。这样就�以让您输入命令了。
+  1. 按下我们所熟悉的 : 命令使光标移动到�幕底部。这样您就�以输入一行命令了。
 
   2. 接�输入感�� ! 这个字符，这样就�许您执行外部的 shell 命令了。
 
@@ -526,15 +610,17 @@
      内容，就如�您在命令行�示符下输入 ls 命令的结果一样。如果 !ls 没起
      作用，您�以试试 :!dir 看看。
 
----> �示∶ 所有的外部命令都�以以这�方�执行。
+�示：所有的外部命令都�以以这�方�执行，包括带命令行�数的那些。
+
+�示：所有的 : 命令都必须以敲 <回车> 键结�。从今以�我们就�会总是�到这一点
+      了。
 
----> �示∶ 所有的 : 命令都必须以 <回车> 告终。
 
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      第五讲第二节∶关于�存文件的更多信�
+		      第五讲第二节：关于�存文件的更多信�
 
 
 	     ** �将对文件的改动�存到文件中，请输入 :w FILENAME 。**
@@ -542,60 +628,63 @@
   1. 输入 :!dir 或者 :!ls 获知当�目录的内容。您应当已知�最�还得敲
      <回车> �。
 
-  2. 选择一个尚未存在文件�，比如 TEST 。
+  2. 选择一个未被用到的文件�，比如 TEST。
 
   3. 接�输入 :w TEST  (此处 TEST 是您所选择的文件�。)
 
-  4. 该命令会以 TEST 为文件��存整个文件 (VIM 教程)。为了确�正确�存，
-     请�次输入 :!dir 查看您的目录列表内容。
+  4. 该命令会以 TEST 为文件��存整个文件 (Vim 教程)。为了验�这一点，
+     请�次输入 :!dir 或 :!ls 查看您的目录列表内容。
 
----> 请注�∶如果您退出 VIM 然�在以文件� TEST 为�数进入，那么该文件内
+请注�：如果您退出 Vim 然�在以命令 vim TEST �次�动 Vim，那么该文件内
      容应该�您�存时的文件内容是完全一样的。
 
-  5. 现在您�以通过输入 :!rm TEST �删除 TEST 文件了。
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    第五讲第三节∶一个具有选择性的�存命令
-
-
-		** ��存文件的部分内容，请输入 :#,# w FILENAME **
-
-  1. ��执行一次 :!dir 或者 :!ls 获知当�目录的内容，然�选择一个�适的
-     ���的文件�，比如 TEST 。
-
-  2. 接�将光标移动至本页的最顶端，然�按 CTRL-g 找到该行的行�。别忘了
-     行�哦。
-
-  3. 接�把光标移动至本页的最底端，�按一次 CTRL-g 。也别忘了这个行好哦。
-
-  4. 为了��存文章的�个部分，请输入 :#,# w TEST 。这里的 #,# 就是上�
-     �求您记�的行�(顶端行�,底端行�)，而 TEST 就是选定的文件�。
-
-  5. 最�，用 :!dir 确认文件是�正确�存。但是这次先别删除掉。
-
-
+  5. 现在您�以删除 TEST 文件了。在 MS-DOS 下，请输入：   :!del TEST
+                                 在 Unix 下，请输入：     :!rm TEST
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		   第五讲第四节∶��和�并文件
+		    第五讲第三节：一个具有选择性的�存命令
+
+
+	    ** ��存文件的部分内容，请输入 v motion :w FILENAME **
+
+  1. 移动光标到本行。
+
+  2. 接�按 v 键，将光标移动至下�第五个�目上。您会注�到之间的文本被高亮了。
+
+  3. 然�按 : 字符。您将看到�幕底部会出现 :'<,'> 。
+
+  4. 现在请输入 w TEST，其中 TEST 是一个未被使用的文件�。确认您看到了
+     :'<,'>w TEST 之�按 <回车> 键。
+
+  5. 这时 Vim 会把选中的行写入到以 TEST 命�的文件中去。使用 :!dir 或 :!ls
+     确认文件被正确�存。这次先别删除它�我们在下一讲中会用到它。
+
+�示：按 v 键使 Vim 进入�视模�进行选�。您�以四处移动光标使选�区域�大或
+      ��。接�您�以使用一个�作符对选中文本进行�作。例如，按 d 键会删除
+      选中的文本内容。
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		   第五讲第四节：��和�并文件
 
 
        ** ��当�文件中�入�外的文件的内容，请输入 :r FILENAME **
 
-  1. 请键入 :!dir 确认您��创建的 TEST 文件还在。
+  1. 请把光标移动到本行上�一行。
 
-  2. 然�将光标移动至当�页�的顶端。
+特别�示：执行步骤2之�您将看到第五讲第三节的文字，请届时往下移动
+          以�次看到本讲内容。
 
-特别�示∶ 执行步骤3之�您将看到第五讲第三节，请届时�往下移动回到这里�。
+  2. 接�通过命令 :r TEST 将��创建的�为 TEST 的文件��进�。
+     您所��进�的文件将从光标所在�置处开始置入。
 
-  3. 接�通过 :r TEST 将��创建的�为 TEST 的文件��进�。
+  3. 为了确认文件已����功，移动光标回到原�的�置就�以注�有两份第
+     五讲第三节的内容，一份是原始内容，�外一份是�自文件的副本。
 
-特别�示∶您所��进�的文件将从光标所在�置处开始置入。
+�示：您还�以读�外部命令的输出。例如， :r !ls �以读� ls 命令的输出，并
+      把它放置在光标下�。
 
-  4. 为了确认文件已����功，移动光标回到原�的�置就�以注�有两份第
-     五讲第三节，一份是原本，�外一份是�自文件的副本。
 
 
 
@@ -605,237 +694,293 @@
 
   1. :!command 用于执行一个外部命令 command。
 
-     请看一些实际例�∶
-	  :!dir  -  用于显示当�目录的内容。
-	  :!rm FILENAME  -	用于删除�为 FILENAME 的文件。
+     请看一些实际例�：
+	 (MS-DOS)	  (Unix)
+	  :!dir		   :!ls		   -  用于显示当�目录的内容。
+	  :!del FILENAME   :!rm FILENAME   -  用于删除�为 FILENAME 的文件。
 
   2. :w FILENAME  �将当� VIM 中正在编辑的文件�存到�为 FILENAME 的文
      件中。
 
-  3. :#,#w FILENAME �将当�编辑文件第 # 行至第 # 行的内容�存到文件
+  3. v motion :w FILENAME �将当�编辑文件中�视模�下选中的内容�存到文件
      FILENAME 中。
 
   4. :r FILENAME ����盘文件 FILENAME 并将其�入到当�文件的光标�置
      ��。
 
-
-
-
-
+  5. :r !dir �以读� dir 命令的输出并将其放置到当�文件的光标�置��。
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 第六讲第一节∶打开类命令
+			 第六讲第一节：打开类命令
 
 
 	 ** 输入 o 将在光标的下方打开新的一行并进入�入模�。**
 
   1. 请将光标移动到本节中下�标记有 ---> 的那一行。
 
-  2. 接�输入�写的 o 在光标 *下方* 打开新的一行并进入�入模�。
+  2. 接�输入�写的 o 在光标 *下方* 打开新的一行，这个命令会使您
+     进入�入模�。
 
-  3. 然��制标记有 ---> 的行并按 <ESC> 键退出�入模�而进入正常模�。
+  3. 然�输入一些文字，之�按 <ESC> 键退出�入模�而进入正常模�。
 
 ---> After typing  o  the cursor is placed on the open line in Insert mode.
 
   4. 为了在光标 *上方* 打开新的一行，�需�输入大写的 O 而�是�写的 o
-     就�以了。请在下行测试一下�。当光标处在在该行上时，按 Shift-O�以
-     在该行上方新开一行。
-
-Open up a line above this by typing Shift-O while the cursor is on this line.
+     就�以了。请在下行测试一下�。
 
+---> Open up a line above this by typing O while the cursor is on this line.
 
 
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			第六讲第二节∶光标��入类命令
+			第六讲第二节：附加类命令
 
 
 		     ** 输入 a 将�在光标之��入文本。 **
 
-  1. 请在正常模�下通过输入 $ 将光标移动到本节中下�标记有 ---> 的第一行
-     的末尾。
+  1. 请在正常模�下将光标移动到本节中下�标记有 ---> 的第一行的行首。
 
-  2. 接�输入�写的 a 则�在光标之��入文本了。大写的 A 则�以直接在行
-     末�入文本。
+  2. 接�输入 e 直到光标�于 li 的末尾。
 
-�示∶输入大写 A 的�作方法�以在行末�入文本，��了输入 i，光标定�到
-      最�一个字符，输入的文本，<ESC> 回�正常模�，箭头�键移动光标以�
-      x 删除当�光标所在�置字符等等诸多��的�作。
+  3. 输入�写的 a 则�在光标之��入文本了。
 
-  3. �作之�第一行就�以补充完整了。请注�光标��入文本与�入模�是基
-     本完全一致的，�是文本�入的�置定��有��罢了。
+  4. 将��补充完整，就�下一行中的那样。之�按 <ESC> 键退出�入模�回到
+     正常模�。
 
----> This line will allow you to practice
----> This line will allow you to practice appending text to the end of a line.
+  5. 使用 e 移动光标到下一步�完整的��，��步骤3和步骤4。
 
+---> This li will allow you to pract appendi text to a line.
+---> This line will allow you to practice appending text to a line.
+
+�示：a�i 和 A 都会带您进入�入模�，惟一的区别在于字符�入的�置。
 
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    第六讲第三节∶�外一个置�类命令的版本
+		    第六讲第三节：�外一个置�类命令的版本
 
 
 		      ** 输入大写的 R �连续替�多个字符。**
 
-  1. 请将光标移动到本节中下�标记有 ---> 的第一行。
+  1. 请将光标移动到本节中下�标记有 ---> 的第一行。移动光标到第一个 xxx 的
+     起始�置。
 
-  2. 移动光标到第一行中��于标有 ---> 的第二行的第一个��的开始，��
-     � last 处。
-
-  3. 然�输入大写的 R 开始把第一行中的��于第二行的剩余字符�一输入，就
+  2. 然�输入大写的 R 开始把第一行中的��于第二行的剩余字符�一输入，就
      �以全部替�掉原有的字符而使得第一行完全雷�第二行了。
 
----> To make the first line the same as the last on this page use the keys.
----> To make the first line the same as the second, type R and the new text.
-
-  4. 请注�∶如果您按 <ESC> 退出置�模�回�正常模�，尚未替�的文本将�
-     然��原状。
-
+  3. 接�按 <ESC> 键退出替�模�回到正常模�。您�以注�到尚未替�的文本
+     �然��原状。
 
+  4. ��以上步骤，将剩余的 xxx 也替�掉。
 
+---> Adding 123 to xxx gives you xxx.
+---> Adding 123 to 456 gives you 579.
 
+�示：替�模�与�入模�相似，�过�个输入的字符都会删除一个已有的字符。
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			    第六讲第四节∶设置类命令的选项
+			  第六讲第四节：�制粘贴文本
+
+
+		 ** 使用�作符 y �制文本，使用 p 粘贴文本 **
+
+  1. 定�到下�标记有 ---> 的一行，将光标移动到 "a)" 之�。
+
+  2. 接�使用 v 进入�视模�，移动光标到 "first" 的��。
+
+  3. 现在输入 y 以抽出(�制)高亮的文本。
+
+  4. 然�移动光标到下一行的末尾：j$
+
+  5. 接�输入 p 以放置(粘贴)�制了的文本。然�输入：a second <ESC>。
+
+  6. 使用�视模�选中 " item."，用 y �制，�用 j$ 将光标移动到下一行末尾，
+     用 p 将文本粘贴到那里。
+
+--->  a) this is the first item.
+      b)
+
+  �示：您还�以把 y 当作�作符�使用；例如 yw �以用��制一个��。
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			    第六讲第五节：设置类命令的选项
 
 
 		  ** 设置�使查找或者替��忽略大�写的选项 **
 
+  1. �查找�� ignore �在正常模�下输入 /ignore <回车>。
+     ���查找该�，�以��按 n 键。
 
-  1. �查找�� ignore �在正常模�下输入 /ignore 。���查找该�，�以
-     ��按 n 键。
+  2. 然�设置 ic 选项(Ignore Case，忽略大�写)，请输入： :set ic
 
-  2. 然�设置 ic 选项(ic就是英文忽略大�写Ignore Case的首字�缩写�)，�
-     输入∶
-	:set ic
+  3. 现在�以通过键入 n 键�次查找�� ignore。注�到 Ignore 和 IGNORE 现在
+     也被找到了。
 
-  3. 现在�以通过键入 n 键�次查找�� ignore。��查找�以��键入 n 键。
+  4. 然�设置 hlsearch 和 incsearch 这两个选项，请输入： :set hls is
 
-  4. 然�设置 hlsearch 和 incsearch 这两个选项，输入以下内容∶
-     :set hls is
+  5. 现在�以�次输入查找命令，看看会有什么效果： /ignore <回车>
 
-  5. 现在�以�次输入查找命令，看看会有什么效果∶
-     /ignore
+  6. ��用忽略大�写，请输入： :set noic
 
+�示：�移除匹�项的高亮显示，请输入：  :nohlsearch
+�示：如果您想�仅在一次查找时忽略字�大�写，您�以使用 \c：
+      /ignore\c <回车>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			       第六讲�结
 
-
-  1. 输入�写的 o �以在光标下方打开新的一行并将光标置于新开的行首，进入
-     �入模�。
-     输入大写的 O �以在光标上方打开新的一行并将光标置于新开的行首，进入
-     �入模�。
+  1. 输入�写的 o �以在光标下方打开新的一行并进入�入模�。
+     输入大写的 O �以在光标上方打开新的一行。
 
   2. 输入�写的 a �以在光标所在�置之��入文本。
      输入大写的 A �以在光标所在行的行末之��入文本。
 
-  3. 输入大写的 R 将进入替�模�，直至按 <ESC> 键退出替�模�而进入正常
-     模�。
-
-  4. 输入 :set xxx �以设置 xxx 选项。
-
-
-
-
+  3. e 命令�以使光标移动到��末尾。
 
+  4. �作符 y �制文本，p 粘贴先��制的文本。
 
+  5. 输入大写的 R 将进入替�模�，直至按 <ESC> 键回到正常模�。
 
+  6. 输入 :set xxx �以设置 xxx 选项。一些有用的选项如下：
+  	'ic' 'ignorecase'	查找时忽略字�大�写
+	'is' 'incsearch'	查找短语时显示部分匹�
+	'hls' 'hlsearch'	高亮显示所有的匹�短语
+     选项��以用完整版本，也�以用缩略版本。
 
+  7. 在选项�加上 no �以关闭选项：  :set noic
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       第七讲∶在线帮助命令
+			  第七讲第一节：获�帮助信�
+
 
 		      ** 使用在线帮助系统 **
 
   Vim 拥有一个细致全�的在线帮助系统。��动该帮助系统，请选择如下三�方
-  法之一∶
+  法之一：
 	- 按下 <HELP> 键 (如果键盘上有的�)
 	- 按下 <F1> 键 (如果键盘上有的�)
 	- 输入	:help <回车>
 
+  请阅读帮助窗�中的文字以了解帮助是如何工作的。
+  输入 CTRL-W CTRL-W   �以使您在窗�之间跳转。
   输入 :q <回车> �以关闭帮助窗�。
 
   �供一个正确的�数给":help"命令，您�以找到关于该主题的帮助。请试验以
-  下�数(�别忘了按回车键哦。:)∶
+  下�数(�别忘了按回车键哦)：
 
-	  :help w <回车>
-	  :help c_<T <回车>
-	  :help insert-index <回车>
-	  :help user-manual <回车>
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       第八讲∶创建一个�动脚本
-
-			  ** �用vim的功能 **
-
-  Vim的功能特性�比vi多得多，但大部分功能都没有缺�激活。为了�动更多的
-  功能，您得创建一个vimrc文件。
-
-  1. 开始编辑vimrc文件，这�决于您所使用的�作系统∶
-
-     :edit ~/.vimrc		这是Unix系统所使用的命令
-     :edit $VIM/_vimrc		这是Windows系统所使用的命令
-
-  2. 接�导入vimrc范例文件∶
-
-     :read $VIMRUNTIME/vimrc_example.vim
-
-  3. �存文件，命令为∶
-
-     :write
-
-  在下次您�动vim的时候，编辑器就会有了语法高亮的功能。您�以继续把您喜
-  欢的其它功能设置添加到这个vimrc文件中。
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  vim 教程到此结�。本教程�是为了简明地介�一下vim编辑器，但已足以让您
-  很容易学会使用本编辑器了。毋庸质疑，vim还有很多很多的命令，本教程所介
-  �的还差得远著呢。所以您�精通的�，还望继续努力哦。下一步您�以阅读
-  vim手册，使用的命令是∶
+	:help w
+	:help c_CTRL-D
+	:help insert-index
 	:help user-manual
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			  第七讲第二节：创建�动脚本
 
-  为了更进一步的�考和学习，以下这本书值得推�∶
 
-	Vim - Vi Improved - 作者∶Steve Oualline
-	出版社∶New Riders
+			  ** �用 Vim 的特性 **
 
-  这是第一本完全讲解vim的书�。对于�学者特别有用。其中还包�有大�实例
-  和图示。欲知详情，请访问 http://iccf-holland.org/click5.html
+  Vim 的功能特性�比 Vi 多得多，但其中大部分都没有缺��用。为了使用更多的
+  特性，您得创建一个 vimrc 文件。
 
-  以下这本书比较�了而且内容主�是vi而�是vim，但是也值得推�∶
+  1. 开始编辑 vimrc 文件，具体命令�决于您所使用的�作系统：
+        :edit ~/.vimrc		这是 Unix 系统所使用的命令
+        :edit $VIM/_vimrc	这是 MS-Windows 系统所使用的命令
 
-	Learning the Vi Editor - 作者∶Linda Lamb
-	出版社∶O'Reilly & Associates Inc.
+  2. 接�读� vimrc 示例文件的内容：
+        :r $VIMRUNTIME/vimrc_example.vim
 
-  这是一本�错的书，通过它您几乎能够了解到全部vi能够�到的事情。此书的第
-  六个版本也包�了一些关于vim的信�。
+  3. �存文件，命令为：
+        :write
 
-  本教程是由�自Calorado School of Minese的Michael C. Pierce�Robert K.
-  Ware 所编写的，其中�自Colorado State University的Charles Smith�供了
-  很多创�。编者通信地�是∶
+  下次您�动 Vim 时，编辑器就会有了语法高亮的功能。
+  您�以把您喜欢的��设置添加到这个 vimrc 文件中。
+  �了解更多信�请输入 :help vimrc-intro
 
-	bware@mines.colorado.edu
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+			    第七讲第三节：补全功能
 
-  本教程已由Bram Moolenaar专为vim进行修订。
+
+	      ** 使用 CTRL-D 和 <TAB> �以进行命令行补全 **
+
+  1. 请确� Vim �是在以兼容模��行： :set nocp
+
+  2. 查看一下当�目录下已�存在哪些文件，输入： :!ls   或者  :!dir
+
+  3. 现在输入一个目录的起始部分，例如输入： :e
+
+  4. 接�按 CTRL-D 键，Vim 会显示以 e 开始的命令的列表。
+
+  5. 然�按 <TAB> 键，Vim 会补全命令为 :edit 。
+
+  6. 现在添加一个空格，以�一个已有文件的文件�的起始部分，例如： :edit FIL
+
+  7. 接�按 <TAB> 键，Vim 会补全文件�(如果它是惟一匹�的)。
+
+�示：补全对于许多命令都有效。您�需�试按 CTRL-D 和 <TAB>。
+      它对于 :help 命令�常有用。
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+				  第七讲�结
+
+
+  1. 输入 :help 或者按 <F1> 键或 <Help> 键�以打开帮助窗�。
+
+  2. 输入 :help cmd �以找到关于 cmd 命令的帮助。
+
+  3. 输入 CTRL-W CTRL-W  �以使您在窗�之间跳转。
+
+  4. 输入 :q 以关闭帮助窗�
+
+  5. 您�以创建一个 vimrc �动脚本文件用��存您�好的设置。
+
+  6. 当输入 : 命令时，按 CTRL-D �以查看�能的补全结果。
+     按 <TAB> �以使用一个补全。
 
 
 
-  译制者附言∶
+
+
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  vim 教程到此就结�了。本教程�是为了简明地介�一下 Vim 编辑器，但已足以让您
+  很容易使用这个编辑器了。毋庸质疑，vim还有很多很多的命令，本教程所介
+  �的�离完整的差得很远。所以您�精通的�，还望继续努力哦。下一步您�以阅读
+  Vim 的用户手册，使用的命令是： :help user-manual
+
+  下�这本书值得推�用于更进一步的阅读和学习：
+	Vim - Vi Improved - 作者：Steve Oualline
+	出版社：New Riders
+  这是第一本完全讲解 Vim 的书�。它对于�学者特别有用。其中包�有大�实例
+  和图示。
+  欲知详情，请访问 http://iccf-holland.org/click5.html
+
+  以下这本书比较�了而且内容更多是关于 Vi 而� Vim，但是也值得推�：
+	Learning the Vi Editor - 作者：Linda Lamb
+	出版社：O'Reilly & Associates Inc.
+  这是一本�错的书，通过它您几乎能够了解到任何您想�使用 Vi �的事情。
+  此书的第六个版本也包�了一些关于 Vim 的信�。
+
+  本教程是由�自 Calorado School of Mines 的 Michael C. Pierce 和
+  Robert K. Ware 所编写的，其中很多创�由�自 Colorado State University 的
+  Charles Smith �供。编者的电�邮箱是：bware@mines.colorado.edu
+
+  本教程已由 Bram Moolenaar 专为 Vim 进行修订。
+
+  译制者附言：
   ===========
       简体中文教程翻译版之译制者为�昌泰 <beos@turbolinux.com.cn>，还有
-      �外一个�系地�∶linuxrat@gnuchina.org。
+      �外一个�系地�：linuxrat@gnuchina.org。
 
       �体中文教程是从简体中文教程翻译版使用 Debian GNU/Linux 中文项目�
       组的于广辉先生编写的中文汉字转�器  autoconvert 转�而�的，并对转
       �的结果�了一些细节的改动。
 
-  �更记录∶
+  �更记录：
   =========
+      2012年10月01日 赵涛 <alick9188@gmail.com>
+      将 vimtutor 中译版从 1.5 �级到 1.7。
+
       2002年08月30日 �昌泰 <beos@turbolinux.com.cn>
       感谢 RMS@SMTH 的指正，将多处错误修正。
 
diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt
index 66f102d126..7ba2801b0a 100644
--- a/src/INSTALLpc.txt
+++ b/src/INSTALLpc.txt
@@ -45,6 +45,10 @@ Visual Studio
 Building with Visual Studio (VS 98, VS .NET, VS .NET 2003, VS 2005, and VS 2008)
 is straightforward. (These instructions should also work for VS 4 and VS 5.)
 
+Using VS C++ 2008 Express is recommended, the binaries build with that run on
+nearly all platforms.  Binaries from later versions may not run on Windows 95
+or XP.
+
 To build Vim from the command line with MSVC, use Make_mvc.mak.
 Visual Studio installed a batch file called vcvars32.bat, which you must
 run to set up paths for nmake and MSVC.
@@ -172,6 +176,10 @@ This includes the IDE and the debugger.
 To set the environment execute the msvc2008.bat script.  You can then build
 Vim with Make_mvc.mak.
 
+For building 64 bit binaries you also need to install the SDK:
+"Microsoft Windows SDK for Windows 7 and .NET Framework 3.5 SP1"
+You don't need the examples and documentation.
+
 
 Visual C++ 2010 Express Edition       *msvc-2010-express*
 -------------------------------
@@ -296,10 +304,12 @@ Now you have created the Windows binary from your Linux box!  Have fun...
 6. Building with Python support
 ===============================
 
-(written by Ron Aaron: <ronaharon@yahoo.com>)
+For building with MSVC 2008 the "Windows Installer" from www.python.org
+works fine.
 
-This has been tested with the mingw32 compiler, and the ActiveState
-ActivePython:
+(rest written by Ron Aaron: <ronaharon@yahoo.com>)
+
+Building with the mingw32 compiler, and the ActiveState ActivePython:
     http://www.ActiveState.com/Products/ActivePython/
 
 After installing the ActivePython, you will have to create a 'mingw32'

From fe37037756d91c82aab39ffef0e36ddf8633f7a0 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 21:48:43 +0200
Subject: [PATCH 071/136] updated for version 7.3.681 Problem:    List of
 distributed files picks up backup files. Solution:   Make tutor patterns more
 specific.

---
 Filelist      | 13 ++++++++++---
 src/version.c |  2 ++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Filelist b/Filelist
index b63acd9c2a..b1563eb738 100644
--- a/Filelist
+++ b/Filelist
@@ -693,10 +693,17 @@ LANG_GEN = \
 		runtime/tutor/Makefile \
 		runtime/tutor/tutor.utf-8 \
 		runtime/tutor/tutor.?? \
-		runtime/tutor/tutor.??.* \
-		runtime/tutor/tutor.??_??.* \
+		runtime/tutor/tutor.??.utf-8 \
+		runtime/tutor/tutor.??.euc \
+		runtime/tutor/tutor.??.sjis \
+		runtime/tutor/tutor.??.iso9 \
+		runtime/tutor/tutor.??.big5 \
+		runtime/tutor/tutor.??.cp1250 \
+		runtime/tutor/tutor.??.cp1251 \
+		runtime/tutor/tutor.??.cp737 \
+		runtime/tutor/tutor.??_??.utf-8 \
 		runtime/tutor/tutor.bar \
-		runtime/tutor/tutor.bar.* \
+		runtime/tutor/tutor.bar.utf-8 \
 		runtime/spell/README.txt \
 		runtime/spell/??/*.diff \
 		runtime/spell/??/main.aap \
diff --git a/src/version.c b/src/version.c
index fa453088c3..c991525c4b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    681,
 /**/
     680,
 /**/

From 903fa59d8641da3a843405fef5bef2381ce72641 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 3 Oct 2012 21:48:44 +0200
Subject: [PATCH 072/136] Added tag v7-3-681 for changeset a2fe24ec6a0d

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 133b31690e..988e426b5f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2017,3 +2017,4 @@ ca1c025079b11c98363e11576d903af756a593fc v7-3-673
 de253f606048a2862a338190b071e5e3c7de7a41 v7-3-678
 dd0f25ede9a8322b5b638961835cc4743cd479a2 v7-3-679
 52acec46b75ecf24d044982d4cc067ef7890e7d6 v7-3-680
+a2fe24ec6a0d06d0af286b9fee9e307c33f27cca v7-3-681

From 2c8e96b19f633a478f19eb8a2f51f5cefabd52e3 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 4 Oct 2012 22:38:37 +0200
Subject: [PATCH 073/136] updated for version 7.3.682 Problem:    Compiler
 complains about incompatible types. Solution:   Remove type casts. (hint by
 Danek Duvall)

---
 src/edit.c    | 4 ++--
 src/version.c | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/edit.c b/src/edit.c
index 5fde388f73..9017fd0f31 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -4194,8 +4194,8 @@ ins_compl_get_exp(ini)
 			ins_buf->b_fname == NULL
 			    ? buf_spname(ins_buf)
 			    : ins_buf->b_sfname == NULL
-				? (char *)ins_buf->b_fname
-				: (char *)ins_buf->b_sfname);
+				? ins_buf->b_fname
+				: ins_buf->b_sfname);
 		(void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R));
 	    }
 	    else if (*e_cpt == NUL)
diff --git a/src/version.c b/src/version.c
index c991525c4b..143657e343 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    682,
 /**/
     681,
 /**/

From bf280ae759f9487239284f180a652c40cfdca882 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 4 Oct 2012 22:38:37 +0200
Subject: [PATCH 074/136] Added tag v7-3-682 for changeset 8eb5b61161b4

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 988e426b5f..4eb681b384 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2018,3 +2018,4 @@ de253f606048a2862a338190b071e5e3c7de7a41 v7-3-678
 dd0f25ede9a8322b5b638961835cc4743cd479a2 v7-3-679
 52acec46b75ecf24d044982d4cc067ef7890e7d6 v7-3-680
 a2fe24ec6a0d06d0af286b9fee9e307c33f27cca v7-3-681
+8eb5b61161b4c56b378ec829e360204102d22db4 v7-3-682

From e640d952a635ce28ad8ee9b68f6af7a2a1c8a2d9 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 5 Oct 2012 21:30:07 +0200
Subject: [PATCH 075/136] updated for version 7.3.683 Problem:    ":python" may
 crash when vimbindeval() returns None. Solution:   Check for v_string to be
 NULL. (Yukihiro Nakadaira)

---
 src/if_py_both.h | 9 ++++++---
 src/version.c    | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/if_py_both.h b/src/if_py_both.h
index 0a1ef1b9e6..2398e812c2 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -351,7 +351,8 @@ VimToPython(typval_T *our_tv, int depth, PyObject *lookupDict)
 
     if (our_tv->v_type == VAR_STRING)
     {
-	result = Py_BuildValue("s", our_tv->vval.v_string);
+	result = Py_BuildValue("s", our_tv->vval.v_string == NULL
+					? "" : (char *)our_tv->vval.v_string);
     }
     else if (our_tv->v_type == VAR_NUMBER)
     {
@@ -2751,7 +2752,8 @@ ConvertToPyObject(typval_T *tv)
     switch (tv->v_type)
     {
 	case VAR_STRING:
-	    return PyBytes_FromString((char *) tv->vval.v_string);
+	    return PyBytes_FromString(tv->vval.v_string == NULL
+					    ? "" : (char *)tv->vval.v_string);
 	case VAR_NUMBER:
 	    return PyLong_FromLong((long) tv->vval.v_number);
 #ifdef FEAT_FLOAT
@@ -2763,7 +2765,8 @@ ConvertToPyObject(typval_T *tv)
 	case VAR_DICT:
 	    return DictionaryNew(tv->vval.v_dict);
 	case VAR_FUNC:
-	    return FunctionNew(tv->vval.v_string);
+	    return FunctionNew(tv->vval.v_string == NULL
+					  ? (char_u *)"" : tv->vval.v_string);
 	case VAR_UNKNOWN:
 	    Py_INCREF(Py_None);
 	    return Py_None;
diff --git a/src/version.c b/src/version.c
index 143657e343..62e0f4b1a8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    683,
 /**/
     682,
 /**/

From f772344cd9d3ec19cb1494a353ae36bcc04e42da Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 5 Oct 2012 21:30:08 +0200
Subject: [PATCH 076/136] Added tag v7-3-683 for changeset 0f5ee2629635

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 4eb681b384..b4023980df 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2019,3 +2019,4 @@ dd0f25ede9a8322b5b638961835cc4743cd479a2 v7-3-679
 52acec46b75ecf24d044982d4cc067ef7890e7d6 v7-3-680
 a2fe24ec6a0d06d0af286b9fee9e307c33f27cca v7-3-681
 8eb5b61161b4c56b378ec829e360204102d22db4 v7-3-682
+0f5ee262963528ddccfa1f54b83696f939d21b53 v7-3-683

From 36d03895060cac8f537d0f67faf4e7dbee0ae063 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 5 Oct 2012 22:26:30 +0200
Subject: [PATCH 077/136] Updated runtime files.

---
 runtime/doc/todo.txt          |  12 +-
 runtime/filetype.vim          |   7 +-
 runtime/syntax/aptconf.vim    | 493 ++++++++++++++++++++++++++++++++++
 runtime/syntax/asn.vim        |   7 +-
 runtime/syntax/css.vim        |   8 +-
 runtime/syntax/dts.vim        |  26 ++
 runtime/syntax/gdb.vim        |  13 +-
 runtime/syntax/html.vim       |  25 +-
 runtime/syntax/java.vim       |  15 +-
 runtime/syntax/javacc.vim     |   9 +-
 runtime/syntax/javascript.vim |   7 +-
 runtime/syntax/make.vim       |  14 +-
 runtime/tutor/tutor.ja.euc    |   2 +-
 runtime/tutor/tutor.ja.sjis   |   2 +-
 runtime/tutor/tutor.ja.utf-8  |   2 +-
 15 files changed, 610 insertions(+), 32 deletions(-)
 create mode 100644 runtime/syntax/aptconf.vim
 create mode 100644 runtime/syntax/dts.vim

diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 275b7ac45a..b0fa84147b 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 Oct 03
+*todo.txt*      For Vim version 7.3.  Last change: 2012 Oct 04
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -34,6 +34,11 @@ not be repeated below, unless there is extra information.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+Patch with Test for patch  7.3.673 (Christian Brabandt, 2012 Oct 3)
+
+Patch for C-\ e when editing expression. (Christian Brabandt, 2012 Oct 3)
+Correction by ZyX.
+
 Go through more coverity reports.
 
 Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
@@ -81,6 +86,8 @@ Aug 16)
 the order they were made.  Also ":gredo".  Both with a count.  Useful when
 tests fail after making changes and you forgot in which files.
 
+Patch to make updating tabline faster. (Arseny Kapoulkine, 2012 Oct 3)
+
 Crash with vimdiff. (Don Cruickshank, 2012 Sep 23)
 
 Win32: use 'guifontwide' for IME composition. (Taro Muraoka, 2012 Sep 30)
@@ -118,6 +125,9 @@ MS-Windows: Crash opening very long file name starting with "\\".
 Win32: patch for current directory, "loading iof conv". (Ken Takata, 2012 Sep
 15)
 
+It's probably a good idea to make a negative value for 'sts' use the value of
+'sw'.  Patch by So8res, Oct 3 2012
+
 Syntax update problem in one buffer opened in two windows, bottom window is
 not correctly updated. (Paul Harris, 2012 Feb 27)
 
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 5010d68773..8162acec81 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 03
+" Last Change:	2012 Oct 05
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -128,6 +128,11 @@ au BufNewFile,BufRead .asoundrc,*/usr/share/alsa/alsa.conf,*/etc/asound.conf set
 " Arc Macro Language
 au BufNewFile,BufRead *.aml			setf aml
 
+" APT config file
+au BufNewFile,BufRead apt.conf                 setf aptconf
+au BufNewFile,BufRead */.aptitude/config       setf aptconf
+au BufNewFile,BufRead */etc/apt/apt.conf.d/{[-_[:alnum:]]\+,[-_.[:alnum:]]\+.conf} setf aptconf
+
 " Arch Inventory file
 au BufNewFile,BufRead .arch-inventory,=tagging-method	setf arch
 
diff --git a/runtime/syntax/aptconf.vim b/runtime/syntax/aptconf.vim
new file mode 100644
index 0000000000..40fe92b3ef
--- /dev/null
+++ b/runtime/syntax/aptconf.vim
@@ -0,0 +1,493 @@
+" Vim syntax file
+" Language:	APT config file
+" Maintainer:	Yann Amar <quidame@poivron.org>
+" Last Change:	2012 Oct 05
+
+" For version 5.x: Clear all syntax items
+" For version 6.x and 7.x: Quit when a syntax file was already loaded
+if !exists("main_syntax")
+  if version < 600
+    syntax clear
+  elseif exists("b:current_syntax")
+    finish
+  endif
+  let main_syntax = 'aptconf'
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Errors:
+" Catch all that is not overridden by next rules/items:
+syn match	aptconfError		display '[^[:blank:]]'
+syn match	aptconfError		display '^[^[:blank:]][^:{]*'
+
+" Options:
+" Define a general regular expression for the options that are not defined
+" later as keywords. Following apt.conf(5), we know that options are case
+" insensitive, and can contain alphanumeric characters and '/-:._+'; we
+" assume that there can not be consecutive colons (::) which is used as
+" syntax operator; we also assume that an option name can not start or end
+" by a colon.
+syn case	ignore
+syn match	aptconfRegexpOpt	'[-[:alnum:]/.+_]\+\(:[-[:alnum:]/.+_]\+\)*' contained display
+
+" Keywords:
+setlocal iskeyword+=/,-,.,_,+
+"setlocal iskeyword+=: is problematic, because of the '::' separator
+
+" Incomplete keywords will be treated differently than completely bad strings:
+syn keyword	aptconfGroupIncomplete
+	\ a[cquire] a[ptitude] d[ebtags] d[ebug] d[ir] d[pkg] d[select]
+	\ o[rderlist] p[ackagemanager] p[kgcachegen] q[uiet] r[pm]
+	\ u[nattended-upgrade]
+
+" Only the following keywords can be used at toplevel (to begin an option):
+syn keyword	aptconfGroup
+	\ acquire apt aptitude debtags debug dir dpkg dselect
+	\ orderlist packagemanager pkgcachegen quiet rpm
+	\ unattended-upgrade
+
+" Possible options for each group:
+" Acquire: {{{
+syn keyword	aptconfAcquire contained
+	\ cdrom Check-Valid-Until CompressionTypes ForceHash ftp gpgv
+	\ GzipIndexes http https Languages Max-ValidTime Min-ValidTime PDiffs
+	\ Queue-Mode Retries Source-Symlinks
+
+syn keyword	aptconfAcquireCDROM contained
+	\ AutoDetect CdromOnly Mount UMount
+
+syn keyword	aptconfAcquireCompressionTypes contained
+	\ bz2 lzma gz Order
+
+syn keyword	aptconfAcquireFTP contained
+	\ Passive Proxy ProxyLogin Timeout
+
+syn keyword	aptconfAcquireHTTP contained
+	\ AllowRedirect Dl-Limit Max-Age No-Cache No-Store Pipeline-Depth
+	\ Proxy Timeout User-Agent
+
+syn keyword	aptconfAcquireHTTPS contained
+	\ CaInfo CaPath CrlFile IssuerCert SslCert SslForceVersion SslKey
+	\ Verify-Host Verify-Peer
+
+syn keyword	aptconfAcquireMaxValidTime contained
+	\ Debian Debian-Security
+
+syn keyword	aptconfAcquirePDiffs contained
+	\ FileLimit SizeLimit
+
+syn cluster	aptconfAcquire_ contains=aptconfAcquire,
+	\ aptconfAcquireCDROM,aptconfAcquireCompressionTypes,aptconfAcquireFTP,
+	\ aptconfAcquireHTTP,aptconfAcquireHTTPS,aptconfAcquireMaxValidTime,
+	\ aptconfAcquirePDiffs
+" }}}
+" Apt: {{{
+syn keyword	aptconfApt contained
+	\ Architecture Architectures Archive Authentication AutoRemove
+	\ Build-Essential Cache Cache-Grow Cache-Limit Cache-Start CDROM
+	\ Changelogs Clean-Installed Compressor Default-Release
+	\ Force-LoopBreak Get Ignore-Hold Immediate-Configure
+	\ Install-Recommends Install-Suggests Keep-Fds List-Cleanup
+	\ NeverAutoRemove Never-MarkAuto-Sections Periodic Status-Fd Update
+
+syn keyword	aptconfAptAuthentication contained
+	\ TrustCDROM
+
+syn keyword	aptconfAptAutoRemove contained
+	\ RecommendsImportant SuggestsImportant
+
+syn keyword	aptconfAptCache contained
+	\ AllNames AllVersions Generate GivenOnly Important Installed NamesOnly
+	\ RecurseDepends ShowFull
+
+syn keyword	aptconfAptCDROM contained
+	\ Fast NoAct NoMount Rename
+
+syn keyword	aptconfAptChangelogs contained
+	\ Server
+
+syn keyword	aptconfAptCompressor contained
+	\ bzip2 gzip lzma xz
+
+syn keyword	aptconfAptCompressorAll contained
+	\ Binary CompressArg Cost Extension Name UncompressArg
+
+syn keyword	aptconfAptGet contained
+	\ AllowUnauthenticated Arch-Only Assume-No Assume-Yes AutomaticRemove
+	\ Build-Dep-Automatic Compile Diff-Only Download Download-Only Dsc-Only
+	\ Fix-Broken Fix-Missing Force-Yes HideAutoRemove Host-Architecture
+	\ List-Cleanup Only-Source Print-URIs Purge ReInstall Remove
+	\ Show-Upgraded Show-User-Simulation-Note Show-Versions Simulate
+	\ Tar-Only Trivial-Only Upgrade
+
+syn keyword	aptconfAptPeriodic contained
+	\ AutocleanInterval BackupArchiveInterval BackupLevel
+	\ Download-Upgradeable-Packages MaxAge MaxSize MinAge
+	\ Unattended-Upgrade Update-Package-Lists Verbose
+
+syn keyword	aptconfAptUpdate contained
+	\ Pre-Invoke Post-Invoke Post-Invoke-Success
+
+syn cluster	aptconfApt_ contains=aptconfApt,
+	\ aptconfAptAuthentication,aptconfAptAutoRemove,aptconfAptCache,
+	\ aptconfAptCDROM,aptconfAptChangelogs,aptconfAptCompressor,
+	\ aptconfAptCompressorAll,aptconfAptGet,aptconfAptPeriodic,
+	\ aptconfAptUpdate
+" }}}
+" Aptitude: {{{
+syn keyword	aptconfAptitude contained
+	\ Allow-Null-Upgrade Always-Use-Safe-Resolver Autoclean-After-Update
+	\ Auto-Install Auto-Fix-Broken Cmdline Debtags-Binary
+	\ Debtags-Update-Options Delete-Unused Delete-Unused-Pattern
+	\ Display-Planned-Action Forget-New-On-Install Forget-New-On-Update
+	\ Get-Root-Command Ignore-Old-Tmp Ignore-Recommends-Important
+	\ Keep-Recommends Keep-Suggests Keep-Unused-Pattern LockFile Log
+	\ Logging Parse-Description-Bullets Pkg-Display-Limit ProblemResolver
+	\ Purge-Unused Recommends-Important Safe-Resolver Screenshot Sections
+	\ Simulate Spin-Interval Suggests-Important Suppress-Read-Only-Warning
+	\ Theme Track-Dselect-State UI Warn-Not-Root
+
+syn keyword	aptconfAptitudeCmdline contained
+	\ Always-Prompt Assume-Yes Disable-Columns Download-Only Fix-Broken
+	\ Ignore-Trust-Violations Package-Display-Format Package-Display-Width
+	\ Progress Request-Strictness Resolver-Debug Resolver-Dump
+	\ Resolver-Show-Steps Safe-Upgrade Show-Deps Show-Size-Changes
+	\ Show-Versions Show-Why Simulate Verbose Version-Display-Format
+	\ Versions-Group-By Versions-Show-Package-Names Visual-Preview
+	\ Why-Display-Mode
+
+syn keyword	aptconfAptitudeCmdlineProgress contained
+	\ Percent-On-Right Retain-Completed
+
+syn keyword	aptconfAptitudeCmdlineSafeUpgrade contained
+	\ No-New-Installs
+
+syn keyword	aptconfAptitudeLogging contained
+	\ File Levels
+
+syn keyword	aptconfAptitudeProblemResolver contained
+	\ Allow-Break-Holds BreakHoldScore Break-Hold-Level BrokenScore
+	\ DefaultResolutionScore Discard-Null-Solution
+	\ EssentialRemoveScore ExtraScore FullReplacementScore FutureHorizon
+	\ Hints ImportantScore Infinity InstallScore Keep-All-Level KeepScore
+	\ NonDefaultScore Non-Default-Level OptionalScore PreserveAutoScore
+	\ PreserveManualScore RemoveScore Remove-Essential-Level Remove-Level
+	\ RequiredScore ResolutionScore Safe-Level SolutionCost StandardScore
+	\ StepLimit StepScore Trace-Directory Trace-File
+	\ UndoFullReplacementScore UnfixedSoftScore UpgradeScore
+
+syn keyword	aptconfAptitudeSafeResolver contained
+	\ No-New-Installs No-New-Upgrades Show-Resolver-Actions
+
+syn keyword	aptconfAptitudeScreenshot contained
+	\ Cache-Max IncrementalLoadLimit
+
+syn keyword	aptconfAptitudeSections contained
+	\ Descriptions Top-Sections
+
+syn keyword	aptconfAptitudeUI contained
+	\ Advance-On-Action Auto-Show-Reasons Default-Grouping
+	\ Default-Package-View Default-Preview-Grouping Default-Sorting
+	\ Description-Visible-By-Default Exit-On-Last-Close Fill-Text
+	\ Flat-View-As-First-View HelpBar Incremental-Search InfoAreaTabs
+	\ KeyBindings MenuBar-Autohide Minibuf-Download-Bar Minibuf-Prompts
+	\ New-package-Commands Package-Display-Format Package-Header-Format
+	\ Package-Status-Format Pause-After-Download Preview-Limit
+	\ Prompt-On-Exit Styles ViewTabs
+
+syn keyword	aptconfAptitudeUIStyles contained
+	\ Bullet ChangeLogNewerVersion Default DepBroken DisabledMenuEntry
+	\ DownloadHit DownloadProgress EditLine Error Header HighlightedMenuBar
+	\ HighlightedMenuEntry MediaChange MenuBar MenuBorder MenuEntry
+	\ MineBomb MineBorder MineFlag MineNumber1 MineNumber2 MineNumber3
+	\ MineNumber4 MineNumber5 MineNumber6 MineNumber7 MineNumber8
+	\ MultiplexTab MultiplexTabHighlighted PkgBroken PkgBrokenHighlighted
+	\ PkgIsInstalled PkgIsInstalledHighlighted PkgNotInstalled
+	\ PkgNotInstalledHighlighted PkgToDowngrade PkgToDowngradeHighlighted
+	\ PkgToHold PkgToHoldHighlighted PkgToInstall PkgToInstallHighlighted
+	\ PkgToRemove PkgToRemoveHighlighted PkgToUpgrade
+	\ PkgToUpgradeHighlighted Progress SolutionActionApproved
+	\ SolutionActionRejected Status TreeBackground TrustWarning
+
+syn keyword	aptconfAptitudeUIStylesElements contained
+	\ bg clear fg flip set
+
+syn cluster	aptconfAptitude_ contains=aptconfAptitude,
+	\ aptconfAptitudeCmdline,aptconfAptitudeCmdlineProgress,
+	\ aptconfAptitudeCmdlineSafeUpgrade,aptconfAptitudeLogging,
+	\ aptconfAptitudeProblemResolver,aptconfAptitudeSafeResolver,
+	\ aptconfAptitudeScreenshot,aptconfAptitudeSections,aptconfAptitudeUI,
+	\ aptconfAptitudeUIStyles,aptconfAptitudeUIStylesElements
+" }}}
+" DebTags: {{{
+syn keyword	aptconfDebTags contained
+	\ Vocabulary
+
+syn cluster	aptconfDebTags_ contains=aptconfDebTags
+" }}}
+" Debug: {{{
+syn keyword	aptconfDebug contained
+	\ Acquire aptcdrom BuildDeps Hashes IdentCdrom Nolocking
+	\ pkgAcquire pkgAutoRemove pkgCacheGen pkgDepCache pkgDPkgPM
+	\ pkgDPkgProgressReporting pkgInitialize pkgOrderList
+	\ pkgPackageManager pkgPolicy pkgProblemResolver sourceList
+
+syn keyword	aptconfDebugAcquire contained
+	\ cdrom Ftp gpgv Http Https netrc
+
+syn keyword	aptconfDebugPkgAcquire contained
+	\ Auth Diffs RRed Worker
+
+syn keyword	aptconfDebugPkgDepCache contained
+	\ AutoInstall Marker
+
+syn keyword	aptconfDebugPkgProblemResolver contained
+	\ ShowScores
+
+syn cluster	aptconfDebug_ contains=aptconfDebug,
+	\ aptconfDebugAcquire,aptconfDebugPkgAcquire,aptconfDebugPkgDepCache,
+	\ aptconfDebugPkgProblemResolver
+" }}}
+" Dir: {{{
+syn keyword	aptconfDir contained
+	\ Aptitude Bin Cache Etc Ignore-Files-Silently Log Media Parts RootDir
+	\ State
+
+syn keyword	aptconfDirAptitude contained
+	\ state
+
+syn keyword	aptconfDirBin contained
+	\ apt-get apt-cache dpkg dpkg-buildpackage dpkg-source gpg gzip Methods
+	\ solvers
+
+syn keyword	aptconfDirCache contained
+	\ Archives Backup pkgcache srcpkgcache
+
+syn keyword	aptconfDirEtc contained
+	\ Main Netrc Parts Preferences PreferencesParts SourceList SourceParts
+	\ VendorList VendorParts Trusted TrustedParts
+
+syn keyword	aptconfDirLog contained
+	\ History Terminal
+
+syn keyword	aptconfDirMedia contained
+	\ MountPath
+
+syn keyword	aptconfDirState contained
+	\ cdroms extended_states Lists mirrors status
+
+syn cluster	aptconfDir_ contains=aptconfDir,
+	\ aptconfDirAptitude,aptconfDirBin,aptconfDirCache,aptconfDirEtc,
+	\ aptconfDirLog,aptconfDirMedia,aptconfDirState
+" }}}
+" DPkg: {{{
+syn keyword	aptconfDPkg contained
+	\ Build-Options Chroot-Directory ConfigurePending FlushSTDIN MaxArgs
+	\ MaxBytes NoTriggers options Pre-Install-Pkgs Pre-Invoke Post-Invoke
+	\ Run-Directory StopOnError Tools TriggersPending
+
+syn keyword	aptconfDPkgTools contained
+	\ Options Version
+
+syn cluster	aptconfDPkg_ contains=aptconfDPkg,
+	\ aptconfDPkgOrderList,aptconfDPkgOrderListScore,aptconfDPkgTools
+" }}}
+" DSelect: {{{
+syn keyword	aptconfDSelect contained
+	\ CheckDir Clean Options PromptAfterUpdate UpdateOptions
+
+syn cluster	aptconfDSelect_ contains=aptconfDSelect
+" }}}
+" OrderList: {{{
+syn keyword	aptconfOrderList contained
+	\ Score
+
+syn keyword	aptconfOrderListScore contained
+	\ Delete Essential Immediate PreDepends
+
+syn cluster	aptconfOrderList_ contains=aptconfOrderList,
+	\ aptconfOrderListScore
+" }}}
+" PackageManager: {{{
+syn keyword	aptconfPackageManager contained
+	\ Configure
+
+syn cluster	aptconfPackageManager_ contains=aptconfPackageManager
+" }}}
+" PkgCacheGen: {{{
+syn keyword	aptconfPkgCacheGen contained
+	\ Essential
+
+syn cluster	aptconfPkgCacheGen_ contains=aptconfPkgCacheGen
+" }}}
+" Quiet: {{{
+syn keyword	aptconfQuiet contained
+	\ NoUpdate
+
+syn cluster	aptconfQuiet_ contains=aptconfQuiet
+" }}}
+" Rpm: {{{
+syn keyword	aptconfRpm contained
+	\ Post-Invoke Pre-Invoke
+
+syn cluster	aptconfRpm_ contains=aptconfRpm
+" }}}
+" Unattened Upgrade: {{{
+syn keyword	aptconfUnattendedUpgrade contained
+	\ AutoFixInterruptedDpkg Automatic-Reboot InstallOnShutdown Mail
+	\ MailOnlyOnError MinimalSteps Origins-Pattern Package-Blacklist
+	\ Remove-Unused-Dependencies
+
+syn cluster	aptconfUnattendedUpgrade_ contains=aptconfUnattendedUpgrade
+" }}}
+
+syn case	match
+
+" Now put all the keywords (and 'valid' options) in a single cluster:
+syn cluster	aptconfOptions contains=aptconfRegexpOpt,
+	\ @aptconfAcquire_,@aptconfApt_,@aptconfAptitude_,@aptconfDebTags_,
+	\ @aptconfDebug_,@aptconfDir_,@aptconfDPkg_,@aptconfDSelect_,
+	\ @aptconfOrderList_,@aptconfPackageManager_,@aptconfPkgCacheGen_,
+	\ @aptconfQuiet_,@aptconfRpm_,@aptconfUnattendedUpgrade_
+
+" Syntax:
+syn match	aptconfSemiColon	';'
+syn match	aptconfDoubleColon	'::'
+syn match	aptconfCurlyBraces	'[{}]'
+syn region	aptconfValue		start='"' end='"' oneline display
+syn region	aptconfInclude		matchgroup=aptconfOperator start='{' end='}' contains=ALLBUT,aptconfGroup,aptconfGroupIncomplete,@aptconfCommentSpecial
+syn region	aptconfInclude		matchgroup=aptconfOperator start='::' end='{'me=s-1 contains=@aptconfOptions,aptconfError display
+syn region	aptconfInclude		matchgroup=aptconfOperator start='::' end='::\|\s'me=s-1 oneline contains=@aptconfOptions,aptconfError display
+
+" Basic Syntax Errors: XXX avoid to generate false positives !!!
+"
+" * Invalid comment format (seems to not cause errors, but...):
+syn match	aptconfAsError		display '^#.*'
+"
+" * When a semicolon is missing after a double-quoted string:
+" There are some cases (for example in the Dir group of options, but not only)
+" where this syntax is valid. So we don't treat it as a strict error.
+syn match	aptconfAsError		display '"[^"]*"[^;]'me=e-1
+syn match	aptconfAsError		display '"[^"]*"$'
+"
+" * When double quotes are missing around a value (before a semicolon):
+" This omission has no effect if the value is a single string (without blank
+" characters). But apt.conf(5) says that quotes are required, and this item
+" avoids to match unquoted keywords.
+syn match	aptconfAsError		display '\s[^"[:blank:]]*[^}"];'me=e-1
+"
+" * When only one double quote is missing around a value (before a semicolon):
+" No comment for that: it must be highly visible.
+syn match	aptconfError		display '\(\s\|;\)"[^"[:blank:]]\+;'me=e-1
+syn match	aptconfError		display '\(\s\|;\)[^"[:blank:]]\+";'me=e-1
+"
+" * When space is missing between option and (quoted) value:
+" TODO (partially implemented)
+syn match	aptconfError		display '::[^[:blank:]]*"'
+
+" Special Actions:
+syn match	aptconfAction		'^#\(clear\|include\)\>'
+syn region	aptconfAction		matchgroup=aptconfAction start='^#clear\>' end=';'me=s-1 oneline contains=aptconfGroup,aptconfDoubleColon,@aptconfOptions
+syn region	aptconfAction		matchgroup=aptconfAction start='^#include\>' end=';'me=s-1 oneline contains=aptconfRegexpOpt
+
+" Comments:
+syn keyword	aptconfTodo		TODO FIXME NOTE XXX contained
+syn cluster	aptconfCommentSpecial	contains=@Spell,aptconfTodo
+syn match	aptconfComment		'//.*' contains=@aptconfCommentSpecial
+syn region	aptconfComment		start='/\*' end='\*/' contains=@aptconfCommentSpecial
+
+" Highlight Definitions:
+hi def link aptconfTodo				Todo
+hi def link aptconfError			Error
+hi def link aptconfComment			Comment
+hi def link aptconfOperator			Operator
+
+hi def link aptconfAction			PreProc
+hi def link aptconfOption			Type
+hi def link aptconfValue			String
+hi def link aptconfRegexpOpt			Normal
+hi def link aptconfAsError			Special
+
+hi def link aptconfSemiColon			aptconfOperator
+hi def link aptconfDoubleColon			aptconfOperator
+hi def link aptconfCurlyBraces			aptconfOperator
+
+hi def link aptconfGroupIncomplete		Special
+hi def link aptconfGroup			aptconfOption
+
+hi def link aptconfAcquire			aptconfOption
+hi def link aptconfAcquireCDROM			aptconfOption
+hi def link aptconfAcquireCompressionTypes	aptconfOption
+hi def link aptconfAcquireFTP			aptconfOption
+hi def link aptconfAcquireHTTP			aptconfOption
+hi def link aptconfAcquireHTTPS			aptconfOption
+hi def link aptconfAcquireMaxValidTime		aptconfOption
+hi def link aptconfAcquirePDiffs		aptconfOption
+
+hi def link aptconfApt				aptconfOption
+hi def link aptconfAptAuthentication		aptconfOption
+hi def link aptconfAptAutoRemove		aptconfOption
+hi def link aptconfAptCache			aptconfOption
+hi def link aptconfAptCDROM			aptconfOption
+hi def link aptconfAptChangelogs		aptconfOption
+hi def link aptconfAptCompressor		aptconfOption
+hi def link aptconfAptCompressorAll		aptconfOption
+hi def link aptconfAptGet			aptconfOption
+hi def link aptconfAptPeriodic			aptconfOption
+hi def link aptconfAptUpdate			aptconfOption
+
+hi def link aptconfAptitude			aptconfOption
+hi def link aptconfAptitudeCmdline		aptconfOption
+hi def link aptconfAptitudeCmdlineProgress	aptconfOption
+hi def link aptconfAptitudeCmdlineSafeUpgrade	aptconfOption
+hi def link aptconfAptitudeLogging		aptconfOption
+hi def link aptconfAptitudeProblemResolver	aptconfOption
+hi def link aptconfAptitudeSafeResolver		aptconfOption
+hi def link aptconfAptitudeScreenshot		aptconfOption
+hi def link aptconfAptitudeSections		aptconfOption
+hi def link aptconfAptitudeUI			aptconfOption
+hi def link aptconfAptitudeUIStyles		aptconfOption
+hi def link aptconfAptitudeUIStylesElements	aptconfOption
+
+hi def link aptconfDebTags			aptconfOption
+
+hi def link aptconfDebug			aptconfOption
+hi def link aptconfDebugAcquire			aptconfOption
+hi def link aptconfDebugPkgAcquire		aptconfOption
+hi def link aptconfDebugPkgDepCache		aptconfOption
+hi def link aptconfDebugPkgProblemResolver	aptconfOption
+
+hi def link aptconfDir				aptconfOption
+hi def link aptconfDirAptitude			aptconfOption
+hi def link aptconfDirBin			aptconfOption
+hi def link aptconfDirCache			aptconfOption
+hi def link aptconfDirEtc			aptconfOption
+hi def link aptconfDirLog			aptconfOption
+hi def link aptconfDirMedia			aptconfOption
+hi def link aptconfDirState			aptconfOption
+
+hi def link aptconfDPkg				aptconfOption
+hi def link aptconfDPkgTools			aptconfOption
+
+hi def link aptconfDSelect			aptconfOption
+
+hi def link aptconfOrderList			aptconfOption
+hi def link aptconfOrderListScore		aptconfOption
+
+hi def link aptconfPackageManager		aptconfOption
+
+hi def link aptconfPkgCacheGen			aptconfOption
+
+hi def link aptconfQuiet			aptconfOption
+
+hi def link aptconfRpm				aptconfOption
+
+hi def link aptconfUnattendedUpgrade		aptconfOption
+
+let b:current_syntax = "aptconf"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
diff --git a/runtime/syntax/asn.vim b/runtime/syntax/asn.vim
index 9fc3d24682..28c8efba95 100644
--- a/runtime/syntax/asn.vim
+++ b/runtime/syntax/asn.vim
@@ -2,7 +2,7 @@
 " Language:	ASN.1
 " Maintainer:	Claudio Fleiner <claudio@fleiner.com>
 " URL:		http://www.fleiner.com/vim/syntax/asn.vim
-" Last Change:	2001 Apr 26
+" Last Change:	2012 Oct 05
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -12,6 +12,9 @@ elseif exists("b:current_syntax")
   finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 " keyword definitions
 syn keyword asnExternal		DEFINITIONS BEGIN END IMPORTS EXPORTS FROM
 syn match   asnExternal		"\<IMPLICIT\s\+TAGS\>"
@@ -76,6 +79,8 @@ if version >= 508 || !exists("did_asn_syn_inits")
   delcommand HiLink
 endif
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
 let b:current_syntax = "asn"
 
 " vim: ts=8
diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim
index 324dce3cc8..df7f2a1aae 100644
--- a/runtime/syntax/css.vim
+++ b/runtime/syntax/css.vim
@@ -5,7 +5,7 @@
 "               Yeti            (Add full CSS2, HTML4 support)
 "               Nikolai Weibull (Add CSS2 support)
 " Maintainer:   Jules Wang      <w.jq0722@gmail.com>
-" Last Change:  2012 Aug 21
+" Last Change:  2012 Oct 05
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -18,6 +18,9 @@ endif
   let main_syntax = 'css'
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 syn case ignore
 
 " All HTML4 tags
@@ -449,6 +452,7 @@ if main_syntax == 'css'
   unlet main_syntax
 endif
 
-
+let &cpo = s:cpo_save
+unlet s:cpo_save
 " vim: ts=8
 
diff --git a/runtime/syntax/dts.vim b/runtime/syntax/dts.vim
new file mode 100644
index 0000000000..84e37aea95
--- /dev/null
+++ b/runtime/syntax/dts.vim
@@ -0,0 +1,26 @@
+" Vim syntax file
+" Language:	dts/dtsi (device tree files)
+" Maintainer:	Daniel Mack <vim@zonque.org>
+" Last Change:	2012 Oct 04
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syntax region dtsComment        start="/\*"  end="\*/"
+syntax match  dtsReference      "&[[:alpha:][:digit:]_]\+"
+syntax region dtsBinaryProperty start="\[" end="\]" 
+syntax match  dtsStringProperty "\".*\""
+syntax match  dtsKeyword        "/.*/"
+syntax match  dtsLabel          "^[[:space:]]*[[:alpha:][:digit:]_]\+:"
+syntax region dtsCellProperty   start="<" end=">" contains=dtsReference,dtsBinaryProperty,dtsStringProperty,dtsComment
+syntax region dtsCommentInner   start="/\*"  end="\*/"
+
+hi def link dtsCellProperty     Number
+hi def link dtsBinaryProperty   Number
+hi def link dtsStringProperty   String
+hi def link dtsKeyword          Include
+hi def link dtsLabel            Label
+hi def link dtsReference        Macro
+hi def link dtsComment          Comment
+hi def link dtsCommentInner     Comment 
diff --git a/runtime/syntax/gdb.vim b/runtime/syntax/gdb.vim
index aada70e547..64e89cce7f 100644
--- a/runtime/syntax/gdb.vim
+++ b/runtime/syntax/gdb.vim
@@ -2,7 +2,7 @@
 " Language:	GDB command files
 " Maintainer:	Claudio Fleiner <claudio@fleiner.com>
 " URL:		http://www.fleiner.com/vim/syntax/gdb.vim
-" Last Change:	2009 May 25
+" Last Change:	2012 Oct 05
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -12,6 +12,9 @@ elseif exists("b:current_syntax")
   finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 syn keyword gdbInfo contained address architecture args breakpoints catch common copying dcache
 syn keyword gdbInfo contained display files float frame functions handle line
 syn keyword gdbInfo contained locals program registers scope set sharedlibrary signals
@@ -32,7 +35,7 @@ syn match gdbFuncDef "\<define\>.*"
 syn match gdbStatmentContainer "^\s*\S\+" contains=gdbStatement,gdbFuncDef
 syn match gdbStatement "^\s*info" nextgroup=gdbInfo skipwhite skipempty
 
-" some commonly used abreviations
+" some commonly used abbreviations
 syn keyword gdbStatement c disp undisp disas p
 
 syn region gdbDocument matchgroup=gdbFuncDef start="\<document\>.*$" matchgroup=gdbFuncDef end="^end\s*$"
@@ -65,12 +68,12 @@ syn match gdbSet "\<input-radix\>"
 syn match gdbSet "\<demangle-style\>"
 syn match gdbSet "\<output-radix\>"
 
-syn match gdbComment "^\s*#.*"
+syn match gdbComment "^\s*#.*" contains=@Spell
 
 syn match gdbVariable "\$\K\k*"
 
 " Strings and constants
-syn region  gdbString		start=+"+  skip=+\\\\\|\\"+  end=+"+
+syn region  gdbString		start=+"+  skip=+\\\\\|\\"+  end=+"+ contains=@Spell
 syn match   gdbCharacter	"'[^']*'" contains=gdbSpecialChar,gdbSpecialCharError
 syn match   gdbCharacter	"'\\''" contains=gdbSpecialChar
 syn match   gdbCharacter	"'[^\\]'"
@@ -108,4 +111,6 @@ endif
 
 let b:current_syntax = "gdb"
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
 " vim: ts=8
diff --git a/runtime/syntax/html.vim b/runtime/syntax/html.vim
index 137c13c5b0..d59126dede 100644
--- a/runtime/syntax/html.vim
+++ b/runtime/syntax/html.vim
@@ -2,7 +2,7 @@
 " Language:	HTML
 " Maintainer:	Claudio Fleiner <claudio@fleiner.com>
 " URL:		http://www.fleiner.com/vim/syntax/html.vim
-" Last Change:  2006 Jun 19
+" Last Change:	2012 Oct 05
 
 " Please check :help html.vim for some comments and a description of the options
 
@@ -17,6 +17,9 @@ if !exists("main_syntax")
   let main_syntax = 'html'
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 " don't use standard HiLink, it will not work with included syntax files
 if version < 508
   command! -nargs=+ HtmlHiLink hi link <args>
@@ -37,7 +40,7 @@ syn region  htmlString   contained start=+"+ end=+"+ contains=htmlSpecialChar,ja
 syn region  htmlString   contained start=+'+ end=+'+ contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc
 syn match   htmlValue    contained "=[\t ]*[^'" \t>][^ \t>]*"hs=s+1   contains=javaScriptExpression,@htmlPreproc
 syn region  htmlEndTag             start=+</+      end=+>+ contains=htmlTagN,htmlTagError
-syn region  htmlTag                start=+<[^/]+   end=+>+ contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster
+syn region  htmlTag                start=+<[^/]+   end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster
 syn match   htmlTagN     contained +<\s*[-a-zA-Z0-9]\++hs=s+1 contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster
 syn match   htmlTagN     contained +</\s*[-a-zA-Z0-9]\++hs=s+2 contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster
 syn match   htmlTagError contained "[^>]<"ms=s+1
@@ -98,11 +101,11 @@ syn match htmlSpecialChar "&#\=[0-9A-Za-z]\{1,8};"
 
 " Comments (the real ones or the old netscape ones)
 if exists("html_wrong_comments")
-  syn region htmlComment                start=+<!--+    end=+--\s*>+
+  syn region htmlComment                start=+<!--+    end=+--\s*>+ contains=@Spell
 else
-  syn region htmlComment                start=+<!+      end=+>+   contains=htmlCommentPart,htmlCommentError
+  syn region htmlComment                start=+<!+      end=+>+   contains=htmlCommentPart,htmlCommentError,@Spell
   syn match  htmlCommentError contained "[^><!]"
-  syn region htmlCommentPart  contained start=+--+      end=+--\s*+  contains=@htmlPreProc
+  syn region htmlCommentPart  contained start=+--+      end=+--\s*+  contains=@htmlPreProc,@Spell
 endif
 syn region htmlComment                  start=+<!DOCTYPE+ keepend end=+>+
 
@@ -147,7 +150,8 @@ if !exists("html_no_rendering")
   syn region htmlItalicUnderlineBold contained start="<b\>" end="</b>"me=e-4 contains=@htmlTop
   syn region htmlItalicUnderlineBold contained start="<strong\>" end="</strong>"me=e-9 contains=@htmlTop
 
-  syn region htmlLink start="<a\>\_[^>]*\<href\>" end="</a>"me=e-4 contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,javaScript,@htmlPreproc
+  syn match htmlLeadingSpace "^\s\+" contained
+  syn region htmlLink start="<a\>\_[^>]*\<href\>" end="</a>"me=e-4 contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLeadingSpace,javaScript,@htmlPreproc
   syn region htmlH1 start="<h1\>" end="</h1>"me=e-5 contains=@htmlTop
   syn region htmlH2 start="<h2\>" end="</h2>"me=e-5 contains=@htmlTop
   syn region htmlH3 start="<h3\>" end="</h3>"me=e-5 contains=@htmlTop
@@ -164,8 +168,8 @@ if main_syntax != 'java' || exists("java_javascript")
   " JAVA SCRIPT
   syn include @htmlJavaScript syntax/javascript.vim
   unlet b:current_syntax
-  syn region  javaScript start=+<script[^>]*>+ keepend end=+</script>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
-  syn region  htmlScriptTag     contained start=+<script+ end=+>+       contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
+  syn region  javaScript start=+<script\_[^>]*>+ keepend end=+</script>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
+  syn region  htmlScriptTag     contained start=+<script+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
   HtmlHiLink htmlScriptTag htmlTag
 
   " html events (i.e. arguments that include javascript commands)
@@ -189,7 +193,7 @@ if main_syntax != 'java' || exists("java_vb")
   " VB SCRIPT
   syn include @htmlVbScript syntax/vb.vim
   unlet b:current_syntax
-  syn region  javaScript start=+<script [^>]*language *=[^>]*vbscript[^>]*>+ keepend end=+</script>+me=s-1 contains=@htmlVbScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
+  syn region  javaScript start=+<script \_[^>]*language *=\_[^>]*vbscript\_[^>]*>+ keepend end=+</script>+me=s-1 contains=@htmlVbScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
 endif
 
 syn cluster htmlJavaScript      add=@htmlPreproc
@@ -246,6 +250,7 @@ if version >= 508 || !exists("did_html_syn_inits")
     HtmlHiLink htmlItalicBoldUnderline     htmlBoldUnderlineItalic
     HtmlHiLink htmlItalicUnderlineBold     htmlBoldUnderlineItalic
     HtmlHiLink htmlLink                    Underlined
+    HtmlHiLink htmlLeadingSpace            None
     if !exists("html_my_rendering")
       hi def htmlBold                term=bold cterm=bold gui=bold
       hi def htmlBoldUnderline       term=bold,underline cterm=bold,underline gui=bold,underline
@@ -289,4 +294,6 @@ if main_syntax == 'html'
   unlet main_syntax
 endif
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
 " vim: ts=8
diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim
index 13ca62ca45..e5491b2612 100644
--- a/runtime/syntax/java.vim
+++ b/runtime/syntax/java.vim
@@ -1,7 +1,8 @@
-" Vim syntax file " Language:	  Java
+" Vim syntax file
+" Language:	Java
 " Maintainer:	Claudio Fleiner <claudio@fleiner.com>
 " URL:		http://www.fleiner.com/vim/syntax/java.vim
-" Last Change:	2011 Dec 30
+" Last Change:	2012 Oct 05
 
 " Please check :help java.vim for comments on some of the options available.
 
@@ -17,6 +18,9 @@ if !exists("main_syntax")
   syn region javaFold start="{" end="}" transparent fold
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 " don't use standard HiLink, it will not work with included syntax files
 if version < 508
   command! -nargs=+ JavaHiLink hi link <args>
@@ -26,7 +30,8 @@ endif
 
 " some characters that cannot be in a java program (outside a string)
 syn match javaError "[\\@`]"
-syn match javaError "<<<\|\.\.\|=>\|<>\|||=\|&&=\|[^-]->\|\*\/"
+syn match javaError "<<<\|\.\.\|=>\|||=\|&&=\|[^-]->\|\*\/"
+
 syn match javaOK "\.\.\."
 
 " use separate name so that it can be deleted in javacc.vim
@@ -161,7 +166,7 @@ if !exists("java_ignore_javadoc") && main_syntax != 'jsp'
   syn region  javaDocComment	start="/\*\*"  end="\*/" keepend contains=javaCommentTitle,@javaHtml,javaDocTags,javaDocSeeTag,javaTodo,@Spell
   syn region  javaCommentTitle	contained matchgroup=javaDocComment start="/\*\*"   matchgroup=javaCommentTitle keepend end="\.$" end="\.[ \t\r<&]"me=e-1 end="[^{]@"me=s-2,he=s-1 end="\*/"me=s-1,he=s-1 contains=@javaHtml,javaCommentStar,javaTodo,@Spell,javaDocTags,javaDocSeeTag
 
-  syn region javaDocTags	 contained start="{@\(link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)" end="}"
+  syn region javaDocTags	 contained start="{@\(code\|link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)" end="}"
   syn match  javaDocTags	 contained "@\(param\|exception\|throws\|since\)\s\+\S\+" contains=javaDocParam
   syn match  javaDocParam	 contained "\s\S\+"
   syn match  javaDocTags	 contained "@\(version\|author\|return\|deprecated\|serial\|serialField\|serialData\)\>"
@@ -341,5 +346,7 @@ if main_syntax == 'java'
 endif
 
 let b:spell_options="contained"
+let &cpo = s:cpo_save
+unlet s:cpo_save
 
 " vim: ts=8
diff --git a/runtime/syntax/javacc.vim b/runtime/syntax/javacc.vim
index 57c57b568c..5458de754e 100644
--- a/runtime/syntax/javacc.vim
+++ b/runtime/syntax/javacc.vim
@@ -2,7 +2,7 @@
 " Language:	JavaCC, a Java Compiler Compiler written by JavaSoft
 " Maintainer:	Claudio Fleiner <claudio@fleiner.com>
 " URL:		http://www.fleiner.com/vim/syntax/javacc.vim
-" Last Change:	2001 Jun 20
+" Last Change:	2012 Oct 05
 
 " Uses java.vim, and adds a few special things for JavaCC Parser files.
 " Those files usually have the extension  *.jj
@@ -15,6 +15,9 @@ elseif exists("b:current_syntax")
   finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 " source the java.vim file
 if version < 600
   source <sfile>:p:h/java.vim
@@ -44,7 +47,7 @@ syn keyword javaccPackages options DEBUG_PARSER DEBUG_LOOKAHEAD DEBUG_TOKEN_MANA
 syn keyword javaccPackages COMMON_TOKEN_ACTION IGNORE_CASE CHOICE_AMBIGUITY_CHECK
 syn keyword javaccPackages OTHER_AMBIGUITY_CHECK STATIC LOOKAHEAD ERROR_REPORTING
 syn keyword javaccPackages USER_TOKEN_MANAGER  USER_CHAR_STREAM JAVA_UNICODE_ESCAPE
-syn keyword javaccPackages UNICODE_INPUT
+syn keyword javaccPackages UNICODE_INPUT JDK_VERSION
 syn match javaccPackages "PARSER_END([^)]*)"
 syn match javaccPackages "PARSER_BEGIN([^)]*)"
 syn match javaccSpecToken "<EOF>"
@@ -73,5 +76,7 @@ if version >= 508 || !exists("did_css_syn_inits")
 endif
 
 let b:current_syntax = "javacc"
+let &cpo = s:cpo_save
+unlet s:cpo_save
 
 " vim: ts=8
diff --git a/runtime/syntax/javascript.vim b/runtime/syntax/javascript.vim
index b293eb8069..8bf677bf5f 100644
--- a/runtime/syntax/javascript.vim
+++ b/runtime/syntax/javascript.vim
@@ -7,7 +7,7 @@
 "		(ss) repaired several quoting and grouping glitches
 "		(ss) fixed regex parsing issue with multiple qualifiers [gi]
 "		(ss) additional factoring of keywords, globals, and members
-" Last Change:	2010 Mar 25
+" Last Change:	2012 Oct 05
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -23,6 +23,9 @@ if !exists("main_syntax")
   let main_syntax = 'javascript'
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 " Drop fold if it set but vim doesn't support it.
 if version < 600 && exists("javaScript_fold")
   unlet javaScript_fold
@@ -131,5 +134,7 @@ let b:current_syntax = "javascript"
 if main_syntax == 'javascript'
   unlet main_syntax
 endif
+let &cpo = s:cpo_save
+unlet s:cpo_save
 
 " vim: ts=8
diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim
index e9d7ee99d6..6fd46aaa54 100644
--- a/runtime/syntax/make.vim
+++ b/runtime/syntax/make.vim
@@ -2,7 +2,7 @@
 " Language:	Makefile
 " Maintainer:	Claudio Fleiner <claudio@fleiner.com>
 " URL:		http://www.fleiner.com/vim/syntax/make.vim
-" Last Change:	2008 Aug 04
+" Last Change:	2012 Oct 05
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -12,6 +12,10 @@ elseif exists("b:current_syntax")
   finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
+
 " some special characters
 syn match makeSpecial	"^\s*[@+-]\+"
 syn match makeNextLine	"\\\n\s*"
@@ -25,8 +29,8 @@ syn match makeOverride	"^ *override"
 hi link makeOverride makeStatement
 hi link makeExport makeStatement
 
-" Koehler: catch unmatched define/endef keywords.  endef only matches it is by itself on a line
-syn region makeDefine start="^\s*define\s" end="^\s*endef\s*$" contains=makeStatement,makeIdent,makePreCondit,makeDefine
+" catch unmatched define/endef keywords.  endef only matches it is by itself on a line, possibly followed by a commend
+syn region makeDefine start="^\s*define\s" end="^\s*endef\s*\(#.*\)\?$" contains=makeStatement,makeIdent,makePreCondit,makeDefine
 
 " Microsoft Makefile specials
 syn case ignore
@@ -48,8 +52,8 @@ syn match makeConfig "@[A-Za-z0-9_]\+@"
 
 " make targets
 " syn match makeSpecTarget	"^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>"
-syn match makeImplicit		"^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2 nextgroup=makeSource
 syn match makeImplicit		"^\.[A-Za-z0-9_./\t -]\+\s*:$"me=e-1 nextgroup=makeSource
+syn match makeImplicit		"^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2 nextgroup=makeSource
 
 syn region makeTarget	transparent matchgroup=makeTarget start="^[A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}[^:=]"rs=e-1 end=";"re=e-1,me=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine skipnl nextGroup=makeCommands
 syn match makeTarget		"^[A-Za-z0-9_./$()%*@-][A-Za-z0-9_./\t $()%*@-]*::\=\s*$" contains=makeIdent,makeSpecTarget skipnl nextgroup=makeCommands,makeCommandError
@@ -134,4 +138,6 @@ endif
 
 let b:current_syntax = "make"
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
 " vim: ts=8
diff --git a/runtime/tutor/tutor.ja.euc b/runtime/tutor/tutor.ja.euc
index 2734ee8ca3..69b3d36219 100644
--- a/runtime/tutor/tutor.ja.euc
+++ b/runtime/tutor/tutor.ja.euc
@@ -633,7 +633,7 @@ Note:  
   3. ¤Ç¤Ï :w TEST ¤È¥¿¥¤¥×¤·¤Þ¤·¤ç¤¦ (TEST ¤Ï¡¢Áª¤ó¤À¥Õ¥¡¥¤¥ë̾¤Ç¤¹)¡£
 
   4. ¤³¤ì¤Ë¤è¤ê¥Õ¥¡¥¤¥ëÁ´ÂΤ¬ TEST ¤È¤¤¤¦Ì¾Á°¤ÇÊݸ¤µ¤ì¤Þ¤¹¡£
-     ¤â¤¦°ìÅÙ :!dir ¤â¤·¤¯¤Ï !ls ¤È¥¿¥¤¥×¤·¤Æ³Îǧ¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£
+     ¤â¤¦°ìÅÙ :!dir ¤â¤·¤¯¤Ï :!ls ¤È¥¿¥¤¥×¤·¤Æ³Îǧ¤·¤Æ¤ß¤Þ¤·¤ç¤¦¡£
 
 Note: ¤³¤³¤Ç Vim ¤ò½ªÎ»¤·¡¢¥Õ¥¡¥¤¥ë̾ TEST ¤È¶¦¤Ëµ¯Æ°¤¹¤ë¤È¡¢Êݸ¤·¤¿»þ¤Î
      ¥Á¥å¡¼¥È¥ê¥¢¥ë¤ÎÊ£À½¤¬¤Ç¤­¾å¤¬¤ë¤Ï¤º¤Ç¤¹¡£
diff --git a/runtime/tutor/tutor.ja.sjis b/runtime/tutor/tutor.ja.sjis
index fe3be23b44..6880cd3ae3 100644
--- a/runtime/tutor/tutor.ja.sjis
+++ b/runtime/tutor/tutor.ja.sjis
@@ -633,7 +633,7 @@ Note:  
   3. ‚Å‚Í :w TEST ‚ƃ^ƒCƒv‚µ‚Ü‚µ‚傤 (TEST ‚Í�A‘I‚ñ‚¾ƒtƒ@ƒCƒ‹–¼‚Å‚·)�B
 
   4. ‚±‚ê‚É‚æ‚èƒtƒ@ƒCƒ‹‘S‘Ì‚ª TEST ‚Æ‚¢‚¤–¼‘O‚Å•Û‘¶‚³‚ê‚Ü‚·�B
-     ‚à‚¤ˆê“x :!dir ‚à‚µ‚­‚Í !ls ‚ƃ^ƒCƒv‚µ‚ÄŠm”F‚µ‚Ä‚Ý‚Ü‚µ‚傤�B
+     ‚à‚¤ˆê“x :!dir ‚à‚µ‚­‚Í :!ls ‚ƃ^ƒCƒv‚µ‚ÄŠm”F‚µ‚Ä‚Ý‚Ü‚µ‚傤�B
 
 Note: ‚±‚±‚Å Vim ‚ð�I—¹‚µ�Aƒtƒ@ƒCƒ‹–¼ TEST ‚Æ‹¤‚É‹N“®‚·‚é‚Æ�A•Û‘¶‚µ‚½Žž‚Ì
      ƒ`ƒ…�[ƒgƒŠƒAƒ‹‚Ì•¡�»‚ª‚Å‚«�オ‚é‚Í‚¸‚Å‚·�B
diff --git a/runtime/tutor/tutor.ja.utf-8 b/runtime/tutor/tutor.ja.utf-8
index a620cd57a3..248d696e84 100644
--- a/runtime/tutor/tutor.ja.utf-8
+++ b/runtime/tutor/tutor.ja.utf-8
@@ -633,7 +633,7 @@ Note:  全�� : コマンド� <ENTER> を押��終了���れ��
   3. �� :w TEST �タイプ���ょ� (TEST ���ん�ファイル���)。
 
   4. �れ�よりファイル全体� TEST �������存�れ��。
-     も�一度 :!dir も��� !ls �タイプ��確������ょ�。
+     も�一度 :!dir も��� :!ls �タイプ��確������ょ�。
 
 Note: ��� Vim を終了��ファイル� TEST �共�起動�る���存��時�
      �ュートリアル�複製���上�る����。

From 9b4c45f51ba85b83917ad551ad88337a9fb3944f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sat, 6 Oct 2012 19:10:35 +0200
Subject: [PATCH 078/136] updated for version 7.3.684 Problem:    "make test"
 does not delete lua.vim. Solution:   Add lua.vim to the clean target. (Simon
 Ruderich)

---
 src/testdir/Make_dos.mak  | 1 +
 src/testdir/Make_ming.mak | 1 +
 src/testdir/Make_vms.mms  | 3 ++-
 src/testdir/Makefile      | 6 +++---
 src/version.c             | 2 ++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 487ecd80af..b52f249f00 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -62,6 +62,7 @@ clean:
 	-if exist tiny.vim del tiny.vim
 	-if exist mbyte.vim del mbyte.vim
 	-if exist mzscheme.vim del mzscheme.vim
+	-if exist lua.vim del lua.vim
 	-del X*
 	-if exist viminfo del viminfo
 
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 4128f9f6fa..c150424684 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -85,6 +85,7 @@ clean:
 	-$(DEL) tiny.vim
 	-$(DEL) mbyte.vim
 	-$(DEL) mzscheme.vim
+	-$(DEL) lua.vim
 	-$(DEL) X*
 	-$(DEL) viminfo
 
diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index dfc4a7b84b..6608d70677 100644
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -4,7 +4,7 @@
 # Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
 #		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
 #
-# Last change:  2012 Apr 05
+# Last change:  2012 Oct 06
 #
 # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
 # Edit the lines in the Configuration section below to select.
@@ -184,5 +184,6 @@ clean :
 	-@ if "''F$SEARCH("small.vim")'"    .NES. "" then delete/noconfirm/nolog small.vim.*
 	-@ if "''F$SEARCH("mbyte.vim")'"    .NES. "" then delete/noconfirm/nolog mbyte.vim.*
 	-@ if "''F$SEARCH("mzscheme.vim")'" .NES. "" then delete/noconfirm/nolog mzscheme.vim.*
+	-@ if "''F$SEARCH("lua.vim")'" .NES. "" then delete/noconfirm/nolog lua.vim.*
 	-@ if "''F$SEARCH("viminfo.*")'"    .NES. "" then delete/noconfirm/nolog viminfo.*.*
 
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 20d9781b24..c3923e0ccc 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -48,10 +48,10 @@ report:
 $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
 
 clean:
-	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* valgrind.* viminfo
+	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok X* valgrind.* viminfo
 
 test1.out: test1.in
-	-rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim test.ok X* viminfo
+	-rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok X* viminfo
 	$(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in
 	@/bin/sh -c "if diff test.out $*.ok; \
 		then mv -f test.out $*.out; \
@@ -73,7 +73,7 @@ test1.out: test1.in
 		  fi \
 		else echo $* NO OUTPUT >>test.log; \
 		fi"
-#	-rm -rf X* test.ok viminfo
+	-rm -rf X* test.ok viminfo
 
 test49.out: test49.vim
 
diff --git a/src/version.c b/src/version.c
index 62e0f4b1a8..63a5136dc0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    684,
 /**/
     683,
 /**/

From 3e1257bb4215339171bb4822d859d0a5929a4557 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sat, 6 Oct 2012 19:10:36 +0200
Subject: [PATCH 079/136] Added tag v7-3-684 for changeset 1cc37b8cfaa1

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b4023980df..9db2cff4b8 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2020,3 +2020,4 @@ dd0f25ede9a8322b5b638961835cc4743cd479a2 v7-3-679
 a2fe24ec6a0d06d0af286b9fee9e307c33f27cca v7-3-681
 8eb5b61161b4c56b378ec829e360204102d22db4 v7-3-682
 0f5ee262963528ddccfa1f54b83696f939d21b53 v7-3-683
+1cc37b8cfaa1c670e442e2f9444feeb1820228bc v7-3-684

From 54be19dc6a5fe48b96c01a983f071a816d2ca839 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 11 Oct 2012 03:35:45 +0200
Subject: [PATCH 080/136] updated for version 7.3.685 Problem:    No test for
 what patch 7.3.673 fixes. Solution:   Add a test. (Christian Brabandt)

---
 src/testdir/test53.in | 4 ++++
 src/testdir/test53.ok | 1 +
 src/version.c         | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/src/testdir/test53.in b/src/testdir/test53.in
index af617c01f1..c1d50611f2 100644
--- a/src/testdir/test53.in
+++ b/src/testdir/test53.in
@@ -42,6 +42,9 @@ gnd
 gnd$h/\zs
 gnd/[u]niquepattern/s
 vlgnd
+/mother
+:set selection=exclusive
+$cgNmongoose
 :/^start:/,/^end:/wq! test.out
 ENDTEST
 
@@ -69,4 +72,5 @@ lines
 zero width pattern
 delete first and last chars
 uniquepattern uniquepattern
+my very excellent mother just served us nachos
 end:
diff --git a/src/testdir/test53.ok b/src/testdir/test53.ok
index 0a2a6f4d19..179b1b2bff 100644
--- a/src/testdir/test53.ok
+++ b/src/testdir/test53.ok
@@ -25,4 +25,5 @@ join lines
 zerowidth pattern
 elete first and last char
  uniquepattern
+my very excellent mongoose just served us nachos
 end:
diff --git a/src/version.c b/src/version.c
index 63a5136dc0..296d3de945 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    685,
 /**/
     684,
 /**/

From cfd92a78d1a6db3506561c5793d28e3a9f6a4179 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 11 Oct 2012 03:35:45 +0200
Subject: [PATCH 081/136] Added tag v7-3-685 for changeset 34aa94a421b7

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 9db2cff4b8..6c5ae9f8b1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2021,3 +2021,4 @@ a2fe24ec6a0d06d0af286b9fee9e307c33f27cca v7-3-681
 8eb5b61161b4c56b378ec829e360204102d22db4 v7-3-682
 0f5ee262963528ddccfa1f54b83696f939d21b53 v7-3-683
 1cc37b8cfaa1c670e442e2f9444feeb1820228bc v7-3-684
+34aa94a421b7a03a71013ddbb92937dbaf83b1aa v7-3-685

From fa0d18341b7e6b4eb8134f213812f120445b8d22 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 11 Oct 2012 04:04:37 +0200
Subject: [PATCH 082/136] updated for version 7.3.686 Problem:    Using CTRL-\
 e mappings is useful also when entering an 	    expression, but it doesn't
 work. (Marcin Szamotulski) Solution:   Allow using CTRL-\ e when entering an
 expression if it was not 	    typed.

---
 src/ex_getln.c | 7 ++++---
 src/version.c  | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 9cf1287a48..249dafb586 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -667,9 +667,10 @@ getcmdline(firstc, count, indent)
 	    c = plain_vgetc();
 	    --no_mapping;
 	    --allow_keys;
-	    /* CTRL-\ e doesn't work when obtaining an expression. */
-	    if (c != Ctrl_N && c != Ctrl_G
-				     && (c != 'e' || ccline.cmdfirstc == '='))
+	    /* CTRL-\ e doesn't work when obtaining an expression, unless it
+	     * is in a mapping. */
+	    if (c != Ctrl_N && c != Ctrl_G && (c != 'e'
+				    || (ccline.cmdfirstc == '=' && KeyTyped)))
 	    {
 		vungetc(c);
 		c = Ctrl_BSL;
diff --git a/src/version.c b/src/version.c
index 296d3de945..ec61f9bd33 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    686,
 /**/
     685,
 /**/

From 956d16ce21362f0c90c50795330889e325bbba8e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 11 Oct 2012 04:04:38 +0200
Subject: [PATCH 083/136] Added tag v7-3-686 for changeset ba9c9d0c4ff4

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 6c5ae9f8b1..674be8b6cb 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2022,3 +2022,4 @@ a2fe24ec6a0d06d0af286b9fee9e307c33f27cca v7-3-681
 0f5ee262963528ddccfa1f54b83696f939d21b53 v7-3-683
 1cc37b8cfaa1c670e442e2f9444feeb1820228bc v7-3-684
 34aa94a421b7a03a71013ddbb92937dbaf83b1aa v7-3-685
+ba9c9d0c4ff4cf56c3c5d2dec2da71decbbe9f6a v7-3-686

From 2a68f989620048434cbc12cbcfd094785bc648ea Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 11 Oct 2012 04:44:33 +0200
Subject: [PATCH 084/136] updated for version 7.3.687 Problem:    Test 16 fails
 when $DISPLAY is not set. Solution:   Skip the test when $DISPLAY is not set.

---
 src/testdir/test16.in | 1 +
 src/version.c         | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/testdir/test16.in b/src/testdir/test16.in
index aa00517a34..b2cd159a8c 100644
--- a/src/testdir/test16.in
+++ b/src/testdir/test16.in
@@ -2,6 +2,7 @@ Tests for resetting "secure" flag after GUI has started.
 For KDE set a font, empty 'guifont' may cause a hang.
 
 STARTTEST
+:if $DISPLAY == "" | e! test.ok | wq! test.out | endif
 :set exrc secure
 :if has("gui_kde")
 :  set guifont=Courier\ 10\ Pitch/8/-1/5/50/0/0/0/0/0
diff --git a/src/version.c b/src/version.c
index ec61f9bd33..7be65c6be1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    687,
 /**/
     686,
 /**/

From f4977b66a26cfbc4497cd3b56b4819fea8a56b24 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 11 Oct 2012 04:44:33 +0200
Subject: [PATCH 085/136] Added tag v7-3-687 for changeset 0545dab1517f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 674be8b6cb..f695f2f04a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2023,3 +2023,4 @@ a2fe24ec6a0d06d0af286b9fee9e307c33f27cca v7-3-681
 1cc37b8cfaa1c670e442e2f9444feeb1820228bc v7-3-684
 34aa94a421b7a03a71013ddbb92937dbaf83b1aa v7-3-685
 ba9c9d0c4ff4cf56c3c5d2dec2da71decbbe9f6a v7-3-686
+0545dab1517f8ce2b8319c02572e4bb357567034 v7-3-687

From df3782812480b0a37d70e9628abbc090f1ec69fd Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 14 Oct 2012 03:22:56 +0200
Subject: [PATCH 086/136] updated for version 7.3.688 Problem:    Python 3.3 is
 not supported. Solution:   Add Python 3.3 support (Ken Takata)

---
 src/if_python3.c | 30 +++++++++++++++++++++++++-----
 src/version.c    |  2 ++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/if_python3.c b/src/if_python3.c
index 302be7ece6..ea59a4233b 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -174,7 +174,12 @@ static void init_structs(void);
 # define _PyObject_NextNotImplemented (*py3__PyObject_NextNotImplemented)
 # define PyModule_AddObject py3_PyModule_AddObject
 # define PyImport_AppendInittab py3_PyImport_AppendInittab
-# define _PyUnicode_AsString py3__PyUnicode_AsString
+# if PY_VERSION_HEX >= 0x030300f0
+#  undef _PyUnicode_AsString
+#  define _PyUnicode_AsString py3_PyUnicode_AsUTF8String
+# else
+#  define _PyUnicode_AsString py3__PyUnicode_AsString
+# endif
 # undef PyUnicode_AsEncodedString
 # define PyUnicode_AsEncodedString py3_PyUnicode_AsEncodedString
 # undef PyBytes_AsString
@@ -281,7 +286,11 @@ static PyObject* py3__Py_FalseStruct;
 static PyObject* py3__Py_TrueStruct;
 static int (*py3_PyModule_AddObject)(PyObject *m, const char *name, PyObject *o);
 static int (*py3_PyImport_AppendInittab)(const char *name, PyObject* (*initfunc)(void));
+#if PY_VERSION_HEX >= 0x030300f0
+static char* (*py3_PyUnicode_AsUTF8String)(PyObject *unicode);
+#else
 static char* (*py3__PyUnicode_AsString)(PyObject *unicode);
+#endif
 static PyObject* (*py3_PyUnicode_AsEncodedString)(PyObject *unicode, const char* encoding, const char* errors);
 static char* (*py3_PyBytes_AsString)(PyObject *bytes);
 static int (*py3_PyBytes_AsStringAndSize)(PyObject *bytes, char **buffer, int *length);
@@ -397,7 +406,11 @@ static struct
     {"PyObject_Init", (PYTHON_PROC*)&py3__PyObject_Init},
     {"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject},
     {"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab},
+#if PY_VERSION_HEX >= 0x030300f0
+    {"PyUnicode_AsUTF8String", (PYTHON_PROC*)&py3_PyUnicode_AsUTF8String},
+#else
     {"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString},
+#endif
     {"PyBytes_AsString", (PYTHON_PROC*)&py3_PyBytes_AsString},
     {"PyBytes_AsStringAndSize", (PYTHON_PROC*)&py3_PyBytes_AsStringAndSize},
     {"PyBytes_FromString", (PYTHON_PROC*)&py3_PyBytes_FromString},
@@ -490,6 +503,12 @@ py3_runtime_link_init(char *libname, int verbose)
 
     /* Load unicode functions separately as only the ucs2 or the ucs4 functions
      * will be present in the library. */
+#if PY_VERSION_HEX >= 0x030300f0
+    ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicode_FromString");
+    ucs_decode = symbol_from_dll(hinstPy3, "PyUnicode_Decode");
+    ucs_as_encoded_string = symbol_from_dll(hinstPy3,
+	    "PyUnicode_AsEncodedString");
+#else
     ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicodeUCS2_FromString");
     ucs_decode = symbol_from_dll(hinstPy3,
 	    "PyUnicodeUCS2_Decode");
@@ -504,6 +523,7 @@ py3_runtime_link_init(char *libname, int verbose)
 	ucs_as_encoded_string = symbol_from_dll(hinstPy3,
 		"PyUnicodeUCS4_AsEncodedString");
     }
+#endif
     if (ucs_from_string && ucs_decode && ucs_as_encoded_string)
     {
 	py3_PyUnicode_FromString = ucs_from_string;
@@ -600,8 +620,8 @@ static int py3initialised = 0;
 
 #define GET_ATTR_STRING(name, nameobj) \
     char	*name = ""; \
-    if(PyUnicode_Check(nameobj)) \
-        name = _PyUnicode_AsString(nameobj)
+    if (PyUnicode_Check(nameobj)) \
+	name = _PyUnicode_AsString(nameobj)
 
 #define PY3OBJ_DELETED(obj) (obj->ob_base.ob_refcnt<=0)
 
@@ -704,6 +724,8 @@ Python3_Init(void)
 	Py_SetPythonHome(PYTHON3_HOME);
 #endif
 
+	PyImport_AppendInittab("vim", Py3Init_vim);
+
 #if !defined(MACOS) || defined(MACOS_X_UNIX)
 	Py_Initialize();
 #else
@@ -719,8 +741,6 @@ Python3_Init(void)
 	if (PythonIO_Init())
 	    goto fail;
 
-	PyImport_AppendInittab("vim", Py3Init_vim);
-
 	globals = PyModule_GetDict(PyImport_AddModule("__main__"));
 
 	/* Remove the element from sys.path that was added because of our
diff --git a/src/version.c b/src/version.c
index 7be65c6be1..d512955fab 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    688,
 /**/
     687,
 /**/

From f04ba951c810deba4fb0d1fc0f942832b52958da Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 14 Oct 2012 03:22:56 +0200
Subject: [PATCH 087/136] Added tag v7-3-688 for changeset 2696da84d370

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f695f2f04a..0924e05890 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2024,3 +2024,4 @@ a2fe24ec6a0d06d0af286b9fee9e307c33f27cca v7-3-681
 34aa94a421b7a03a71013ddbb92937dbaf83b1aa v7-3-685
 ba9c9d0c4ff4cf56c3c5d2dec2da71decbbe9f6a v7-3-686
 0545dab1517f8ce2b8319c02572e4bb357567034 v7-3-687
+2696da84d37093da0dea419878e4241385eb515b v7-3-688

From f1012b03ac9603af93c99d07cd58b76e94935b2c Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 14 Oct 2012 03:41:59 +0200
Subject: [PATCH 088/136] updated for version 7.3.689 Problem:    MzScheme and
 Lua may use a NULL string. Solution:   Use an empty string instead of NULL.
 (Yukihiro Nakadaira)

---
 src/if_lua.c   | 3 ++-
 src/if_mzsch.c | 3 ++-
 src/version.c  | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/if_lua.c b/src/if_lua.c
index e873b6bf77..ce65fd2f68 100644
--- a/src/if_lua.c
+++ b/src/if_lua.c
@@ -464,7 +464,8 @@ luaV_pushtypval(lua_State *L, typval_T *tv)
     switch (tv->v_type)
     {
 	case VAR_STRING:
-	    lua_pushstring(L, (char *) tv->vval.v_string);
+	    lua_pushstring(L, tv->vval.v_string == NULL
+					    ? "" : (char *)tv->vval.v_string);
 	    break;
 	case VAR_NUMBER:
 	    lua_pushinteger(L, (int) tv->vval.v_number);
diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index 86e96bd335..d6ee4b9c5a 100644
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -2649,7 +2649,8 @@ vim_to_mzscheme(typval_T *vim_value, int depth, Scheme_Hash_Table *visited)
 	new_value = FALSE;
     else if (vim_value->v_type == VAR_STRING)
     {
-	result = scheme_make_string((char *)vim_value->vval.v_string);
+	result = scheme_make_string(vim_value->vval.v_string == NULL
+				    ? "" : (char *)vim_value->vval.v_string);
 	MZ_GC_CHECK();
     }
     else if (vim_value->v_type == VAR_NUMBER)
diff --git a/src/version.c b/src/version.c
index d512955fab..0ea098b92e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    689,
 /**/
     688,
 /**/

From 99b76408eb2b34d9804fd09258052e56ff3faa08 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 14 Oct 2012 03:41:59 +0200
Subject: [PATCH 089/136] Added tag v7-3-689 for changeset 3c072c1cb873

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0924e05890..3d63cc2d95 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2025,3 +2025,4 @@ a2fe24ec6a0d06d0af286b9fee9e307c33f27cca v7-3-681
 ba9c9d0c4ff4cf56c3c5d2dec2da71decbbe9f6a v7-3-686
 0545dab1517f8ce2b8319c02572e4bb357567034 v7-3-687
 2696da84d37093da0dea419878e4241385eb515b v7-3-688
+3c072c1cb87372f3ebd345463abbc451e80143e2 v7-3-689

From 4fa78fd65046880ba7763b5565b5a91b4d9e2226 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 14 Oct 2012 04:35:45 +0200
Subject: [PATCH 090/136] updated for version 7.3.690 Problem:    When the
 current directory name is exactly the maximum path length 	    Vim may
 crash. Solution:   Only add "/" when there is room. (Danek Duvall)

---
 src/os_unix.c | 11 ++++-------
 src/version.c |  2 ++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/os_unix.c b/src/os_unix.c
index 2ef5893502..ae41579dc5 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2512,15 +2512,12 @@ mch_FullName(fname, buf, len, force)
 	}
 
 	l = STRLEN(buf);
-	if (l >= len)
-	    retval = FAIL;
+	if (l >= len - 1)
+	    retval = FAIL; /* no space for trailing "/" */
 #ifndef VMS
-	else
-	{
-	    if (l > 0 && buf[l - 1] != '/' && *fname != NUL
+	else if (l > 0 && buf[l - 1] != '/' && *fname != NUL
 						   && STRCMP(fname, ".") != 0)
-		STRCAT(buf, "/");
-	}
+	    STRCAT(buf, "/");
 #endif
     }
 
diff --git a/src/version.c b/src/version.c
index 0ea098b92e..01d6793018 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    690,
 /**/
     689,
 /**/

From 8626f532a3990b3f8ad70fc8da8ea7e98fbfc70d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 14 Oct 2012 04:35:46 +0200
Subject: [PATCH 091/136] Added tag v7-3-690 for changeset caa0ca9ad06c

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 3d63cc2d95..95eeba7b21 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2026,3 +2026,4 @@ ba9c9d0c4ff4cf56c3c5d2dec2da71decbbe9f6a v7-3-686
 0545dab1517f8ce2b8319c02572e4bb357567034 v7-3-687
 2696da84d37093da0dea419878e4241385eb515b v7-3-688
 3c072c1cb87372f3ebd345463abbc451e80143e2 v7-3-689
+caa0ca9ad06cb515b7e6d2e4410e03802b58e167 v7-3-690

From 800e8a737d8c52be7344546ce4719482fbf145e6 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 14 Oct 2012 05:20:12 +0200
Subject: [PATCH 092/136] updated for version 7.3.691 Problem:    State
 specific to the Python thread is discarded. Solution:   Keep state between
 threads. (Paul)

---
 src/if_python.c | 6 ++++--
 src/version.c   | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/if_python.c b/src/if_python.c
index c194598b71..2a53c93b0c 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -740,9 +740,11 @@ Python_Init(void)
 #else
 	PyMac_Initialize();
 #endif
-	/* initialise threads */
+	/* Initialise threads and save the state using PyGILState_Ensure.
+	 * Without this call, thread-specific state (such as the system trace
+	 * hook), will be lost between invocations of Python code.  */
 	PyEval_InitThreads();
-
+	pygilstate = PyGILState_Ensure();
 #ifdef DYNAMIC_PYTHON
 	get_exceptions();
 #endif
diff --git a/src/version.c b/src/version.c
index 01d6793018..2d9529ce5c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    691,
 /**/
     690,
 /**/

From 66a6406bc4e880644790e34069d4322aa3d735b3 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 14 Oct 2012 05:20:12 +0200
Subject: [PATCH 093/136] Added tag v7-3-691 for changeset 7f10daa706bb

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 95eeba7b21..3d29be2e2d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2027,3 +2027,4 @@ ba9c9d0c4ff4cf56c3c5d2dec2da71decbbe9f6a v7-3-686
 2696da84d37093da0dea419878e4241385eb515b v7-3-688
 3c072c1cb87372f3ebd345463abbc451e80143e2 v7-3-689
 caa0ca9ad06cb515b7e6d2e4410e03802b58e167 v7-3-690
+7f10daa706bb6ed0c39f1d2905cd78368a98d19f v7-3-691

From 6de2ac2f9489adf6cc3ec828e39c9f099a72b5f6 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 18 Oct 2012 05:18:32 +0200
Subject: [PATCH 094/136] updated for version 7.3.692 Problem:    Can't build
 GTK version with GTK 2.0. Solution:   Put GtkFileFilter declaration in the
 right place. (Yegappan 	    Lakshmanan)

---
 src/gui_gtk.c | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 4b63d513de..ba2d23d1e9 100644
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -845,7 +845,6 @@ gui_mch_browse(int saving UNUSED,
     char_u		dirbuf[MAXPATHL];
     guint		log_handler;
     const gchar		*domain = "Gtk";
-    GtkFileFilter	*gfilter;
 
     title = CONVERT_TO_UTF8(title);
 
@@ -883,6 +882,7 @@ gui_mch_browse(int saving UNUSED,
 	int     i = 0;
 	char_u  *patt;
 	char_u  *p = filter;
+	GtkFileFilter	*gfilter;
 
 	gfilter = gtk_file_filter_new();
 	patt = alloc(STRLEN(filter));
diff --git a/src/version.c b/src/version.c
index 2d9529ce5c..e0a63265af 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    692,
 /**/
     691,
 /**/

From 0a2a0ac34f06ddcc28762d6962f00a7a96d7cfa3 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 18 Oct 2012 05:18:32 +0200
Subject: [PATCH 095/136] Added tag v7-3-692 for changeset 337a4368fd2b

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 3d29be2e2d..5ac3ae7236 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2028,3 +2028,4 @@ ba9c9d0c4ff4cf56c3c5d2dec2da71decbbe9f6a v7-3-686
 3c072c1cb87372f3ebd345463abbc451e80143e2 v7-3-689
 caa0ca9ad06cb515b7e6d2e4410e03802b58e167 v7-3-690
 7f10daa706bb6ed0c39f1d2905cd78368a98d19f v7-3-691
+337a4368fd2b68b9822b94e595d77b4d6773bfa4 v7-3-692

From a26a0354a602cfcc30864214e87d9e4dc7c5342b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 00:10:39 +0200
Subject: [PATCH 096/136] updated for version 7.3.693 Problem:    Can't make
 'softtabstop' follow 'shiftwidth'. Solution:   When 'softtabstop' is negative
 use the value of 'shiftwidth'. 	    (so8res)

---
 src/edit.c           | 12 ++++++------
 src/option.c         | 15 ++++++++++-----
 src/proto/option.pro |  1 +
 src/version.c        |  2 ++
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/edit.c b/src/edit.c
index 9017fd0f31..0d94095466 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -8885,7 +8885,7 @@ ins_bs(c, mode, inserted_space_p)
 	 */
 	if (	   mode == BACKSPACE_CHAR
 		&& ((p_sta && in_indent)
-		    || (curbuf->b_p_sts != 0
+		    || (get_sts_value() != 0
 			&& curwin->w_cursor.col > 0
 			&& (*(ml_get_cursor() - 1) == TAB
 			    || (*(ml_get_cursor() - 1) == ' '
@@ -8901,7 +8901,7 @@ ins_bs(c, mode, inserted_space_p)
 	    if (p_sta && in_indent)
 		ts = (int)get_sw_value();
 	    else
-		ts = (int)curbuf->b_p_sts;
+		ts = (int)get_sts_value();
 	    /* Compute the virtual column where we want to be.  Since
 	     * 'showbreak' may get in the way, need to get the last column of
 	     * the previous character. */
@@ -9590,7 +9590,7 @@ ins_tab()
      */
     if (!curbuf->b_p_et
 	    && !(p_sta && ind && curbuf->b_p_ts != get_sw_value())
-	    && curbuf->b_p_sts == 0)
+	    && get_sts_value() == 0)
 	return TRUE;
 
     if (stop_arrow() == FAIL)
@@ -9606,8 +9606,8 @@ ins_tab()
 
     if (p_sta && ind)		/* insert tab in indent, use 'shiftwidth' */
 	temp = (int)get_sw_value();
-    else if (curbuf->b_p_sts > 0) /* use 'softtabstop' when set */
-	temp = (int)curbuf->b_p_sts;
+    else if (curbuf->b_p_sts != 0) /* use 'softtabstop' when set */
+	temp = (int)get_sts_value();
     else			/* otherwise use 'tabstop' */
 	temp = (int)curbuf->b_p_ts;
     temp -= get_nolist_virtcol() % temp;
@@ -9635,7 +9635,7 @@ ins_tab()
     /*
      * When 'expandtab' not set: Replace spaces by TABs where possible.
      */
-    if (!curbuf->b_p_et && (curbuf->b_p_sts || (p_sta && ind)))
+    if (!curbuf->b_p_et && (get_sts_value() || (p_sta && ind)))
     {
 	char_u		*ptr;
 #ifdef FEAT_VREPLACE
diff --git a/src/option.c b/src/option.c
index b6b0bf6346..da9807156d 100644
--- a/src/option.c
+++ b/src/option.c
@@ -8509,11 +8509,6 @@ set_num_option(opt_idx, varp, value, errbuf, errbuflen, opt_flags)
 	    p_window = Rows - 1;
     }
 
-    if (curbuf->b_p_sts < 0)
-    {
-	errmsg = e_positive;
-	curbuf->b_p_sts = 0;
-    }
     if (curbuf->b_p_ts <= 0)
     {
 	errmsg = e_positive;
@@ -11429,3 +11424,13 @@ get_sw_value()
 {
     return curbuf->b_p_sw ? curbuf->b_p_sw : curbuf->b_p_ts;
 }
+
+/*
+ * Return the effective softtabstop value for the current buffer, using the
+ * 'tabstop' value when 'softtabstop' is negative.
+ */
+    long
+get_sts_value()
+{
+    return curbuf->b_p_sts < 0 ? get_sw_value() : curbuf->b_p_sts;
+}
diff --git a/src/proto/option.pro b/src/proto/option.pro
index 7d3d8d6515..fd71704ec1 100644
--- a/src/proto/option.pro
+++ b/src/proto/option.pro
@@ -57,4 +57,5 @@ void save_file_ff __ARGS((buf_T *buf));
 int file_ff_differs __ARGS((buf_T *buf, int ignore_empty));
 int check_ff_value __ARGS((char_u *p));
 long get_sw_value __ARGS((void));
+long get_sts_value __ARGS((void));
 /* vim: set ft=c : */
diff --git a/src/version.c b/src/version.c
index e0a63265af..0a39edeeb6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    693,
 /**/
     692,
 /**/

From 6becf03d2647c59c476e2b3e7b1cfa958ee77293 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 00:10:39 +0200
Subject: [PATCH 097/136] Added tag v7-3-693 for changeset fd96b3cc88ed

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 5ac3ae7236..11b4374965 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2029,3 +2029,4 @@ ba9c9d0c4ff4cf56c3c5d2dec2da71decbbe9f6a v7-3-686
 caa0ca9ad06cb515b7e6d2e4410e03802b58e167 v7-3-690
 7f10daa706bb6ed0c39f1d2905cd78368a98d19f v7-3-691
 337a4368fd2b68b9822b94e595d77b4d6773bfa4 v7-3-692
+fd96b3cc88ed71d4c4d24c6ac67c9d3a68ae6e6b v7-3-693

From ea0bac6b11ec2b036e1ed9761dc4ad397575e716 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 00:45:18 +0200
Subject: [PATCH 098/136] updated for version 7.3.694 Problem:    Now that
 'shiftwidth' may use the value of 'tabstop' it is not so 	    easy to
 use in indent files. Solution:   Add the shiftwidth() function. (so8res)

---
 runtime/doc/eval.txt | 26 ++++++++++++++++++++++----
 src/eval.c           | 13 +++++++++++++
 src/version.c        |  2 ++
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 12ea9c897e..8934215eb7 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1932,6 +1932,7 @@ setwinvar( {nr}, {varname}, {val})	set {varname} in window {nr} to {val}
 shellescape( {string} [, {special}])
 				String	escape {string} for use as shell
 					command argument
+shiftwidth()			Number	effective value of 'shiftwidth'
 simplify( {filename})		String	simplify filename as much as possible
 sin( {expr})			Float	sine of {expr}
 sinh( {expr})			Float	hyperbolic sine of {expr}
@@ -3754,10 +3755,10 @@ inputdialog({prompt} [, {text} [, {cancelreturn}]])		*inputdialog()*
 		Like |input()|, but when the GUI is running and text dialogs
 		are supported, a dialog window pops up to input the text.
 		Example: >
-			:let n = inputdialog("value for shiftwidth", &sw)
-			:if n != ""
-			:  let &sw = n
-			:endif
+		   :let n = inputdialog("value for shiftwidth", shiftwidth())
+		   :if n != ""
+		   :  let &sw = n
+		   :endif
 <		When the dialog is cancelled {cancelreturn} is returned.  When
 		omitted an empty string is returned.
 		Hitting <Enter> works like pressing the OK button.  Hitting
@@ -5331,6 +5332,23 @@ shellescape({string} [, {special}])			*shellescape()*
 		    :call system("chmod +w -- " . shellescape(expand("%")))
 
 
+shiftwidth()						*shiftwidth()*
+		Returns the effective value of 'shiftwidth'. This is the
+		'shiftwidth' value unless it is zero, in which case it is the
+		'tabstop' value.  To be backwards compatible in indent
+		plugins, use this: >
+			if exists('*shiftwidth')
+			  func s:sw()
+			    return shiftwidth()
+			  endfunc
+			else
+			  func s:sw()
+			    return &sw
+			  endfunc
+			endif
+<		And then use s:sw() instead of &sw.
+
+
 simplify({filename})					*simplify()*
 		Simplify the file name as much as possible without changing
 		the meaning.  Shortcuts (on MS-Windows) or symbolic links (on
diff --git a/src/eval.c b/src/eval.c
index 98b2a3367a..66b8606e05 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -687,6 +687,7 @@ static void f_settabvar __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_settabwinvar __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_setwinvar __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_shellescape __ARGS((typval_T *argvars, typval_T *rettv));
+static void f_shiftwidth __ARGS((typval_T *argvars, typval_T *rettv));
 static void f_simplify __ARGS((typval_T *argvars, typval_T *rettv));
 #ifdef FEAT_FLOAT
 static void f_sin __ARGS((typval_T *argvars, typval_T *rettv));
@@ -8051,6 +8052,7 @@ static struct fst
     {"settabwinvar",	4, 4, f_settabwinvar},
     {"setwinvar",	3, 3, f_setwinvar},
     {"shellescape",	1, 2, f_shellescape},
+    {"shiftwidth",	0, 0, f_shiftwidth},
     {"simplify",	1, 1, f_simplify},
 #ifdef FEAT_FLOAT
     {"sin",		1, 1, f_sin},
@@ -16651,6 +16653,17 @@ f_shellescape(argvars, rettv)
     rettv->v_type = VAR_STRING;
 }
 
+/*
+ * shiftwidth() function
+ */
+    static void
+f_shiftwidth(argvars, rettv)
+    typval_T	*argvars;
+    typval_T	*rettv;
+{
+    rettv->vval.v_number = get_sw_value();
+}
+
 /*
  * "simplify()" function
  */
diff --git a/src/version.c b/src/version.c
index 0a39edeeb6..f28590b9d1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    694,
 /**/
     693,
 /**/

From c4863948d89e8a3964507c47695ef3c186847ed1 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 00:45:18 +0200
Subject: [PATCH 099/136] Added tag v7-3-694 for changeset 8235ccf121bb

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 11b4374965..8ab7ecab98 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2030,3 +2030,4 @@ caa0ca9ad06cb515b7e6d2e4410e03802b58e167 v7-3-690
 7f10daa706bb6ed0c39f1d2905cd78368a98d19f v7-3-691
 337a4368fd2b68b9822b94e595d77b4d6773bfa4 v7-3-692
 fd96b3cc88ed71d4c4d24c6ac67c9d3a68ae6e6b v7-3-693
+8235ccf121bb241f8105d0ba6e1c92e9f8b04555 v7-3-694

From e299bcde4f663405bc9ca7295f74a89b713c9a79 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 00:58:39 +0200
Subject: [PATCH 100/136] updated for version 7.3.695 Problem:    Balloon
 cannot show multi-byte text. Solution:   Properly deal with multi-byte
 characters. (Dominique Pelle)

---
 src/gui_beval.c | 8 +++++---
 src/ui.c        | 6 +++---
 src/version.c   | 2 ++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/gui_beval.c b/src/gui_beval.c
index f9f7e00042..84d6acdeda 100644
--- a/src/gui_beval.c
+++ b/src/gui_beval.c
@@ -359,7 +359,7 @@ get_beval_info(beval, getword, winp, lnump, textp, colp)
 			}
 		    }
 
-		    col = vcol2col(wp, lnum, col) - 1;
+		    col = vcol2col(wp, lnum, col);
 
 		    if (VIsual_active
 			    && wp->w_buffer == curwin->w_buffer
@@ -377,8 +377,10 @@ get_beval_info(beval, getword, winp, lnump, textp, colp)
 			    return FAIL;
 
 			lbuf = ml_get_buf(curwin->w_buffer, VIsual.lnum, FALSE);
-			lbuf = vim_strnsave(lbuf + spos->col,
-				     epos->col - spos->col + (*p_sel != 'e'));
+			len = epos->col - spos->col;
+			if (*p_sel != 'e')
+			    len += MB_PTR2LEN(lbuf + epos->col);
+			lbuf = vim_strnsave(lbuf + spos->col, len);
 			lnum = spos->lnum;
 			col = spos->col;
 		    }
diff --git a/src/ui.c b/src/ui.c
index d164376d40..372e0375fc 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -98,7 +98,7 @@ ui_inchar_undo(s, len)
 #endif
 
 /*
- * ui_inchar(): low level input funcion.
+ * ui_inchar(): low level input function.
  * Get characters from the keyboard.
  * Return the number of characters that are available.
  * If "wtime" == 0 do not wait for characters.
@@ -493,7 +493,7 @@ clip_own_selection(cbd)
 	}
     }
 #else
-    /* Only own the clibpard when we didn't own it yet. */
+    /* Only own the clipboard when we didn't own it yet. */
     if (!cbd->owned && cbd->available)
 	cbd->owned = (clip_gen_own_selection(cbd) == OK);
 #endif
@@ -3132,7 +3132,7 @@ vcol2col(wp, lnum, vcol)
     char_u	*start;
 
     start = ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
-    while (count <= vcol && *ptr != NUL)
+    while (count < vcol && *ptr != NUL)
     {
 	count += win_lbr_chartabsize(wp, ptr, count, NULL);
 	mb_ptr_adv(ptr);
diff --git a/src/version.c b/src/version.c
index f28590b9d1..73ca9637d5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    695,
 /**/
     694,
 /**/

From b453d6865f2c5787aca2dd878e6406b5f4e9c923 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 00:58:39 +0200
Subject: [PATCH 101/136] Added tag v7-3-695 for changeset cd6c420e31d6

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 8ab7ecab98..b4f66d389e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2031,3 +2031,4 @@ caa0ca9ad06cb515b7e6d2e4410e03802b58e167 v7-3-690
 337a4368fd2b68b9822b94e595d77b4d6773bfa4 v7-3-692
 fd96b3cc88ed71d4c4d24c6ac67c9d3a68ae6e6b v7-3-693
 8235ccf121bb241f8105d0ba6e1c92e9f8b04555 v7-3-694
+cd6c420e31d6843fa1231e1cf7a3d9eff0ad4e07 v7-3-695

From 48f17430609a7e7af89d8df9ef623a5253319646 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 01:21:59 +0200
Subject: [PATCH 102/136] updated for version 7.3.696 Problem:    Message about
 added spell language can be wrong. Solution:   Give correct message. Add
 g:menutrans_set_lang_to to allow for 	    translation. (Jiri Sedlak)

---
 runtime/menu.vim | 9 +++++++--
 src/version.c    | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/runtime/menu.vim b/runtime/menu.vim
index 91ab6e83fb..19c488f69c 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -434,6 +434,10 @@ if has("spell")
       let enc = &enc
     endif
 
+    if !exists("g:menutrans_set_lang_to")
+      let g:menutrans_set_lang_to = 'Set language to'
+    endif
+
     let found = 0
     let s = globpath(&rtp, "spell/*." . enc . ".spl")
     if s != ""
@@ -441,8 +445,9 @@ if has("spell")
       for f in split(s, "\n")
 	let nm = substitute(f, '.*spell[/\\]\(..\)\.[^/\\]*\.spl', '\1', "")
 	if nm != "en" && nm !~ '/'
+          let _nm = nm
 	  let found += 1
-	  let menuname = '&Tools.&Spelling.Set\ language\ to\ "' . nm . '"'
+	  let menuname = '&Tools.&Spelling.' . escape(g:menutrans_set_lang_to, "\\. \t|") . '\ "' . nm . '"'
 	  exe 'an 40.335.' . n . ' ' . menuname . ' :set spl=' . nm . ' spell<CR>'
 	  let s:undo_spellang += ['aun ' . menuname]
 	endif
@@ -452,7 +457,7 @@ if has("spell")
     if found == 0
       echomsg "Could not find other spell files"
     elseif found == 1
-      echomsg "Found spell file " . nm
+      echomsg "Found spell file " . _nm
     else
       echomsg "Found " . found . " more spell files"
     endif
diff --git a/src/version.c b/src/version.c
index 73ca9637d5..4cd98d3a2e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    696,
 /**/
     695,
 /**/

From 9600a7a5a0a485f7c266556a4ce0e3fdf502dbc4 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 01:21:59 +0200
Subject: [PATCH 103/136] Added tag v7-3-696 for changeset 447c688b82eb

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index b4f66d389e..84ce4cb5f1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2032,3 +2032,4 @@ caa0ca9ad06cb515b7e6d2e4410e03802b58e167 v7-3-690
 fd96b3cc88ed71d4c4d24c6ac67c9d3a68ae6e6b v7-3-693
 8235ccf121bb241f8105d0ba6e1c92e9f8b04555 v7-3-694
 cd6c420e31d6843fa1231e1cf7a3d9eff0ad4e07 v7-3-695
+447c688b82eb4a5eb7cd0e16521094b77160fd0f v7-3-696

From faebc8f4c4575192d1fc93fd219ed0cfa75d97cb Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 01:40:30 +0200
Subject: [PATCH 104/136] updated for version 7.3.697 Problem:    Leaking
 resources when setting GUI font. Solution:   Free the font. (Ken Takata)

---
 src/syntax.c  | 25 ++++++++++++++-----------
 src/version.c |  2 ++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/syntax.c b/src/syntax.c
index 59a2691a2b..81e9acd4de 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -105,7 +105,7 @@ static GuiFont font_name2handle __ARGS((char_u *name));
 # ifdef FEAT_XFONTSET
 static GuiFontset fontset_name2handle __ARGS((char_u *name, int fixed_width));
 # endif
-static void hl_do_font __ARGS((int idx, char_u *arg, int do_normal, int do_menu, int do_tooltip));
+static void hl_do_font __ARGS((int idx, char_u *arg, int do_normal, int do_menu, int do_tooltip, int free_font));
 #endif
 
 /*
@@ -7259,14 +7259,13 @@ do_highlight(line, forceit, init)
 		HL_TABLE()[idx].sg_fontset = NOFONTSET;
 # endif
 		hl_do_font(idx, arg, is_normal_group, is_menu_group,
-							    is_tooltip_group);
+						     is_tooltip_group, FALSE);
 
 # ifdef FEAT_XFONTSET
 		if (HL_TABLE()[idx].sg_fontset != NOFONTSET)
 		{
-		    /* New fontset was accepted. Free the old one, if there was
-		     * one.
-		     */
+		    /* New fontset was accepted. Free the old one, if there
+		     * was one. */
 		    gui_mch_free_fontset(temp_sg_fontset);
 		    vim_free(HL_TABLE()[idx].sg_font_name);
 		    HL_TABLE()[idx].sg_font_name = vim_strsave(arg);
@@ -7277,8 +7276,7 @@ do_highlight(line, forceit, init)
 		if (HL_TABLE()[idx].sg_font != NOFONT)
 		{
 		    /* New font was accepted. Free the old one, if there was
-		     * one.
-		     */
+		     * one. */
 		    gui_mch_free_font(temp_sg_font);
 		    vim_free(HL_TABLE()[idx].sg_font_name);
 		    HL_TABLE()[idx].sg_font_name = vim_strsave(arg);
@@ -8064,12 +8062,13 @@ fontset_name2handle(name, fixed_width)
  * Get the font or fontset for one highlight group.
  */
     static void
-hl_do_font(idx, arg, do_normal, do_menu, do_tooltip)
+hl_do_font(idx, arg, do_normal, do_menu, do_tooltip, free_font)
     int		idx;
     char_u	*arg;
     int		do_normal;		/* set normal font */
     int		do_menu UNUSED;		/* set menu font */
     int		do_tooltip UNUSED;	/* set tooltip font */
+    int		free_font;		/* free current font/fontset */
 {
 # ifdef FEAT_XFONTSET
     /* If 'guifontset' is not empty, first try using the name as a
@@ -8083,6 +8082,8 @@ hl_do_font(idx, arg, do_normal, do_menu, do_tooltip)
 	|| do_tooltip
 #  endif
 	    )
+	if (free_fontset)
+	    gui_mch_free_fontset(HL_TABLE()[idx].sg_fontset);
 	HL_TABLE()[idx].sg_fontset = fontset_name2handle(arg, 0
 #  ifdef FONTSET_ALWAYS
 		|| do_menu
@@ -8093,8 +8094,8 @@ hl_do_font(idx, arg, do_normal, do_menu, do_tooltip)
 		);
     if (HL_TABLE()[idx].sg_fontset != NOFONTSET)
     {
-	/* If it worked and it's the Normal group, use it as the
-	 * normal fontset.  Same for the Menu group. */
+	/* If it worked and it's the Normal group, use it as the normal
+	 * fontset.  Same for the Menu group. */
 	if (do_normal)
 	    gui_init_font(arg, TRUE);
 #   if (defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)) && defined(FEAT_MENU)
@@ -8126,6 +8127,8 @@ hl_do_font(idx, arg, do_normal, do_menu, do_tooltip)
     else
 # endif
     {
+	if (free_font)
+	    gui_mch_free_font(HL_TABLE()[idx].sg_font);
 	HL_TABLE()[idx].sg_font = font_name2handle(arg);
 	/* If it worked and it's the Normal group, use it as the
 	 * normal font.  Same for the Menu group. */
@@ -9162,7 +9165,7 @@ gui_do_one_color(idx, do_menu, do_tooltip)
     if (HL_TABLE()[idx].sg_font_name != NULL)
     {
 	hl_do_font(idx, HL_TABLE()[idx].sg_font_name, FALSE, do_menu,
-		   do_tooltip);
+							    do_tooltip, TRUE);
 	didit = TRUE;
     }
     if (HL_TABLE()[idx].sg_gui_fg_name != NULL)
diff --git a/src/version.c b/src/version.c
index 4cd98d3a2e..d10266df88 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    697,
 /**/
     696,
 /**/

From 1050735a29cbcf13382039921205348ff0955a5b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 01:40:30 +0200
Subject: [PATCH 105/136] Added tag v7-3-697 for changeset 7c72b5f7ada1

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 84ce4cb5f1..ccb4408280 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2033,3 +2033,4 @@ fd96b3cc88ed71d4c4d24c6ac67c9d3a68ae6e6b v7-3-693
 8235ccf121bb241f8105d0ba6e1c92e9f8b04555 v7-3-694
 cd6c420e31d6843fa1231e1cf7a3d9eff0ad4e07 v7-3-695
 447c688b82eb4a5eb7cd0e16521094b77160fd0f v7-3-696
+7c72b5f7ada1f4a028315aa50f8739e0e83c2e74 v7-3-697

From 9cb2e95126e9e83b9aa3812cde73cb8f7cdd9871 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 01:47:00 +0200
Subject: [PATCH 106/136] updated for version 7.3.698 Problem:    Python 3 does
 not preserve state beween commands. Solution:   Preserve the state. (Paul
 Ollis)

---
 src/if_python.c  | 7 ++++---
 src/if_python3.c | 6 +++++-
 src/version.c    | 2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/if_python.c b/src/if_python.c
index 2a53c93b0c..5e792b16d1 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -740,9 +740,10 @@ Python_Init(void)
 #else
 	PyMac_Initialize();
 #endif
-	/* Initialise threads and save the state using PyGILState_Ensure.
-	 * Without this call, thread-specific state (such as the system trace
-	 * hook), will be lost between invocations of Python code.  */
+	/* Initialise threads, and save the state using PyGILState_Ensure.
+	 * Without the call to PyGILState_Ensure, thread specific state (such
+	 * as the system trace hook), will be lost between invocations of
+	 * Python code. */
 	PyEval_InitThreads();
 	pygilstate = PyGILState_Ensure();
 #ifdef DYNAMIC_PYTHON
diff --git a/src/if_python3.c b/src/if_python3.c
index ea59a4233b..e9f7400f80 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -731,8 +731,12 @@ Python3_Init(void)
 #else
 	PyMac_Initialize();
 #endif
-	/* initialise threads, must be after Py_Initialize() */
+	/* Initialise threads, and save the state using PyGILState_Ensure.
+	 * Without the call to PyGILState_Ensure, thread specific state (such
+	 * as the system trace hook), will be lost between invocations of
+	 * Python code. */
 	PyEval_InitThreads();
+	pygilstate = PyGILState_Ensure();
 
 #ifdef DYNAMIC_PYTHON3
 	get_py3_exceptions();
diff --git a/src/version.c b/src/version.c
index d10266df88..6613e50daa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    698,
 /**/
     697,
 /**/

From 35189edd6d1f841856ce307dfdec49262a2e9494 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 01:47:00 +0200
Subject: [PATCH 107/136] Added tag v7-3-698 for changeset b5b892472ecb

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ccb4408280..23e4fe718c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2034,3 +2034,4 @@ fd96b3cc88ed71d4c4d24c6ac67c9d3a68ae6e6b v7-3-693
 cd6c420e31d6843fa1231e1cf7a3d9eff0ad4e07 v7-3-695
 447c688b82eb4a5eb7cd0e16521094b77160fd0f v7-3-696
 7c72b5f7ada1f4a028315aa50f8739e0e83c2e74 v7-3-697
+b5b892472ecb1a10cce1709e41700b264b6485d2 v7-3-698

From 7e45de33f12af875ea95e93077bbb2b7a5d94387 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 02:10:24 +0200
Subject: [PATCH 108/136] updated for version 7.3.699 Problem:    When
 'ttymouse' is set to "sgr" manually, it is overruled by 	    automatic
 detection. Solution:   Do not use automatic detection when 'ttymouse' was set
 manually. 	    (Hayaki Saito)

---
 src/term.c    | 26 ++++++++++++--------------
 src/version.c |  2 ++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/term.c b/src/term.c
index 38fc89b699..3efa7a7a14 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4079,24 +4079,22 @@ check_termcode(max_offset, buf, bufsize, buflen)
 
 		    if (tp[1 + (tp[0] != CSI)] == '>' && j == 2)
 		    {
+			/* Only set 'ttymouse' automatically if it was not set
+			 * by the user already. */
+			if (!option_was_set((char_u *)"ttym"))
+			{
 # ifdef TTYM_SGR
-			if (extra >= 277
-# ifdef TTYM_URXVT
-				&& ttym_flags != TTYM_URXVT
-# endif
-				)
-			    set_option_value((char_u *)"ttym", 0L,
+			    if (extra >= 277)
+				set_option_value((char_u *)"ttym", 0L,
 							  (char_u *)"sgr", 0);
-                        else
+			    else
 # endif
-			/* if xterm version >= 95 use mouse dragging */
-			if (extra >= 95
-# ifdef TTYM_URXVT
-				&& ttym_flags != TTYM_URXVT
-# endif
-				)
-			    set_option_value((char_u *)"ttym", 0L,
+			    /* if xterm version >= 95 use mouse dragging */
+			    if (extra >= 95)
+				set_option_value((char_u *)"ttym", 0L,
 						       (char_u *)"xterm2", 0);
+			}
+
 			/* if xterm version >= 141 try to get termcap codes */
 			if (extra >= 141)
 			{
diff --git a/src/version.c b/src/version.c
index 6613e50daa..e0404d0b32 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    699,
 /**/
     698,
 /**/

From b187843e5ade10490967823dfaf6e7136ebee24d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 02:10:24 +0200
Subject: [PATCH 109/136] Added tag v7-3-699 for changeset 4ffb6f9b58e0

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 23e4fe718c..4a3515ee24 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2035,3 +2035,4 @@ cd6c420e31d6843fa1231e1cf7a3d9eff0ad4e07 v7-3-695
 447c688b82eb4a5eb7cd0e16521094b77160fd0f v7-3-696
 7c72b5f7ada1f4a028315aa50f8739e0e83c2e74 v7-3-697
 b5b892472ecb1a10cce1709e41700b264b6485d2 v7-3-698
+4ffb6f9b58e0b51923fe6a71e6af158b6e3f7864 v7-3-699

From 8445570b11df8773729a536a8f19bc1e7c62990e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 02:17:45 +0200
Subject: [PATCH 110/136] updated for version 7.3.700 Problem:    Cannot detect
 URXVT and SGR mouse support. Solution:   add +mouse_urxvt and +mouse_sgr.
 (Hayaki Saito)

---
 src/eval.c    | 6 ++++++
 src/feature.h | 2 ++
 src/version.c | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/src/eval.c b/src/eval.c
index 66b8606e05..2f370b74ce 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -12276,9 +12276,15 @@ f_has(argvars, rettv)
 # ifdef FEAT_MOUSE_PTERM
 	"mouse_pterm",
 # endif
+# ifdef FEAT_MOUSE_SGR
+	"mouse_sgr",
+# endif
 # ifdef FEAT_SYSMOUSE
 	"mouse_sysmouse",
 # endif
+# ifdef FEAT_MOUSE_URXVT
+	"mouse_urxvt",
+# endif
 # ifdef FEAT_MOUSE_XTERM
 	"mouse_xterm",
 # endif
diff --git a/src/feature.h b/src/feature.h
index f33510480b..7ef654bb39 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -1038,8 +1038,10 @@
  * +mouse_gpm		Unix only: Include code for Linux console mouse
  *			handling.
  * +mouse_pterm		PTerm mouse support for QNX
+ * +mouse_sgr		Unix only: Include code for for SGR-styled mouse.
  * +mouse_sysmouse	Unix only: Include code for FreeBSD and DragonFly
  *			console mouse handling.
+ * +mouse_urxvt		Unix only: Include code for for urxvt mosue handling.
  * +mouse		Any mouse support (any of the above enabled).
  */
 /* OS/2 and Amiga console have no mouse support */
diff --git a/src/version.c b/src/version.c
index e0404d0b32..cbe525cc24 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    700,
 /**/
     699,
 /**/

From ffb1760a2aea2fa575f93fb8cc02e9b713dc9521 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 02:17:45 +0200
Subject: [PATCH 111/136] Added tag v7-3-700 for changeset c656847932d3

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 4a3515ee24..37f740f827 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2036,3 +2036,4 @@ cd6c420e31d6843fa1231e1cf7a3d9eff0ad4e07 v7-3-695
 7c72b5f7ada1f4a028315aa50f8739e0e83c2e74 v7-3-697
 b5b892472ecb1a10cce1709e41700b264b6485d2 v7-3-698
 4ffb6f9b58e0b51923fe6a71e6af158b6e3f7864 v7-3-699
+c656847932d33b5d68394ae1ea3153dbdba4d3ff v7-3-700

From 0fa7326ee9daadf7c710a5f5de758c58688ccc13 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 02:37:10 +0200
Subject: [PATCH 112/136] updated for version 7.3.701 Problem:    MS-Windows:
 Crash with stack overflow when setting 'encoding'. Solution:   Handle that
 loading the iconv library may be called recursively. 	    (Jiri Sedlak)

---
 src/os_win32.c | 16 ++++++++++++----
 src/version.c  |  2 ++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/os_win32.c b/src/os_win32.c
index 8151e6054a..006a361448 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -288,18 +288,26 @@ unescape_shellxquote(char_u *p, char_u *escaped)
 vimLoadLib(char *name)
 {
     HINSTANCE dll = NULL;
-    char old_dir[MAXPATHL];
+    TCHAR old_dir[MAXPATHL];
 
+    /* NOTE: Do not use mch_dirname() and mch_chdir() here, they may call
+     * vimLoadLib() recursively, which causes a stack overflow. */
     if (exe_path == NULL)
 	get_exe_name();
-    if (exe_path != NULL && mch_dirname(old_dir, MAXPATHL) == OK)
+    if (exe_path != NULL && GetCurrentDirectory(MAXPATHL, old_dir) != 0)
     {
 	/* Change directory to where the executable is, both to make sure we
 	 * find a .dll there and to avoid looking for a .dll in the current
 	 * directory. */
-	mch_chdir(exe_path);
+	SetCurrentDirectory(exe_path);
+	dll = LoadLibrary(name);
+	SetCurrentDirectory(old_dir);
+    }
+    else
+    {
+	/* We are not able to change directory to where the executable is, try
+	 * to load library anyway. */
 	dll = LoadLibrary(name);
-	mch_chdir(old_dir);
     }
     return dll;
 }
diff --git a/src/version.c b/src/version.c
index cbe525cc24..6afb9d16b3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    701,
 /**/
     700,
 /**/

From 2f1c96f1b307d095621f0048bed0e29cd6f18abb Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 02:37:10 +0200
Subject: [PATCH 113/136] Added tag v7-3-701 for changeset 48af86560945

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 37f740f827..f440cd5294 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2037,3 +2037,4 @@ cd6c420e31d6843fa1231e1cf7a3d9eff0ad4e07 v7-3-695
 b5b892472ecb1a10cce1709e41700b264b6485d2 v7-3-698
 4ffb6f9b58e0b51923fe6a71e6af158b6e3f7864 v7-3-699
 c656847932d33b5d68394ae1ea3153dbdba4d3ff v7-3-700
+48af8656094539f8f71dc51e0a6aa14d48ddffd0 v7-3-701

From 316771a5986ca248483c90a5315cce5e48902568 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 02:41:08 +0200
Subject: [PATCH 114/136] updated for version 7.3.702 Problem:    Nmake from
 VS6 service pack 6 is not recognized. Solution:   Detect the version number.
 (Jiri Sedlak)

---
 src/Make_mvc.mak | 4 ++++
 src/version.c    | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 357b677f0e..3ac29606b5 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -373,6 +373,10 @@ MSVCVER = 5.0
 MSVCVER = 6.0
 CPU = ix86
 !endif
+!if "$(_NMAKE_VER)" == "6.00.9782.0"
+MSVCVER = 6.0
+CPU = ix86
+!endif
 !if "$(_NMAKE_VER)" == "7.00.9466"
 MSVCVER = 7.0
 !endif
diff --git a/src/version.c b/src/version.c
index 6afb9d16b3..14d4c8f787 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    702,
 /**/
     701,
 /**/

From 0152d3dc4e8debabee85a7c2a0bd11ae9b196fde Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 02:41:08 +0200
Subject: [PATCH 115/136] Added tag v7-3-702 for changeset 916b5c11a13e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index f440cd5294..56544d307c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2038,3 +2038,4 @@ b5b892472ecb1a10cce1709e41700b264b6485d2 v7-3-698
 4ffb6f9b58e0b51923fe6a71e6af158b6e3f7864 v7-3-699
 c656847932d33b5d68394ae1ea3153dbdba4d3ff v7-3-700
 48af8656094539f8f71dc51e0a6aa14d48ddffd0 v7-3-701
+916b5c11a13e9978c85f9742546e70d614116883 v7-3-702

From 354e9e93d2fb9d239a1cd6439a0439d1cd035650 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 03:02:54 +0200
Subject: [PATCH 116/136] Updated runtime files.

---
 runtime/doc/cmdline.txt       |   4 +-
 runtime/doc/eval.txt          |   6 +-
 runtime/doc/mbyte.txt         |   9 +-
 runtime/doc/options.txt       |   8 +-
 runtime/doc/tags              |   1 +
 runtime/doc/todo.txt          |  52 +++++------
 runtime/doc/usr_41.txt        |   4 +-
 runtime/filetype.vim          |   4 +-
 runtime/menu.vim              |   2 +-
 runtime/syntax/abap.vim       | 164 +++++++++++++++++++++++-----------
 runtime/syntax/aptconf.vim    |   4 +-
 runtime/syntax/css.vim        |  33 ++++++-
 runtime/syntax/debcontrol.vim |   5 +-
 runtime/syntax/rexx.vim       |  87 ++++++++++++------
 14 files changed, 258 insertions(+), 125 deletions(-)

diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index a9e8acf538..0ed5cb3d39 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.3.  Last change: 2012 Jun 20
+*cmdline.txt*   For Vim version 7.3.  Last change: 2012 Oct 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -217,7 +217,7 @@ CTRL-\ e {expr}						*c_CTRL-\_e*
 			   :return cmd
 			:endfunc
 <		This doesn't work recursively, thus not when already editing
-		an expression.
+		an expression.  But it is possible to use in a mapping.
 
 							*c_CTRL-Y*
 CTRL-Y		When there is a modeless selection, copy the selection into
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 8934215eb7..3afc3d0f7a 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 Sep 05
+*eval.txt*	For Vim version 7.3.  Last change: 2012 Oct 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -91,8 +91,8 @@ For boolean operators Numbers are used.  Zero is FALSE, non-zero is TRUE.
 Note that in the command >
 	:if "foo"
 "foo" is converted to 0, which means FALSE.  To test for a non-empty string,
-use strlen(): >
-	:if strlen("foo")
+use empty(): >
+	:if !empty("foo")
 <				*E745* *E728* *E703* *E729* *E730* *E731*
 List, Dictionary and Funcref types are not automatically converted.
 
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index 9a37b86631..c2d95104a3 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 7.3.  Last change: 2012 Jun 06
+*mbyte.txt*     For Vim version 7.3.  Last change: 2012 Oct 06
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
@@ -1085,6 +1085,13 @@ Since the mapping is defined with |:lnoremap| the resulting quote will not be
 used for the start of another character.
 The "accents" keymap uses this.				*keymap-accents*
 
+The first column can also be in |<>| form:
+	<C-c>		Ctrl-C
+	<A-c>		Alt-c
+	<A-C>		Alt-C
+Note that the Alt mappings may not work, depending on your keyboard and
+terminal.
+
 Although it's possible to have more than one character in the second column,
 this is unusual.  But you can use various ways to specify the character: >
 	A	a		literal character
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f6beddaacd..53d4e8a55f 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.3.  Last change: 2012 Aug 15
+*options.txt*	For Vim version 7.3.  Last change: 2012 Oct 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -756,7 +756,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			feature}
 	When on and 'termbidi' is off, the required visual character
 	corrections that need to take place for displaying the Arabic language
-	take affect.  Shaping, in essence, gets enabled; the term is a broad
+	take effect.  Shaping, in essence, gets enabled; the term is a broad
 	one which encompasses:
 	  a) the changing/morphing of characters based on their location
 	     within a word (initial, medial, final and stand-alone).
@@ -6119,7 +6119,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			local to buffer
 	Number of spaces to use for each step of (auto)indent.  Used for
 	|'cindent'|, |>>|, |<<|, etc.
-	When zero the 'ts' value will be used.
+	When zero the 'ts' value will be used.  Use the |shiftwidth()|
+	function to get the effective shiftwidth value.
 
 						*'shortmess'* *'shm'*
 'shortmess' 'shm'	string	(Vim default "filnxtToO", Vi default: "",
@@ -6383,6 +6384,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	of 8, while being able to edit like it is set to 'sts'.  However,
 	commands like "x" still work on the actual characters.
 	When 'sts' is zero, this feature is off.
+	When 'sts' is negative, the value of 'shiftwidth' is used.
 	'softtabstop' is set to 0 when the 'paste' option is set.
 	See also |ins-expandtab|.  When 'expandtab' is not set, the number of
 	spaces is minimized by using <Tab>s.
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 0317e386dd..4d0c4d04d7 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -7550,6 +7550,7 @@ shell_error-variable	eval.txt	/*shell_error-variable*
 shellescape()	eval.txt	/*shellescape()*
 shift	intro.txt	/*shift*
 shift-left-right	change.txt	/*shift-left-right*
+shiftwidth()	eval.txt	/*shiftwidth()*
 short-name-changed	version4.txt	/*short-name-changed*
 showing-menus	gui.txt	/*showing-menus*
 sign-commands	sign.txt	/*sign-commands*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index b0fa84147b..85673109fb 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 Oct 04
+*todo.txt*      For Vim version 7.3.  Last change: 2012 Oct 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -34,43 +34,27 @@ not be repeated below, unless there is extra information.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-Patch with Test for patch  7.3.673 (Christian Brabandt, 2012 Oct 3)
-
-Patch for C-\ e when editing expression. (Christian Brabandt, 2012 Oct 3)
-Correction by ZyX.
-
 Go through more coverity reports.
 
 Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
 
 Checking runtime scripts: Thilo Six, 2012 Jun 6.
 
-Crash with 1023 byte directory name. (Danek Duvall, 2012 Sep 19)
-
-Patch for wrong text in balloon, Issue 58. (Dominique Pelle)
-
-Patch for menu.vim to correct message about adding spell file.
-(Jiri Sedlak, 2012 Sep 24)
-
 GTK: problem with 'L' in 'guioptions' changing the window width.
 (Aaron Cornelius, 2012 Feb 6)
 
-Patch for SGR mouse with older xterm. (Hayaki Saito, 2012 Sep 19)
+Patch to fix undofile hash computed when not necessary. (Christian Brabandt,
+2012 Oct 16, update Oct 18)
 
-Patch for crash with an autocommand. (ZyX, 2012 Sep 6, second one)
-Also patch for garbage, but use vim_strncpy() instead.
-
-Patch to fix crash on Win32 when setting 'encoding'. (Jiri Sedlak, 2012 Sep
-12)
-
-Patch to update example using empty(). (ZyX, 2012 Sep 13)
+Patch to fix repeating "cgn". (Christian Brabandt, 2012 Oct 16)
+Update Oct 17.
 
 Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
 
 Updated French and Esperanto files. (Dominique Pelle, 2012 Aug 19)
 
 When showing diffs filler lines may be hidden at first.
-Patch by Christian Brabandt, 2012 Sep 6.
+Patch by Christian Brabandt, 2012 Sep 6.  Update Oct 11.
 
 Patch for memory leaks on exception. (ZyX, 2012 Sep 9)
 
@@ -78,6 +62,11 @@ 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.
+
 mouse_sgr is not ordered alphabetically in :version output.
 Docs list mouse_urxvt as normal feature, should be big. (Hayaki Saito, 2012
 Aug 16)
@@ -104,7 +93,7 @@ complete the contents of the directory.  No escaping for the "!"? (Jan
 Stocker, 2012 Jan 5)
 
 Patch to support 'u' in interactive substitute. (Christian Brabandt, 2012 Sep
-28)  Asked for tests.
+28)  With tests: Oct 9.
 
 Patch for IME handling, adds 'imactivatefunc' and 'imstatusfunc' option.
 (Yukihiro Nakadaira, 2012 Aug 16)
@@ -115,10 +104,17 @@ Issue 54: document behavior of -complete, also expands arg.
 New syntax files for apt. (quidame, 2012 Sep 21)
 
 Patch for if_lua. (Luis Carvalho, 2012 Aug 26, update Aug 29, another Aug 30,
-then Sep 1)
+then Sep 1, reminder Oct 14)
 
 Issue 72: 'autochdir' causes problems for :vimgrep.
 
+:setlocal does not work in the sandbox, but :set does.  Both should work in a
+similar way (not setting some options). (Michael Henry, 2012 Oct 20)
+
+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.
+
 MS-Windows: Crash opening very long file name starting with "\\".
 (Christian Brock, 2012 Jun 29)
 
@@ -169,6 +165,10 @@ But use "gi" instead of "a".  Or use CTRL-\ CTRL-O.
 Patch to support user name completion on MS-Windows. (Yasuhiro Matsumoto, 2012
 Aug 16)
 
+Have an option for spell checking to not mark any Chinese, Japanese or other
+double-width characters as error.  Or perhaps all characters above 256.
+(Bill Sun)  Helps a lot for mixed Asian and latin text.
+
 URXVT:
 - will get stuck if byte sequence does not containe expected semicolon.
 - Use urxvt mouse support also in xterm.  Explanations:
@@ -761,10 +761,6 @@ Now that colnr_T is int instead of unsigned, more type casts can be removed.
 'delcombine' does not work for the command line. (Tony Mechelynck, 2009 Jul
 20)
 
-Unwanted file name escaping: ":echo input('file:' , '', 'file')"
-And use file name completion on a file with spaces. (Frederic Hardy, 2009 Mar
-23)
-
 Don't load macmap.vim on startup, turn it into a plugin. (Ron Aaron,
 2009 Apr 7)  Reminder Apr 14.
 
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 1a4ae3d1b3..edb9b82c54 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 7.3.  Last change: 2012 Mar 16
+*usr_41.txt*	For Vim version 7.3.  Last change: 2012 Oct 13
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -1581,7 +1581,7 @@ Here the comment part will be ignored.  However, Vim will try to unmap
 
 RESTORING THE VIEW
 
-Sometimes you want to make a change and go back to where cursor was.
+Sometimes you want to make a change and go back to where the cursor was.
 Restoring the relative position would also be nice, so that the same line
 appears at the top of the window.
    This example yanks the current line, puts it above the first line in the
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 8162acec81..1f59290916 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1566,7 +1566,7 @@ au BufNewFile,BufRead *.reg
 au BufNewFile,BufRead *.rib			setf rib
 
 " Rexx
-au BufNewFile,BufRead *.rexx,*.rex,*.jrexx,*.rxj,*.orx	setf rexx
+au BufNewFile,BufRead *.rex,*.orx,*.rxo,*.rxj,*.jrexx,*.rexxj,*.rexx,*.testGroup,*.testUnit	setf rexx
 
 " R (Splus)
 if has("fname_case")
@@ -1884,6 +1884,8 @@ au BufNewFile,BufRead *.st			setf st
 au BufNewFile,BufRead *.cls
 	\ if getline(1) =~ '^%' |
 	\  setf tex |
+	\ elseif getline(1)[0] == '#' && getline(1) =~ 'rexx' |
+	\  setf rexx |
 	\ else |
 	\  setf st |
 	\ endif
diff --git a/runtime/menu.vim b/runtime/menu.vim
index 19c488f69c..2b5acb982a 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2011 Mar 22
+" Last Change:	2012 Oct 21
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
diff --git a/runtime/syntax/abap.vim b/runtime/syntax/abap.vim
index 18d3b0fd3f..8f7306d9dd 100644
--- a/runtime/syntax/abap.vim
+++ b/runtime/syntax/abap.vim
@@ -1,8 +1,9 @@
 " Vim ABAP syntax file
 "    Language: SAP - ABAP/R4
-"    Revision: 1.0
-"  Maintainer: Marius Piedallu van Wyk <marius@e.co.za>
-" Last Change: 2006 Apr 13
+"    Revision: 2.0
+"  Maintainer: Marius Piedallu van Wyk <lailoken@gmail.com>
+" Last Change: 2012 Oct 12
+"     Comment: Thanks to EPI-USE Labs for all your assistance. :)
 
 " For version  < 6.0: Clear all syntax items
 " For version >= 6.0: Quit when a syntax file was already loaded
@@ -16,73 +17,126 @@ endif
 syn case ignore
 
 " Symbol Operators
-syn match   abapSymbolOperator  "[+\-/=<>$]"
-syn match   abapSymbolOperator  "\*"
-syn match   abapSymbolOperator  "[<>]="
-syn match   abapSymbolOperator  "<>"
-syn match   abapSymbolOperator  "\*\*"
-syn match   abapSymbolOperator  "[()]"
-syn match   abapSymbolOperator  "[:,\.]"
+syn match   abapSymbolOperator  "\W+\W"
+syn match   abapSymbolOperator  "\W-\W"
+syn match   abapSymbolOperator  "\W/\W"
+syn match   abapSymbolOperator  "\W%\W"
+syn match   abapSymbolOperator  "\W=\W"
+syn match   abapSymbolOperator  "\W<\W"
+syn match   abapSymbolOperator  "\W>\W"
+syn match   abapSymbolOperator  "\W\*\W"
+syn match   abapSymbolOperator  "\W[<>]=\W"
+syn match   abapSymbolOperator  "\W<>\W"
+syn match   abapSymbolOperator  "\W\*\*\W"
+syn match   abapSymbolOperator  "\[\]"
+syn match   abapSymbolOperator  "->\*\?"
+syn match   abapSymbolOperator  "=>"
+syn match   abapSymbolOperator  "[()~:,\.&$]"
 
 " Literals
-syn region  abapString matchgroup=abapString start="'" end="'" contains=abapStringEscape
-syn match   abapStringEscape contained "''"
+syn region  abapCharString matchgroup=abapCharString start="'" end="'" contains=abapCharStringEscape
+syn match   abapCharStringEscape contained "''"
 
-syn match   abapNumber  "-\=\<\d\+\>"
+syn region  abapString matchgroup=abapString start="`" end="`" contains=abapStringEscape
+syn match   abapStringEscape contained "``"
+
+syn match   abapNumber  "\-\=\<\d\+\>"
 syn region  abapHex     matchgroup=abapHex start="X'" end="'"
 
 if version >= 600
-  setlocal iskeyword=-,48-57,_,A-Z,a-z
+  setlocal iskeyword=48-57,_,A-Z,a-z,/
 else
-  set iskeyword=-,48-57,_,A-Z,a-z
+  set iskeyword=48-57,_,A-Z,a-z,/
 endif
 
+syn match   abapNamespace        "/\w\+/"
+
+" multi-word statements
+syn match   abapComplexStatement "\(WITH\W\+\(HEADER\W\+LINE\|FRAME\|KEY\)\|WITH\)"
+syn match   abapComplexStatement "NO\W\+STANDARD\W\+PAGE\W\+HEADING"
+syn match   abapComplexStatement "\(EXIT\W\+FROM\W\+STEP\W\+LOOP\|EXIT\)"
+syn match   abapComplexStatement "\(BEGIN\W\+OF\W\+\(BLOCK\|LINE\)\|BEGIN\W\+OF\)"
+syn match   abapComplexStatement "\(END\W\+OF\W\+\(BLOCK\|LINE\)\|END\W\+OF\)"
+syn match   abapComplexStatement "NO\W\+INTERVALS"
+syn match   abapComplexStatement "RESPECTING\W\+BLANKS"
+syn match   abapComplexStatement "SEPARATED\W\+BY"
+syn match   abapComplexStatement "\(USING\W\+\(EDIT\W\+MASK\)\|USING\)"
+syn match   abapComplexStatement "\(WHERE\W\+\(LINE\)\)"
+syn match   abapComplexStatement "RADIOBUTTON\W\+GROUP"
+syn match   abapComplexStatement "REF\W\+TO"
+syn match   abapComplexStatement "\(PUBLIC\|PRIVATE\|PROTECTED\)\(\W\+SECTION\)\?"
+syn match   abapComplexStatement "DELETING\W\+\(TRAILING\|LEADING\)"
+syn match   abapComplexStatement "\(ALL\W\+OCCURRENCES\)\|\(\(FIRST\|LAST\)\W\+OCCURRENCE\)"
+syn match   abapComplexStatement "INHERITING\W\+FROM"
+
+" hyphenated-word statements
+syn match   abapComplexStatement "LINE-COUNT"
+syn match   abapComplexStatement "ADD-CORRESPONDING"
+syn match   abapComplexStatement "AUTHORITY-CHECK"
+syn match   abapComplexStatement "BREAK-POINT"
+syn match   abapComplexStatement "CLASS-DATA"
+syn match   abapComplexStatement "CLASS-METHODS"
+syn match   abapComplexStatement "CLASS-METHOD"
+syn match   abapComplexStatement "DIVIDE-CORRESPONDING"
+syn match   abapComplexStatement "EDITOR-CALL"
+syn match   abapComplexStatement "END-OF-DEFINITION"
+syn match   abapComplexStatement "END-OF-PAGE"
+syn match   abapComplexStatement "END-OF-SELECTION"
+syn match   abapComplexStatement "FIELD-GROUPS"
+syn match   abapComplexStatement "FIELD-SYMBOLS"
+syn match   abapComplexStatement "FUNCTION-POOL"
+syn match   abapComplexStatement "MOVE-CORRESPONDING"
+syn match   abapComplexStatement "MULTIPLY-CORRESPONDING"
+syn match   abapComplexStatement "NEW-LINE"
+syn match   abapComplexStatement "NEW-PAGE"
+syn match   abapComplexStatement "NEW-SECTION"
+syn match   abapComplexStatement "PRINT-CONTROL"
+syn match   abapComplexStatement "RP-PROVIDE-FROM-LAST"
+syn match   abapComplexStatement "SELECT-OPTIONS"
+syn match   abapComplexStatement "SELECTION-SCREEN"
+syn match   abapComplexStatement "START-OF-SELECTION"
+syn match   abapComplexStatement "SUBTRACT-CORRESPONDING"
+syn match   abapComplexStatement "SYNTAX-CHECK"
+syn match   abapComplexStatement "SYNTAX-TRACE"
+syn match   abapComplexStatement "TOP-OF-PAGE"
+syn match   abapComplexStatement "TYPE-POOL"
+syn match   abapComplexStatement "TYPE-POOLS"
+syn match   abapComplexStatement "LINE-SIZE"
+syn match   abapComplexStatement "LINE-COUNT"
+syn match   abapComplexStatement "MESSAGE-ID"
+syn match   abapComplexStatement "DISPLAY-MODE"
+syn match   abapComplexStatement "READ\(-ONLY\)\?"
+
 " ABAP statements
-syn keyword abapStatement ADD ADD-CORRESPONDING ASSIGN AT AUTHORITY-CHECK
-syn keyword abapStatement BACK BREAK-POINT
-syn keyword abapStatement CALL CASE CHECK CLEAR CLOSE CNT COLLECT COMMIT COMMUNICATION COMPUTE CONCATENATE CONDENSE CONSTANTS CONTINUE CONTROLS CONVERT CREATE CURRENCY
-syn keyword abapStatement DATA DEFINE DELETE DESCRIBE DETAIL DIVIDE DIVIDE-CORRESPONDING DO
-syn keyword abapStatement EDITOR-CALL ELSE ELSEIF END-OF-DEFINITION END-OF-PAGE END-OF-SELECTION ENDAT ENDCASE ENDDO ENDEXEC ENDFORM ENDFUNCTION ENDIF ENDIFEND ENDLOOP ENDMODULE ENDON ENDPROVIDE ENDSELECT ENDWHILE EXEC EXPORT EXPORTING EXTRACT
-syn keyword abapStatement FETCH FIELD-GROUPS FIELD-SYMBOLS FIELDS FORM FORMAT FREE FUNCTION FUNCTION-POOL
+syn keyword abapStatement ADD ALIAS ALIASES ASSERT ASSIGN ASSIGNING AT
+syn keyword abapStatement BACK BOUND
+syn keyword abapStatement CALL CASE CATCH CHECK CLASS CLEAR CLOSE CNT COLLECT COMMIT COMMUNICATION COMPUTE CONCATENATE CONDENSE CONSTANTS CONTINUE CONTROLS CONVERT CREATE CURRENCY
+syn keyword abapStatement DATA DEFINE DEFINITION DEFERRED DELETE DESCRIBE DETAIL DIVIDE DO
+syn keyword abapStatement ELSE ELSEIF ENDAT ENDCASE ENDCLASS ENDDO ENDEXEC ENDFORM ENDFUNCTION ENDIF ENDIFEND ENDINTERFACE ENDLOOP ENDMETHOD ENDMODULE ENDON ENDPROVIDE ENDSELECT ENDTRY ENDWHILE EVENT EVENTS EXEC EXIT EXPORT EXPORTING EXTRACT
+syn keyword abapStatement FETCH FIELDS FORM FORMAT FREE FROM FUNCTION
 syn keyword abapStatement GENERATE GET
 syn keyword abapStatement HIDE
-syn keyword abapStatement IF IMPORT IMPORTING INDEX INFOTYPES INITIALIZATION INPUT INSERT
-syn keyword abapStatement LEAVE LIKE LOAD LOCAL LOOP
-syn keyword abapStatement MESSAGE MODIFY MODULE MOVE MOVE-CORRESPONDING MULTIPLY MULTIPLY-CORRESPONDING
-syn keyword abapStatement NEW-LINE NEW-PAGE NEW-SECTION
-syn keyword abapStatement ON OVERLAY
-syn keyword abapStatement PACK PARAMETERS PERFORM POSITION PRINT-CONTROL PROGRAM PROVIDE PUT
-syn keyword abapStatement RAISE RANGES READ RECEIVE REFRESH REJECT REPLACE REPORT RESERVE RESTORE ROLLBACK RP-PROVIDE-FROM-LAST
-syn keyword abapStatement SCAN SCROLL SEARCH SELECT SELECT-OPTIONS SELECTION-SCREEN SET SHIFT SKIP SORT SPLIT START-OF-SELECTION STATICS STOP SUBMIT SUBTRACT SUBTRACT-CORRESPONDING SUM SUMMARY SUPPRESS SYNTAX-CHECK SYNTAX-TRACE
-syn keyword abapStatement TABLES TOP-OF-PAGE TRANSFER TRANSLATE TYPE TYPE-POOL TYPE-POOLS TYPES
-syn keyword abapStatement UNPACK UPDATE
+syn keyword abapStatement IF IMPORT IMPORTING INDEX INFOTYPES INITIAL INITIALIZATION INTERFACE INTERFACES INPUT INSERT IMPLEMENTATION IS
+syn keyword abapStatement LEAVE LIKE LINE LOAD LOCAL LOOP
+syn keyword abapStatement MESSAGE METHOD METHODS MODIFY MODULE MOVE MULTIPLY
+syn keyword abapStatement ON OVERLAY OPTIONAL OTHERS
+syn keyword abapStatement PACK PARAMETERS PERFORM POSITION PROGRAM PROVIDE PUT
+syn keyword abapStatement RAISE RANGES RECEIVE REDEFINITION REFERENCE REFRESH REJECT REPLACE REPORT RESERVE RESTORE RETURNING ROLLBACK
+syn keyword abapStatement SCAN SCROLL SEARCH SELECT SET SHIFT SKIP SORT SORTED SPLIT STANDARD STATICS STEP STOP SUBMIT SUBTRACT SUM SUMMARY SUPPRESS
+syn keyword abapStatement TABLES TIMES TRANSFER TRANSLATE TRY TYPE TYPES
+syn keyword abapStatement UNASSIGN ULINE UNPACK UPDATE
 syn keyword abapStatement WHEN WHILE WINDOW WRITE
 
 " More statemets
 syn keyword abapStatement OCCURS STRUCTURE OBJECT PROPERTY
 syn keyword abapStatement CASTING APPEND RAISING VALUE COLOR
-syn keyword abapStatement LINE-SIZE LINE-COUNT MESSAGE-ID
-syn keyword abapStatement CHANGING EXCEPTIONS DEFAULT CHECKBOX COMMENT
-syn keyword abapStatement ID NUMBER FOR DISPLAY-MODE TITLE OUTPUT
-
-" More multi-word statements
-syn match   abapStatement "\(\W\|^\)\(WITH\W\+\(HEADER\W\+LINE\|FRAME\|KEY\)\|WITH\)\(\W\|$\)"ms=s+1,me=e-1
-syn match   abapStatement "\(\W\|^\)NO\W\+STANDARD\W\+PAGE\W\+HEADING\(\W\|$\)"ms=s+1,me=e-1
-syn match   abapStatement "\(\W\|^\)\(EXIT\W\+FROM\W\+STEP\W\+LOOP\|EXIT\)\(\W\|$\)"ms=s+1,me=e-1
-syn match   abapStatement "\(\W\|^\)\(BEGIN\W\+OF\W\+\(BLOCK\|LINE\)\|BEGIN\W\+OF\)\(\W\|$\)"ms=s+1,me=e-1
-syn match   abapStatement "\(\W\|^\)\(END\W\+OF\W\+\(BLOCK\|LINE\)\|END\W\+OF\)\(\W\|$\)"ms=s+1,me=e-1
-syn match   abapStatement "\(\W\|^\)IS\W\+INITIAL\(\W\|$\)"ms=s+1,me=e-1
-syn match   abapStatement "\(\W\|^\)NO\W\+INTERVALS\(\W\|$\)"ms=s+1,me=e-1
-syn match   abapStatement "\(\W\|^\)SEPARATED\W\+BY\(\W\|$\)"ms=s+1,me=e-1
-syn match   abapStatement "\(\W\|^\)\(USING\W\+\(EDIT\W\+MASK\)\|USING\)\(\W\|$\)"ms=s+1,me=e-1
-syn match   abapStatement "\(\W\|^\)\(WHERE\W\+\(LINE\)\)\(\W\|$\)"ms=s+1,me=e-1
-syn match   abapStatement "\(\W\|^\)RADIOBUTTON\W\+GROUP\(\W\|$\)"ms=s+1,me=e-1
-syn match   abapStatement "\(\W\|^\)REF\W\+TO\(\W\|$\)"ms=s+1,me=e-1
+syn keyword abapStatement CHANGING EXCEPTION EXCEPTIONS DEFAULT CHECKBOX COMMENT
+syn keyword abapStatement ID NUMBER FOR TITLE OUTPUT
 
 " Special ABAP specific tables:
 syn match   abapSpecial       "\(\W\|^\)\(sy\|\(p\|pa\)\d\d\d\d\|t\d\d\d.\|innnn\)\(\W\|$\)"ms=s+1,me=e-1
 syn match   abapSpecialTables "\(sy\|\(p\|pa\)\d\d\d\d\|t\d\d\d.\|innnn\)-"me=e-1 contained
-syn match   abapSpecial       "\(\W\|^\)\w\+-\(\w\+-\w\+\|\w\+\)"ms=s+1 contains=abapSpecialTables
+syn match   abapSpecial       "\(\W\|^\)\w\+-\(\w\+-\w\+\|\w\+\)"ms=s+1 contains=abapSpecialTables,abapStatement,abapComplexStatement
 
 " Pointer
 syn match   abapSpecial  "<\w\+>"
@@ -94,7 +148,7 @@ syn keyword abapSpecial  TRUE FALSE NULL SPACE
 syn region abapInclude   start="include" end="." contains=abapComment
 
 " Types
-syn keyword abapTypes    c n i p f d t x
+syn keyword abapTypes    c n i p f d t x string xstring decfloat16 decfloat34
 
 " Atritmitic operators
 syn keyword abapOperator abs sign ceil floor trunc frac acos asin atan cos sin tan
@@ -107,7 +161,7 @@ syn keyword abapOperator strlen xstrlen charlen numofchar dbmaxlen
 syn keyword abapOperator lines
 
 " Table operators (SELECT operators)
-syn keyword abapOperator INTO FROM WHERE GROUP BY HAVING ORDER BY SINGLE
+syn keyword abapOperator INTO WHERE GROUP BY HAVING ORDER BY SINGLE
 syn keyword abapOperator APPENDING CORRESPONDING FIELDS OF TABLE
 syn keyword abapOperator LEFT RIGHT OUTER INNER JOIN AS CLIENT SPECIFIED BYPASSING BUFFER UP TO ROWS CONNECTING
 syn keyword abapOperator EQ NE LT LE GT GE NOT AND OR XOR IN LIKE BETWEEN
@@ -119,6 +173,7 @@ syn match   abapError    "\.\."
 syn region  abapComment  start="^\*" end="$" contains=abapTodo
 syn match   abapComment  "\".*" contains=abapTodo
 syn keyword abapTodo     contained TODO NOTE
+syn match   abapTodo     "\#EC\W\+\w\+"
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -134,13 +189,18 @@ if version >= 508 || !exists("did_abap_syntax_inits")
   HiLink abapError          Error
   HiLink abapComment        Comment
   HiLink abapInclude        Include
+  HiLink abapStatement      Statement
+  HiLink abapComplexStatement      Statement
   HiLink abapSpecial        Special
+  HiLink abapNamespace      Special
   HiLink abapSpecialTables  PreProc
   HiLink abapSymbolOperator abapOperator
   HiLink abapOperator       Operator
-  HiLink abapStatement      Statement
+  HiLink abapCharString     String
   HiLink abapString         String
   HiLink abapFloat          Float
+  HiLink abapTypes          Type
+  HiLink abapSymbol         Structure
   HiLink abapNumber         Number
   HiLink abapHex            Number
 
diff --git a/runtime/syntax/aptconf.vim b/runtime/syntax/aptconf.vim
index 40fe92b3ef..dabfe56e75 100644
--- a/runtime/syntax/aptconf.vim
+++ b/runtime/syntax/aptconf.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	APT config file
 " Maintainer:	Yann Amar <quidame@poivron.org>
-" Last Change:	2012 Oct 05
+" Last Change:	2012 Oct 06
 
 " For version 5.x: Clear all syntax items
 " For version 6.x and 7.x: Quit when a syntax file was already loaded
@@ -17,6 +17,7 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
+
 " Errors:
 " Catch all that is not overridden by next rules/items:
 syn match	aptconfError		display '[^[:blank:]]'
@@ -490,4 +491,3 @@ let b:current_syntax = "aptconf"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim
index df7f2a1aae..2b14bf2bed 100644
--- a/runtime/syntax/css.vim
+++ b/runtime/syntax/css.vim
@@ -5,7 +5,8 @@
 "               Yeti            (Add full CSS2, HTML4 support)
 "               Nikolai Weibull (Add CSS2 support)
 " Maintainer:   Jules Wang      <w.jq0722@gmail.com>
-" Last Change:  2012 Oct 05
+" URL:          https://github.com/JulesWang/css.vim
+" Last Change:  2012 Dec 15
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -90,7 +91,37 @@ syn region cssFontDescriptorFunction contained matchgroup=cssFunctionName start=
 syn match cssUnicodeRange contained "U+[0-9A-Fa-f?]\+"
 syn match cssUnicodeRange contained "U+\x\+-\x\+"
 
+" The 16 basic color names
 syn keyword cssColor contained aqua black blue fuchsia gray green lime maroon navy olive purple red silver teal yellow
+
+" 130 more color names
+syn keyword cssColor contained aliceblue antiquewhite aquamarine azure
+syn keyword cssColor contained beige bisque blanchedalmond blueviolet brown burlywood
+syn keyword cssColor contained cadetblue chartreuse chocolate coral cornflowerblue cornsilk crimson cyan
+syn match cssColor contained /dark\(blue\|cyan\|goldenrod\|gray\|green\|grey\|khaki\)/
+syn match cssColor contained /dark\(magenta\|olivegreen\|orange\|orchid\|red\|salmon\|seagreen\)/
+syn match cssColor contained /darkslate\(blue\|gray\|grey\)/
+syn match cssColor contained /dark\(turquoise\|violet\)/
+syn keyword cssColor contained deeppink deepskyblue dimgray dimgrey dodgerblue firebrick
+syn keyword cssColor contained floralwhite forestgreen gainsboro ghostwhite gold
+syn keyword cssColor contained goldenrod greenyellow grey honeydew hotpink
+syn keyword cssColor contained indianred indigo ivory khaki lavender lavenderblush lawngreen
+syn keyword cssColor contained lemonchiffon limegreen linen magenta
+syn match cssColor contained /light\(blue\|coral\|cyan\|goldenrodyellow\|gray\|green\)/
+syn match cssColor contained /light\(grey\|pink\|salmon\|seagreen\|skyblue\|yellow\)/
+syn match cssColor contained /light\(slategray\|slategrey\|steelblue\)/
+syn match cssColor contained /medium\(aquamarine\|blue\|orchid\|purple\|seagreen\)/
+syn match cssColor contained /medium\(slateblue\|springgreen\|turquoise\|violetred\)/
+syn keyword cssColor contained midnightblue mintcream mistyrose moccasin navajowhite
+syn keyword cssColor contained oldlace olivedrab orange orangered orchid
+syn match cssColor contained /pale\(goldenrod\|green\|turquoise\|violetred\)/
+syn keyword cssColor contained papayawhip peachpuff peru pink plum powderblue
+syn keyword cssColor contained rosybrown royalblue saddlebrown salmon sandybrown
+syn keyword cssColor contained seagreen seashell sienna skyblue slateblue
+syn keyword cssColor contained slategray slategrey snow springgreen steelblue tan
+syn keyword cssColor contained thistle tomato turquoise violet wheat
+syn keyword cssColor contained whitesmoke yellowgreen
+
 " FIXME: These are actually case-insentivie too, but (a) specs recommend using
 " mixed-case (b) it's hard to highlight the word `Background' correctly in
 " all situations
diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
index 7875b3c977..74b41b2f0e 100644
--- a/runtime/syntax/debcontrol.vim
+++ b/runtime/syntax/debcontrol.vim
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2011 Dec 09
+" Last Change: 2012 Jun 06
 " URL: http://anonscm.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debcontrol.vim
 
 " Standard syntax initialization
@@ -45,7 +45,7 @@ syn match	debcontrolEmail	"[_=[:alnum:]\.+-]\+@[[:alnum:]\./\-]\+"
 syn match	debcontrolEmail	"<.\{-}>"
 
 " #-Comments
-syn match debcontrolComment "^#.*$"
+syn match debcontrolComment "^#.*$" contains=@Spell
 
 syn case ignore
 
@@ -69,6 +69,7 @@ syn region debcontrolStrictField start="^\%(XS-\)\=DM-Upload-Allowed" end="$" co
 " Catch-all for the other legal fields
 syn region debcontrolField start="^\%(\%(XSBC-Original-\)\=Maintainer\|Standards-Version\|Essential\|Bugs\|Origin\|X[SB]-Python-Version\|\%(XS-\)\=Vcs-Mtn\):" end="$" contains=debcontrolKey,debcontrolVariable,debcontrolEmail oneline
 syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Provides\|Replaces\|Conflicts\|Enhances\|Breaks\|Uploaders\|Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment
+syn region debcontrolMultiFieldSpell start="^\%(Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment,@Spell
 
 " Associate our matches and regions with pretty colours
 if version >= 508 || !exists("did_debcontrol_syn_inits")
diff --git a/runtime/syntax/rexx.vim b/runtime/syntax/rexx.vim
index b4d07323d1..ef698a5351 100644
--- a/runtime/syntax/rexx.vim
+++ b/runtime/syntax/rexx.vim
@@ -1,14 +1,8 @@
 " Vim syntax file
 " Language:	Rexx
 " Maintainer:	Thomas Geulig <geulig@nentec.de>
-" Last Change:  2005 Dez  9, added some <http://www.ooRexx.org>-coloring,
-"                            line comments, do *over*, messages, directives,
-"                            highlighting classes, methods, routines and requires
-"               2007 Oct 17, added support for new ooRexx 3.2 features
-"               Rony G. Flatscher <rony.flatscher@wu-wien.ac.at>
-"
+" Last Change:  2012 Sep 14, added support for new ooRexx 4.0 features
 " URL:		http://www.geulig.de/vim/rexx.vim
-"
 " Special Thanks to Dan Sharp <dwsharp@hotmail.com> and Rony G. Flatscher
 " <Rony.Flatscher@wu-wien.ac.at> for comments and additions
 
@@ -54,7 +48,7 @@ syn match rexxKeyword contained "\<use\>\s*\(strict\s*\)\?\<arg\>"
 syn match rexxRegularCallSignal contained "\<\(call\|signal\)\s\(\s*on\>\|\s*off\>\)\@!\(\k\+\ze\|\ze(\)\(\s*\|;\|$\|(\)"
 syn region rexxLabel contained start="\<\(call\|signal\)\>\s*\zs\(\k*\|(\)" end="\ze\(\s*\|;\|$\|(\)" containedin=rexxRegularCallSignal
 
-syn match rexxExceptionHandling contained "\<\(call\|signal\)\>\s\+\<\(on\|off\)\>.*\(;\|$\)"
+syn match rexxExceptionHandling contained "\<\(call\|signal\)\>\s\+\<\(on\|off\)\>.*\(;\|$\)" contains=rexxComment
 
 " hilite label given after keyword "name"
 syn match rexxLabel "name\s\+\zs\k\+\ze" containedin=rexxExceptionHandling
@@ -74,13 +68,14 @@ syn match rexxConditional "\<\(then\|else\|when\|otherwise\)\(\s*\|;\|\_$\|\)\>"
 syn match rexxLoopKeywords "\<\(to\|by\|for\|until\|while\|over\)\>" containedin=doLoopSelectLabelRegion
 
 " must be after Conditional phrases!
-syn match doLoopSelectLabelRegion "\<\(do\|loop\|select\)\>\s\+\(label\s\+\)\?\(\s\+\k\+\s\+\zs\<over\>\)\?\k*\(\s\+forever\)\?\(\s\|;\|$\)" 
+syn match doLoopSelectLabelRegion "\<\(do\|loop\|select\)\>\s\+\(label\s\+\)\?\(\s\+\k\+\s\+\zs\<over\>\)\?\k*\(\s\+forever\)\?\(\s\|;\|$\)" contains=doLoopSelectLabelRegion,rexxStartValueAssignment,rexxLoopKeywords
 
 " color label's name
 syn match rexxLabel2 "\<\(do\|loop\|select\)\>\s\+label\s\+\zs\k*\ze" containedin=doLoopSelectLabelRegion
 
 " make sure control variable is normal
-syn match rexxControlVariable        "\<\(do\|loop\)\>\(\s\+label\s\+\k*\)\?\s\+\zs.*\ze\s\+\<over\>" containedin=doLoopSelectLabelRegion
+" TODO: re-activate ?
+"rgf syn match rexxControlVariable        "\<\(do\|loop\)\>\(\s\+label\s\+\k*\)\?\s\+\zs.*\ze\s\+\<over\>" containedin=doLoopSelectLabelRegion
 
 " make sure control variable assignment is normal
 syn match rexxStartValueAssignment       "\<\(do\|loop\)\>\(\s\+label\s\+\k*\)\?\s\+\zs.*\ze\(=.*\)\?\s\+\<to\>" containedin=doLoopSelectLabelRegion
@@ -96,7 +91,8 @@ syn match rexxGuard "\(^\|;\|:\)\s*\<guard\>\s\+\<\(on\|off\)\>"
 syn match rexxTrace "\(^\|;\|:\)\s*\<trace\>\s\+\<\K\k*\>"
 
 " Raise statement
-syn match rexxRaise "\(^\|;\|:\)\s\+\<raise\>\s*\<\(propagate\|error\|failure\|syntax\|user\)\>\?" contains=rexxRaise2
+" syn match rexxRaise "\(^\|;\|:\)\s\+\<raise\>\s*\<\(propagate\|error\|failure\|syntax\|user\)\>\?" contains=rexxRaise2
+syn match rexxRaise "\(^\|;\|:\)\s*\<raise\>\s*\<\(propagate\|error\|failure\|syntax\|user\)\>\?" contains=rexxRaise2
 syn match rexxRaise2 "\<\(additional\|array\|description\|exit\|propagate\|return\)\>" containedin=rexxRaise
 
 " Forward statement
@@ -142,19 +138,36 @@ syn keyword rexxSpecialVariable  sigl rc result self super
 syn keyword rexxSpecialVariable  .environment .error .input .local .methods .output .rs .stderr .stdin .stdout .stdque
 
 " Constants
-syn keyword rexxConst .true .false .nil .endOfLine .line
+syn keyword rexxConst .true .false .nil .endOfLine .line .context
+
+" Rexx numbers
+" int like number
+syn match rexxNumber '\d\+' contained
+syn match rexxNumber '[-+]\s*\d\+' contained
+
+" Floating point number with decimal
+syn match rexxNumber '\d\+\.\d*' contained
+syn match rexxNumber '[-+]\s*\d\+\.\d*' contained
+
+" Floating point like number with E
+syn match rexxNumber '[-+]\s*\d*[eE][\-+]\d\+' contained
+syn match rexxNumber '\d*[eE][\-+]\d\+' contained
+
+" Floating point like number with E and decimal point (+,-)
+syn match rexxNumber '[-+]\s*\d*\.\d*[eE][\-+]\d\+' contained
+syn match rexxNumber '\d*\.\d*[eE][\-+]\d\+' contained
 
-syn match rexxNumber "\(-\|+\)\?\s*\zs\<\(\d\+\.\?\|\d*\.\d\+\(E\(+\|-\)\d\{2,2}\)\?\)\?\>"
 
 " ooRexx builtin classes (as of version 3.2.0, fall 2007), first define dot to be o.k. in keywords
 syn keyword rexxBuiltinClass .Alarm .ArgUtil .Array .Bag .CaselessColumnComparator
 syn keyword rexxBuiltinClass .CaselessComparator .CaselessDescendingComparator .CircularQueue
 syn keyword rexxBuiltinClass .Class .Collection .ColumnComparator .Comparable .Comparator
-syn keyword rexxBuiltinClass .DateTime .DescendingComparator .Directory .InputOutputStream
+syn keyword rexxBuiltinClass .DateTime .DescendingComparator .Directory .File .InputOutputStream
 syn keyword rexxBuiltinClass .InputStream .InvertingComparator .List .MapCollection
 syn keyword rexxBuiltinClass .Message .Method .Monitor .MutableBuffer .Object
-syn keyword rexxBuiltinClass .OrderedCollection .OutputStream .Properties .Queue
-syn keyword rexxBuiltinClass .Relation .RexxQueue .Set .SetCollection .Stem .Stream
+syn keyword rexxBuiltinClass .OrderedCollection .OutputStream .Package .Properties .Queue
+syn keyword rexxBuiltinClass .RegularExpression .Relation .RexxContext .RexxQueue .Routine
+syn keyword rexxBuiltinClass .Set .SetCollection .Stem .Stream
 syn keyword rexxBuiltinClass .StreamSupplier .String .Supplier .Table .TimeSpan
 
 " Windows-only classes
@@ -163,7 +176,8 @@ syn keyword rexxBuiltinClass .CategoryDialog .CheckBox .CheckList .ComboBox .Dia
 syn keyword rexxBuiltinClass .DialogExtensions .DlgArea .DlgAreaU .DynamicDialog
 syn keyword rexxBuiltinClass .EditControl .InputBox .IntegerBox .ListBox .ListChoice
 syn keyword rexxBuiltinClass .ListControl .MenuObject .MessageExtensions .MultiInputBox
-syn keyword rexxBuiltinClass .MultiListChoice .PasswordBox .PlainBaseDialog .PlainUserDialog
+syn keyword rexxBuiltinClass .MultiListChoice .OLEObject .OLEVariant
+syn keyword rexxBuiltinClass .PasswordBox .PlainBaseDialog .PlainUserDialog
 syn keyword rexxBuiltinClass .ProgressBar .ProgressIndicator .PropertySheet .RadioButton
 syn keyword rexxBuiltinClass .RcDialog .ResDialog .ScrollBar .SingleSelection .SliderControl
 syn keyword rexxBuiltinClass .StateIndicator .StaticControl .TabControl .TimedMessage
@@ -171,22 +185,34 @@ syn keyword rexxBuiltinClass .TreeControl .UserDialog .VirtualKeyCodes .WindowBa
 syn keyword rexxBuiltinClass .WindowExtensions .WindowObject .WindowsClassesBase .WindowsClipboard
 syn keyword rexxBuiltinClass .WindowsEventLog .WindowsManager .WindowsProgramManager .WindowsRegistry
 
+" BSF4ooRexx classes
+syn keyword rexxBuiltinClass .BSF .bsf.dialog .bsf_proxy
+syn keyword rexxBuiltinClass .UNO .UNO_ENUM .UNO_CONSTANTS .UNO_PROPERTIES
+
 " ooRexx directives, ---rgf location important, otherwise directives in top of file not matched!
 syn region rexxClassDirective     start="::\s*class\s*"ms=e+1    end="\ze\(\s\|;\|$\)"
 syn region rexxMethodDirective    start="::\s*method\s*"ms=e+1   end="\ze\(\s\|;\|$\)"
 syn region rexxRequiresDirective  start="::\s*requires\s*"ms=e+1 end="\ze\(\s\|;\|$\)"
 syn region rexxRoutineDirective   start="::\s*routine\s*"ms=e+1  end="\ze\(\s\|;\|$\)"
 syn region rexxAttributeDirective start="::\s*attribute\s*"ms=e+1  end="\ze\(\s\|;\|$\)"
+" rgf, 2012-09-09
+syn region rexxOptionsDirective   start="::\s*options\s*"ms=e+1  end="\ze\(\s\|;\|$\)"
+syn region rexxConstantDirective  start="::\s*constant\s*"ms=e+1  end="\ze\(\s\|;\|$\)"
+
+syn region rexxDirective start="\(^\|;\)\s*::\s*\w\+"  end="\($\|;\)" contains=rexxString,rexxNumber,rexxComment,rexxLineComment,rexxClassDirective,rexxMethodDirective,rexxRoutineDirective,rexxRequiresDirective,rexxAttributeDirective,rexxOptionsDirective,rexxConstantDirective keepend
+
+syn match rexxOptionsDirective2 "\<\(digits\|form\|fuzz\|trace\)\>" containedin = rexxOptionsDirective3
+syn region rexxOptionsDirective3 start="\(^\|;\)\s*::\s*options\s"ms=e+1  end="\($\|;\)" contains=rexxString,rexxNumber,rexxVariable,rexxComment,rexxLineComment containedin = rexxDirective
 
-syn region rexxDirective start="\(^\|;\)\s*::\s*\w\+"  end="\($\|;\)" contains=rexxString,rexxComment,rexxLineComment,rexxClassDirective,rexxMethodDirective,rexxRoutineDirective,rexxRequiresDirective,rexxAttributeDirective keepend
 
 syn region rexxVariable start="\zs\<\(\.\)\@!\K\k\+\>\ze\s*\(=\|,\|)\|%\|\]\|\\\||\|&\|+=\|-=\|<\|>\)" end="\(\_$\|.\)"me=e-1
-syn match rexxVariable "\(=\|,\|)\|%\|\]\|\\\||\|&\|+=\|-=\|<\|>\)\s*\zs\K\k*\ze" 
+syn match rexxVariable "\(=\|,\|)\|%\|\]\|\\\||\|&\|+=\|-=\|<\|>\)\s*\zs\K\k*\ze"
 
 " rgf, 2007-07-22: unfortunately, the entire region is colored (not only the
 " patterns), hence useless (vim 7.0)! (syntax-docs hint that that should work)
 " attempt: just colorize the parenthesis in matching colors, keep content
 "          transparent to keep the formatting already done to it!
+" TODO: test on 7.3
 " syn region par1 matchgroup=par1 start="(" matchgroup=par1 end=")" transparent contains=par2
 " syn region par2 matchgroup=par2 start="(" matchgroup=par2 end=")" transparent contains=par3 contained
 " syn region par3 matchgroup=par3 start="(" matchgroup=par3 end=")" transparent contains=par4 contained
@@ -200,11 +226,11 @@ syn match rexxVariable "\(=\|,\|)\|%\|\]\|\\\||\|&\|+=\|-=\|<\|>\)\s*\zs\K\k*\ze
 " syn region par4 matchgroup=par4 start="(" end=")" contains=par5 contained
 " syn region par5 matchgroup=par5 start="(" end=")" contains=par1 contained
 
-hi par1 ctermfg=red 		guifg=red
-hi par2 ctermfg=blue 		guifg=blue
-hi par3 ctermfg=darkgreen 	guifg=darkgreen
-hi par4 ctermfg=darkyellow	guifg=darkyellow
-hi par5 ctermfg=darkgrey 	guifg=darkgrey
+hi par1 ctermfg=red 		guifg=red          "guibg=grey
+hi par2 ctermfg=blue 		guifg=blue         "guibg=grey
+hi par3 ctermfg=darkgreen 	guifg=darkgreen    "guibg=grey
+hi par4 ctermfg=darkyellow	guifg=darkyellow   "guibg=grey
+hi par5 ctermfg=darkgrey 	guifg=darkgrey     "guibg=grey
 
 " line continuation (trailing comma or single dash)
 syn sync linecont "\(,\|-\ze-\@!\)\ze\s*\(--.*\|\/\*.*\)*$"
@@ -214,7 +240,7 @@ syn sync linecont "\(,\|-\ze-\@!\)\ze\s*\(--.*\|\/\*.*\)*$"
 " endif
 " exec "syn sync ccomment rexxComment minlines=" . rexx_minlines
 
-" always scan from start, PCs are powerful enough for that in 2007 !
+" always scan from start, PCs have long become to be powerful enough for that
 exec "syn sync fromstart"
 
 " Define the default highlighting.
@@ -236,7 +262,7 @@ if version >= 508 || !exists("did_rexx_syn_inits")
   HiLink endIterateLeaveLabelRegion	rexxKeyword
   HiLink rexxLoopKeywords	rexxKeyword " Todo
 
-  HiLink rexxNumber		Normal	
+  HiLink rexxNumber		Normal "DiffChange
 "  HiLink rexxIdentifier		DiffChange
 
   HiLink rexxRegularCallSignal	Statement
@@ -249,7 +275,7 @@ if version >= 508 || !exists("did_rexx_syn_inits")
   HiLink rexxCommentError	rexxError
   HiLink rexxError		Error
   HiLink rexxKeyword		Statement
-  HiLink rexxKeywordStatements	Statement  
+  HiLink rexxKeywordStatements	Statement
 
   HiLink rexxFunction		Function
   HiLink rexxString		String
@@ -271,6 +297,13 @@ if version >= 508 || !exists("did_rexx_syn_inits")
   HiLink rexxRequiresDirective	Include
   HiLink rexxRoutineDirective	rexxFunction
 
+" rgf, 2012-09-09
+  HiLink rexxOptionsDirective	rexxFunction
+  HiLink rexxOptionsDirective2  rexxOptionsDirective
+  HiLink rexxOptionsDirective3  Normal " rexxOptionsDirective
+
+  HiLink rexxConstantDirective	rexxFunction
+
   HiLink rexxConst		Constant
   HiLink rexxTypeSpecifier	Type
   HiLink rexxBuiltinClass	rexxTypeSpecifier

From 9a8ace4dd27eb7405ca5e4d1b41de88e96545490 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 03:46:05 +0200
Subject: [PATCH 117/136] updated for version 7.3.703 Problem:    When
 'undofile' is reset the hash is computed unnecessarily. Solution:   Only
 compute the hash when the option was set. (Christian Brabandt)

---
 src/option.c  | 34 ++++++++++++++++++++--------------
 src/version.c |  2 ++
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/option.c b/src/option.c
index da9807156d..2ab077063b 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7573,24 +7573,30 @@ set_bool_option(opt_idx, varp, value, opt_flags)
     /* 'undofile' */
     else if ((int *)varp == &curbuf->b_p_udf || (int *)varp == &p_udf)
     {
-	char_u	hash[UNDO_HASH_SIZE];
-	buf_T	*save_curbuf = curbuf;
-
-	for (curbuf = firstbuf; curbuf != NULL; curbuf = curbuf->b_next)
+	/* Only take action when the option was set. When reset we do not
+	 * delete the undo file, the option may be set again without making
+	 * any changes in between. */
+	if (curbuf->b_p_udf || p_udf)
 	{
-	    /* When 'undofile' is set globally: for every buffer, otherwise
-	     * only for the current buffer: Try to read in the undofile, if
-	     * one exists and the buffer wasn't changed and the buffer was
-	     * loaded. */
-	    if ((curbuf == save_curbuf
-				|| (opt_flags & OPT_GLOBAL) || opt_flags == 0)
-		    && !curbufIsChanged() && curbuf->b_ml.ml_mfp != NULL)
+	    char_u	hash[UNDO_HASH_SIZE];
+	    buf_T	*save_curbuf = curbuf;
+
+	    for (curbuf = firstbuf; curbuf != NULL; curbuf = curbuf->b_next)
 	    {
-		u_compute_hash(hash);
-		u_read_undo(NULL, hash, curbuf->b_fname);
+		/* When 'undofile' is set globally: for every buffer, otherwise
+		 * only for the current buffer: Try to read in the undofile,
+		 * if one exists, the buffer wasn't changed and the buffer was
+		 * loaded */
+		if ((curbuf == save_curbuf
+				|| (opt_flags & OPT_GLOBAL) || opt_flags == 0)
+			&& !curbufIsChanged() && curbuf->b_ml.ml_mfp != NULL)
+		{
+		    u_compute_hash(hash);
+		    u_read_undo(NULL, hash, curbuf->b_fname);
+		}
 	    }
+	    curbuf = save_curbuf;
 	}
-	curbuf = save_curbuf;
     }
 #endif
 
diff --git a/src/version.c b/src/version.c
index 14d4c8f787..e3f960132d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    703,
 /**/
     702,
 /**/

From dccfa82a67690ec7c756b66488d542cdaf5e4b8f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 03:46:05 +0200
Subject: [PATCH 118/136] Added tag v7-3-703 for changeset f69321485951

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 56544d307c..157e2ee880 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2039,3 +2039,4 @@ b5b892472ecb1a10cce1709e41700b264b6485d2 v7-3-698
 c656847932d33b5d68394ae1ea3153dbdba4d3ff v7-3-700
 48af8656094539f8f71dc51e0a6aa14d48ddffd0 v7-3-701
 916b5c11a13e9978c85f9742546e70d614116883 v7-3-702
+f69321485951a3c9bd0e9e7484a1901b94cae726 v7-3-703

From adaca3b7578b986c5135b6329d8798b5c23473d3 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 03:54:33 +0200
Subject: [PATCH 119/136] updated for version 7.3.704 Problem:    Repeating
 "cgn" does not always work correctly. Solution:   Also fetch the operator
 character. (Christian Brabandt)

---
 src/normal.c  | 9 +++++++--
 src/version.c | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/normal.c b/src/normal.c
index 6a4fa781c9..03a4c453c6 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -960,8 +960,11 @@ getcount:
 #ifdef FEAT_CMDL_INFO
 	    need_flushbuf |= add_to_showcmd(ca.nchar);
 #endif
+	    /* For "gn" from redo, need to get one more char to determine the
+	     * operator */
 	    if (ca.nchar == 'r' || ca.nchar == '\'' || ca.nchar == '`'
-						      || ca.nchar == Ctrl_BSL)
+						       || ca.nchar == Ctrl_BSL
+		  || ((ca.nchar == 'n' || ca.nchar == 'N') && !stuff_empty()))
 	    {
 		cp = &ca.extra_char;	/* need to get a third character */
 		if (ca.nchar != 'r')
@@ -1083,6 +1086,8 @@ getcount:
 		ca.nchar = ca.extra_char;
 		idx = find_command(ca.cmdchar);
 	    }
+	    else if (ca.nchar == 'n' || ca.nchar == 'N')
+		ca.oap->op_type = get_op_type(*cp, NUL);
 	    else if (*cp == Ctrl_BSL)
 	    {
 		long towait = (p_ttm >= 0 ? p_ttm : p_tm);
@@ -8009,7 +8014,7 @@ nv_g_cmd(cap)
 #ifdef FEAT_VISUAL
 	if (!current_search(cap->count1, cap->nchar == 'n'))
 #endif
-	    beep_flush();
+	    clearopbeep(oap);
 	break;
 
     /*
diff --git a/src/version.c b/src/version.c
index e3f960132d..8b8e8f26c5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    704,
 /**/
     703,
 /**/

From 304a9169a59f795a2b3e0fb72ebf703b1093a18d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 03:54:33 +0200
Subject: [PATCH 120/136] Added tag v7-3-704 for changeset be8ad9c9b973

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 157e2ee880..35b83128b2 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2040,3 +2040,4 @@ c656847932d33b5d68394ae1ea3153dbdba4d3ff v7-3-700
 48af8656094539f8f71dc51e0a6aa14d48ddffd0 v7-3-701
 916b5c11a13e9978c85f9742546e70d614116883 v7-3-702
 f69321485951a3c9bd0e9e7484a1901b94cae726 v7-3-703
+be8ad9c9b973a4d87b9bcfee2b6a8de1f6d3e071 v7-3-704

From 33d55bd88c7f51513274b687437ce90a8748b048 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 04:00:07 +0200
Subject: [PATCH 121/136] updated for version 7.3.705 Problem:    Mouse
 features are not sorted properly. (Tony Mechelynck) Solution:   Put the mouse
 features in alphabetical order.

---
 src/version.c | 48 ++++++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/version.c b/src/version.c
index 8b8e8f26c5..a0fc9d6147 100644
--- a/src/version.c
+++ b/src/version.c
@@ -348,6 +348,7 @@ static char *(features[]) =
 # else
 	"-mouse",
 #endif
+
 #if defined(UNIX) || defined(VMS)
 # ifdef FEAT_MOUSE_DEC
 	"+mouse_dec",
@@ -369,27 +370,8 @@ static char *(features[]) =
 # else
 	"-mouse_netterm",
 # endif
-# ifdef FEAT_SYSMOUSE
-	"+mouse_sysmouse",
-# else
-	"-mouse_sysmouse",
-# endif
-# ifdef FEAT_MOUSE_XTERM
-	"+mouse_xterm",
-# else
-	"-mouse_xterm",
-# endif
-# ifdef FEAT_MOUSE_URXVT
-	"+mouse_urxvt",
-# else
-	"-mouse_urxvt",
-# endif
-# ifdef FEAT_MOUSE_SGR
-	"+mouse_sgr",
-# else
-	"-mouse_sgr",
-# endif
 #endif
+
 #ifdef __QNX__
 # ifdef FEAT_MOUSE_PTERM
 	"+mouse_pterm",
@@ -397,6 +379,30 @@ static char *(features[]) =
 	"-mouse_pterm",
 # endif
 #endif
+
+#if defined(UNIX) || defined(VMS)
+# ifdef FEAT_MOUSE_SGR
+	"+mouse_sgr",
+# else
+	"-mouse_sgr",
+# endif
+# ifdef FEAT_SYSMOUSE
+	"+mouse_sysmouse",
+# else
+	"-mouse_sysmouse",
+# endif
+# ifdef FEAT_MOUSE_URXVT
+	"+mouse_urxvt",
+# else
+	"-mouse_urxvt",
+# endif
+# ifdef FEAT_MOUSE_XTERM
+	"+mouse_xterm",
+# else
+	"-mouse_xterm",
+# endif
+#endif
+
 #ifdef FEAT_MBYTE_IME
 # ifdef DYNAMIC_IME
 	"+multi_byte_ime/dyn",
@@ -719,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    705,
 /**/
     704,
 /**/

From bd3ba59e85fb39ba52664d5b0435f436faf3cc78 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 04:00:08 +0200
Subject: [PATCH 122/136] Added tag v7-3-705 for changeset 0aa74f2f50a8

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 35b83128b2..ccb11331f8 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2041,3 +2041,4 @@ c656847932d33b5d68394ae1ea3153dbdba4d3ff v7-3-700
 916b5c11a13e9978c85f9742546e70d614116883 v7-3-702
 f69321485951a3c9bd0e9e7484a1901b94cae726 v7-3-703
 be8ad9c9b973a4d87b9bcfee2b6a8de1f6d3e071 v7-3-704
+0aa74f2f50a8333fd5544f5d4b383132be41704c v7-3-705

From 0d6a25104f0776ba54f486cb82a81d36628be88e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 21:25:22 +0200
Subject: [PATCH 123/136] updated for version 7.3.706 Problem:    Can't build
 Motif version. Solution:   Fix wrongly named variable. (Ike Devolder)

---
 src/syntax.c  | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/syntax.c b/src/syntax.c
index 81e9acd4de..4adbaf087b 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -8082,7 +8082,7 @@ hl_do_font(idx, arg, do_normal, do_menu, do_tooltip, free_font)
 	|| do_tooltip
 #  endif
 	    )
-	if (free_fontset)
+	if (free_font)
 	    gui_mch_free_fontset(HL_TABLE()[idx].sg_fontset);
 	HL_TABLE()[idx].sg_fontset = fontset_name2handle(arg, 0
 #  ifdef FONTSET_ALWAYS
diff --git a/src/version.c b/src/version.c
index a0fc9d6147..321dfdfd58 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    706,
 /**/
     705,
 /**/

From 7a977df0955bed880b652348613b460637414911 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 21:25:22 +0200
Subject: [PATCH 124/136] Added tag v7-3-706 for changeset d0ae72c2f5f9

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ccb11331f8..a815d75ff2 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2042,3 +2042,4 @@ c656847932d33b5d68394ae1ea3153dbdba4d3ff v7-3-700
 f69321485951a3c9bd0e9e7484a1901b94cae726 v7-3-703
 be8ad9c9b973a4d87b9bcfee2b6a8de1f6d3e071 v7-3-704
 0aa74f2f50a8333fd5544f5d4b383132be41704c v7-3-705
+d0ae72c2f5f94e2483ab0979eec652b1289679a8 v7-3-706

From 69574ad204ce55e1787d6eec6431414f22fd5260 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 21:38:45 +0200
Subject: [PATCH 125/136] updated for version 7.3.707 Problem:    Problems
 loading a library for a file name with non-latin 	    characters.
 Solution:   Use wide system functions when possible. (Ken Takata)

---
 src/os_win32.c | 43 ++++++++++++++++++++++++++++---------------
 src/os_win32.h |  2 +-
 src/version.c  |  2 ++
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/os_win32.c b/src/os_win32.c
index 006a361448..96e115ca2f 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -287,27 +287,40 @@ unescape_shellxquote(char_u *p, char_u *escaped)
     HINSTANCE
 vimLoadLib(char *name)
 {
-    HINSTANCE dll = NULL;
-    TCHAR old_dir[MAXPATHL];
+    HINSTANCE	dll = NULL;
+    char	old_dir[MAXPATHL];
 
     /* NOTE: Do not use mch_dirname() and mch_chdir() here, they may call
      * vimLoadLib() recursively, which causes a stack overflow. */
     if (exe_path == NULL)
 	get_exe_name();
-    if (exe_path != NULL && GetCurrentDirectory(MAXPATHL, old_dir) != 0)
+    if (exe_path != NULL)
     {
-	/* Change directory to where the executable is, both to make sure we
-	 * find a .dll there and to avoid looking for a .dll in the current
-	 * directory. */
-	SetCurrentDirectory(exe_path);
-	dll = LoadLibrary(name);
-	SetCurrentDirectory(old_dir);
-    }
-    else
-    {
-	/* We are not able to change directory to where the executable is, try
-	 * to load library anyway. */
-	dll = LoadLibrary(name);
+#ifdef FEAT_MBYTE
+	WCHAR old_dirw[MAXPATHL];
+
+	if (GetCurrentDirectoryW(MAXPATHL, old_dirw) != 0)
+	{
+	    /* Change directory to where the executable is, both to make
+	     * sure we find a .dll there and to avoid looking for a .dll
+	     * in the current directory. */
+	    SetCurrentDirectory(exe_path);
+	    dll = LoadLibrary(name);
+	    SetCurrentDirectoryW(old_dirw);
+	    return dll;
+	}
+	/* Retry with non-wide function (for Windows 98). */
+	if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+#endif
+	    if (GetCurrentDirectory(MAXPATHL, old_dir) != 0)
+	    {
+		/* Change directory to where the executable is, both to make
+		 * sure we find a .dll there and to avoid looking for a .dll
+		 * in the current directory. */
+		SetCurrentDirectory(exe_path);
+		dll = LoadLibrary(name);
+		SetCurrentDirectory(old_dir);
+	    }
     }
     return dll;
 }
diff --git a/src/os_win32.h b/src/os_win32.h
index 5303d6ddcc..c155fb23fa 100644
--- a/src/os_win32.h
+++ b/src/os_win32.h
@@ -108,7 +108,7 @@
  */
 #define CMDBUFFSIZE 1024	/* size of the command processing buffer */
 
-/* _MAX_PATH is only 256 (stdlib.h), but we want more for the 'path' option,
+/* _MAX_PATH is only 260 (stdlib.h), but we want more for the 'path' option,
  * thus use a larger number. */
 #define MAXPATHL	1024
 
diff --git a/src/version.c b/src/version.c
index 321dfdfd58..4631c72045 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    707,
 /**/
     706,
 /**/

From b0e6e48639466839162de3c84da94e29528a0bcb Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 21:38:46 +0200
Subject: [PATCH 126/136] Added tag v7-3-707 for changeset d24d309c365f

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index a815d75ff2..dff129492d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2043,3 +2043,4 @@ f69321485951a3c9bd0e9e7484a1901b94cae726 v7-3-703
 be8ad9c9b973a4d87b9bcfee2b6a8de1f6d3e071 v7-3-704
 0aa74f2f50a8333fd5544f5d4b383132be41704c v7-3-705
 d0ae72c2f5f94e2483ab0979eec652b1289679a8 v7-3-706
+d24d309c365fc5c6a9324a6183d7b927d9f5132f v7-3-707

From f3c58563f104a526180446aa840ec7c533d6caa3 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 22:18:21 +0200
Subject: [PATCH 127/136] updated for version 7.3.708 Problem:    Filler lines
 above the first line may be hidden when opening Vim. Solution:   Change how
 topfill is computed. (Christian Brabandt)

---
 src/diff.c            |  6 ++++--
 src/testdir/test47.in | 17 ++++++++++++++++-
 src/testdir/test47.ok |  1 +
 src/version.c         |  2 ++
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/diff.c b/src/diff.c
index d9aaec8287..864e609143 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -615,11 +615,13 @@ diff_redraw(dofold)
 #endif
 	    /* A change may have made filler lines invalid, need to take care
 	     * of that for other windows. */
-	    if (wp != curwin && wp->w_topfill > 0)
+	    n = diff_check(wp, wp->w_topline);
+	    if ((wp != curwin && wp->w_topfill > 0) || n > 0)
 	    {
-		n = diff_check(wp, wp->w_topline);
 		if (wp->w_topfill > n)
 		    wp->w_topfill = (n < 0 ? 0 : n);
+		else if (n > 0 && n > wp->w_topfill)
+		    wp->w_topfill = n;
 	    }
 	}
 }
diff --git a/src/testdir/test47.in b/src/testdir/test47.in
index c87387b2fd..13ad82462f 100644
--- a/src/testdir/test47.in
+++ b/src/testdir/test47.in
@@ -36,7 +36,22 @@ j:let three = three . "-" . winline()
 :call append("$", two)
 :call append("$", three)
 :$-2,$w! test.out
-:unlet one two three
+:" Test that diffing shows correct filler lines
+:diffoff!
+:windo :bw!
+:enew
+:put =range(4,10)
+:1d _
+:vnew
+:put =range(1,10)
+:1d _
+:windo :diffthis
+:wincmd h
+:let w0=line('w0')
+:enew
+:put =w0
+:.w >> test.out
+:unlet! one two three w0
 :qa!
 ENDTEST
 
diff --git a/src/testdir/test47.ok b/src/testdir/test47.ok
index 3307b934eb..b1cba92b1c 100644
--- a/src/testdir/test47.ok
+++ b/src/testdir/test47.ok
@@ -1,3 +1,4 @@
 2-4-5-6-8-9
 1-2-4-5-8
 2-3-4-5-6-7-8
+1
diff --git a/src/version.c b/src/version.c
index 4631c72045..ddd3934229 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    708,
 /**/
     707,
 /**/

From fa1c7afef2c99f00ec0ca82f2a968ca45bb2ef4e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 22:18:21 +0200
Subject: [PATCH 128/136] Added tag v7-3-708 for changeset 64427849c158

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index dff129492d..ec96a135ee 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2044,3 +2044,4 @@ be8ad9c9b973a4d87b9bcfee2b6a8de1f6d3e071 v7-3-704
 0aa74f2f50a8333fd5544f5d4b383132be41704c v7-3-705
 d0ae72c2f5f94e2483ab0979eec652b1289679a8 v7-3-706
 d24d309c365fc5c6a9324a6183d7b927d9f5132f v7-3-707
+64427849c1582299f2af389c6225eead529f0329 v7-3-708

From 90fe26e878d6d4650f8afe0314b5d9a92609ea45 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 23:56:05 +0200
Subject: [PATCH 129/136] updated for version 7.3.709 Problem:    Compiler
 warning for unused argument. Solution:   Add UNUSED.

---
 src/eval.c    | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/eval.c b/src/eval.c
index 2f370b74ce..aab9b0b4d4 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -16664,7 +16664,7 @@ f_shellescape(argvars, rettv)
  */
     static void
 f_shiftwidth(argvars, rettv)
-    typval_T	*argvars;
+    typval_T	*argvars UNUSED;
     typval_T	*rettv;
 {
     rettv->vval.v_number = get_sw_value();
diff --git a/src/version.c b/src/version.c
index ddd3934229..15be0b87ec 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    709,
 /**/
     708,
 /**/

From 9a1a5cdcaeedffea3ae1be8b1d67c9a36ec8c26d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 21 Oct 2012 23:56:05 +0200
Subject: [PATCH 130/136] Added tag v7-3-709 for changeset fb7dec372910

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index ec96a135ee..9b3ea3ec62 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2045,3 +2045,4 @@ be8ad9c9b973a4d87b9bcfee2b6a8de1f6d3e071 v7-3-704
 d0ae72c2f5f94e2483ab0979eec652b1289679a8 v7-3-706
 d24d309c365fc5c6a9324a6183d7b927d9f5132f v7-3-707
 64427849c1582299f2af389c6225eead529f0329 v7-3-708
+fb7dec372910b61478abdd7f79871724153ebfdd v7-3-709

From e725616bdddca99e2333346aa8bbe0a24555e6a9 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 23 Oct 2012 05:08:53 +0200
Subject: [PATCH 131/136] updated for version 7.3.710 Problem:    Patch 7.3.704
 breaks "fn". Solution:   Add check for ca.cmdchar. (Christian Brabandt)

---
 src/normal.c  | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/normal.c b/src/normal.c
index 03a4c453c6..d6773697aa 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1086,7 +1086,7 @@ getcount:
 		ca.nchar = ca.extra_char;
 		idx = find_command(ca.cmdchar);
 	    }
-	    else if (ca.nchar == 'n' || ca.nchar == 'N')
+	    else if ((ca.nchar == 'n' || ca.nchar == 'N') && ca.cmdchar == 'g')
 		ca.oap->op_type = get_op_type(*cp, NUL);
 	    else if (*cp == Ctrl_BSL)
 	    {
diff --git a/src/version.c b/src/version.c
index 15be0b87ec..3c774a9f8b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    710,
 /**/
     709,
 /**/

From 742e200a3de3026094f7649da7bb2cbb4613237a Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 23 Oct 2012 05:08:54 +0200
Subject: [PATCH 132/136] Added tag v7-3-710 for changeset 906eb5c0ef12

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 9b3ea3ec62..8db651a1f4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2046,3 +2046,4 @@ d0ae72c2f5f94e2483ab0979eec652b1289679a8 v7-3-706
 d24d309c365fc5c6a9324a6183d7b927d9f5132f v7-3-707
 64427849c1582299f2af389c6225eead529f0329 v7-3-708
 fb7dec372910b61478abdd7f79871724153ebfdd v7-3-709
+906eb5c0ef129b6876fa9c6c5a13e44807f7a503 v7-3-710

From f236cb6c2b13d621f4da5f679b0758aed6bc6b48 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 23 Oct 2012 05:17:37 +0200
Subject: [PATCH 133/136] updated for version 7.3.711 Problem:   
 vim.current.buffer is not available. (lilydjwg) Solution:   Use
 py3_PyUnicode_AsUTF8 instead of py3_PyUnicode_AsUTF8String. 	    (Ken
 Takata)

---
 src/if_python3.c | 30 +++++++++++++++---------------
 src/version.c    |  2 ++
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/if_python3.c b/src/if_python3.c
index e9f7400f80..3bca569590 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -176,7 +176,7 @@ static void init_structs(void);
 # define PyImport_AppendInittab py3_PyImport_AppendInittab
 # if PY_VERSION_HEX >= 0x030300f0
 #  undef _PyUnicode_AsString
-#  define _PyUnicode_AsString py3_PyUnicode_AsUTF8String
+#  define _PyUnicode_AsString py3_PyUnicode_AsUTF8
 # else
 #  define _PyUnicode_AsString py3__PyUnicode_AsString
 # endif
@@ -286,11 +286,11 @@ static PyObject* py3__Py_FalseStruct;
 static PyObject* py3__Py_TrueStruct;
 static int (*py3_PyModule_AddObject)(PyObject *m, const char *name, PyObject *o);
 static int (*py3_PyImport_AppendInittab)(const char *name, PyObject* (*initfunc)(void));
-#if PY_VERSION_HEX >= 0x030300f0
-static char* (*py3_PyUnicode_AsUTF8String)(PyObject *unicode);
-#else
+# if PY_VERSION_HEX >= 0x030300f0
+static char* (*py3_PyUnicode_AsUTF8)(PyObject *unicode);
+# else
 static char* (*py3__PyUnicode_AsString)(PyObject *unicode);
-#endif
+# endif
 static PyObject* (*py3_PyUnicode_AsEncodedString)(PyObject *unicode, const char* encoding, const char* errors);
 static char* (*py3_PyBytes_AsString)(PyObject *bytes);
 static int (*py3_PyBytes_AsStringAndSize)(PyObject *bytes, char **buffer, int *length);
@@ -348,13 +348,13 @@ static struct
     {"PySys_SetArgv", (PYTHON_PROC*)&py3_PySys_SetArgv},
     {"Py_SetPythonHome", (PYTHON_PROC*)&py3_Py_SetPythonHome},
     {"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize},
-#ifndef PY_SSIZE_T_CLEAN
+# ifndef PY_SSIZE_T_CLEAN
     {"PyArg_ParseTuple", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
     {"Py_BuildValue", (PYTHON_PROC*)&py3_Py_BuildValue},
-#else
+# else
     {"_PyArg_ParseTuple_SizeT", (PYTHON_PROC*)&py3_PyArg_ParseTuple},
     {"_Py_BuildValue_SizeT", (PYTHON_PROC*)&py3_Py_BuildValue},
-#endif
+# endif
     {"PyMem_Free", (PYTHON_PROC*)&py3_PyMem_Free},
     {"PyMem_Malloc", (PYTHON_PROC*)&py3_PyMem_Malloc},
     {"PyList_New", (PYTHON_PROC*)&py3_PyList_New},
@@ -406,11 +406,11 @@ static struct
     {"PyObject_Init", (PYTHON_PROC*)&py3__PyObject_Init},
     {"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject},
     {"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab},
-#if PY_VERSION_HEX >= 0x030300f0
-    {"PyUnicode_AsUTF8String", (PYTHON_PROC*)&py3_PyUnicode_AsUTF8String},
-#else
+# if PY_VERSION_HEX >= 0x030300f0
+    {"PyUnicode_AsUTF8", (PYTHON_PROC*)&py3_PyUnicode_AsUTF8},
+# else
     {"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString},
-#endif
+# endif
     {"PyBytes_AsString", (PYTHON_PROC*)&py3_PyBytes_AsString},
     {"PyBytes_AsStringAndSize", (PYTHON_PROC*)&py3_PyBytes_AsStringAndSize},
     {"PyBytes_FromString", (PYTHON_PROC*)&py3_PyBytes_FromString},
@@ -503,12 +503,12 @@ py3_runtime_link_init(char *libname, int verbose)
 
     /* Load unicode functions separately as only the ucs2 or the ucs4 functions
      * will be present in the library. */
-#if PY_VERSION_HEX >= 0x030300f0
+# if PY_VERSION_HEX >= 0x030300f0
     ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicode_FromString");
     ucs_decode = symbol_from_dll(hinstPy3, "PyUnicode_Decode");
     ucs_as_encoded_string = symbol_from_dll(hinstPy3,
 	    "PyUnicode_AsEncodedString");
-#else
+# else
     ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicodeUCS2_FromString");
     ucs_decode = symbol_from_dll(hinstPy3,
 	    "PyUnicodeUCS2_Decode");
@@ -523,7 +523,7 @@ py3_runtime_link_init(char *libname, int verbose)
 	ucs_as_encoded_string = symbol_from_dll(hinstPy3,
 		"PyUnicodeUCS4_AsEncodedString");
     }
-#endif
+# endif
     if (ucs_from_string && ucs_decode && ucs_as_encoded_string)
     {
 	py3_PyUnicode_FromString = ucs_from_string;
diff --git a/src/version.c b/src/version.c
index 3c774a9f8b..7968b722a8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    711,
 /**/
     710,
 /**/

From 2d13748ebbc6b259f6cd8af1adab40ec2a716b39 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 23 Oct 2012 05:17:38 +0200
Subject: [PATCH 134/136] Added tag v7-3-711 for changeset 2a7b2943be22

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 8db651a1f4..416c03978e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2047,3 +2047,4 @@ d24d309c365fc5c6a9324a6183d7b927d9f5132f v7-3-707
 64427849c1582299f2af389c6225eead529f0329 v7-3-708
 fb7dec372910b61478abdd7f79871724153ebfdd v7-3-709
 906eb5c0ef129b6876fa9c6c5a13e44807f7a503 v7-3-710
+2a7b2943be22c27edb3c0334423c1b17275f18fb v7-3-711

From 78fe8860fad9f8e17f1ee5c9be845d3103cc4929 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 23 Oct 2012 05:35:34 +0200
Subject: [PATCH 135/136] updated for version 7.3.712 Problem:    Nmake from
 VS2010 SP1 is not recognized. Solution:   Add the version number. (Ken
 Takata)

---
 src/Make_mvc.mak | 3 +++
 src/version.c    | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 3ac29606b5..ef75193e2b 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -407,6 +407,9 @@ MSVCVER = 10.0
 !if "$(_NMAKE_VER)" == "10.00.30319.01"
 MSVCVER = 10.0
 !endif
+!if "$(_NMAKE_VER)" == "10.00.40219.01"
+MSVCVER = 10.0
+!endif
 !if "$(_NMAKE_VER)" == "11.00.50727.1"
 MSVCVER = 11.0
 !endif
diff --git a/src/version.c b/src/version.c
index 7968b722a8..87d0e620c2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -725,6 +725,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    712,
 /**/
     711,
 /**/

From 41f429c651e6c91bf6c18555ef583ba9fe27e76e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Tue, 23 Oct 2012 05:35:34 +0200
Subject: [PATCH 136/136] Added tag v7-3-712 for changeset 557ef119999e

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 416c03978e..fce339f253 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2048,3 +2048,4 @@ d24d309c365fc5c6a9324a6183d7b927d9f5132f v7-3-707
 fb7dec372910b61478abdd7f79871724153ebfdd v7-3-709
 906eb5c0ef129b6876fa9c6c5a13e44807f7a503 v7-3-710
 2a7b2943be22c27edb3c0334423c1b17275f18fb v7-3-711
+557ef119999ea687ccb84eddca295755c24989da v7-3-712