From a3bfcce13f6e53f440a06b83f61c93d2c42df0fc Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Dec 2012 14:25:05 +0100
Subject: [PATCH 001/106] updated for version 7.3.755 Problem:    Autoconf
 doesn't find Python 3 if it's called "python". Solution:   Search for
 "python2" and "python3" first, then "python".

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

diff --git a/src/auto/configure b/src/auto/configure
index 65f74fc8ca..e73867f9a6 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5214,8 +5214,10 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5
 $as_echo "$enable_pythoninterp" >&6; }
 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
-    # Extract the first word of "python", so it can be a program name with args.
-set dummy python; ac_word=$2
+    for ac_prog in python2 python
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_vi_cv_path_python+set}" = set; then :
@@ -5254,6 +5256,9 @@ $as_echo "no" >&6; }
 fi
 
 
+  test -n "$vi_cv_path_python" && break
+done
+
   if test "X$vi_cv_path_python" != "X"; then
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5
@@ -5509,8 +5514,10 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5
 $as_echo "$enable_python3interp" >&6; }
 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
-    # Extract the first word of "python3", so it can be a program name with args.
-set dummy python3; ac_word=$2
+    for ac_prog in python3 python
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_vi_cv_path_python3+set}" = set; then :
@@ -5549,6 +5556,9 @@ $as_echo "no" >&6; }
 fi
 
 
+  test -n "$vi_cv_path_python3" && break
+done
+
   if test "X$vi_cv_path_python3" != "X"; then
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5
diff --git a/src/configure.in b/src/configure.in
index 387d85e89a..2dae429613 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -838,7 +838,7 @@ AC_ARG_ENABLE(pythoninterp,
 AC_MSG_RESULT($enable_pythoninterp)
 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
   dnl -- find the python executable
-  AC_PATH_PROG(vi_cv_path_python, python)
+  AC_PATH_PROGS(vi_cv_path_python, python2 python)
   if test "X$vi_cv_path_python" != "X"; then
 
     dnl -- get its version number
@@ -1028,7 +1028,7 @@ AC_ARG_ENABLE(python3interp,
 AC_MSG_RESULT($enable_python3interp)
 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
   dnl -- find the python3 executable
-  AC_PATH_PROG(vi_cv_path_python3, python3)
+  AC_PATH_PROGS(vi_cv_path_python3, python3 python)
   if test "X$vi_cv_path_python3" != "X"; then
 
     dnl -- get its version number
diff --git a/src/version.c b/src/version.c
index 53be01c887..de2329ef0e 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 */
+/**/
+    755,
 /**/
     754,
 /**/

From 6be49626368d948caa08de9f6a419454af463d91 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Dec 2012 14:25:05 +0100
Subject: [PATCH 002/106] Added tag v7-3-755 for changeset d9b4cf53be2e

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

diff --git a/.hgtags b/.hgtags
index d66e05e1cb..1920566390 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2091,3 +2091,4 @@ d149f18b289fdf19363214e7805a0637307bd264 v7-3-751
 ed936effb1f374004db15f092b8c8ab87631fdd4 v7-3-752
 c83cd3d01128204d6926550cbe1064daaf8dee8c v7-3-753
 beceb0a18c79b5b1bda4822b34cb2d62b2967d27 v7-3-754
+d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7-3-755

From aaad17942a01037861b369df116e14ee10afa65e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Dec 2012 15:55:20 +0100
Subject: [PATCH 003/106] updated for version 7.3.756 Problem:    A location
 list can get a wrong count in :lvimgrep. Solution:   Check if the list was
 changed by autocommands. (mostly by 	    Christian Brabandt)

---
 src/quickfix.c | 34 ++++++++++++++++++++++++++++++++++
 src/version.c  |  2 ++
 2 files changed, 36 insertions(+)

diff --git a/src/quickfix.c b/src/quickfix.c
index ac9366952b..2f8155a4c9 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -3109,6 +3109,9 @@ ex_vimgrep(eap)
     char_u	*p;
     int		fi;
     qf_info_T	*qi = &ql_info;
+#ifdef FEAT_AUTOCMD
+    qfline_T	*cur_qf_start;
+#endif
     qfline_T	*prevp = NULL;
     long	lnum;
     buf_T	*buf;
@@ -3218,6 +3221,12 @@ ex_vimgrep(eap)
      * ":lcd %:p:h" changes the meaning of short path names. */
     mch_dirname(dirname_start, MAXPATHL);
 
+#ifdef FEAT_AUTOCMD
+     /* Remeber the value of qf_start, so that we can check for autocommands
+      * changing the current quickfix list. */
+    cur_qf_start = qi->qf_lists[qi->qf_curlist].qf_start;
+#endif
+
     seconds = (time_t)0;
     for (fi = 0; fi < fcount && !got_int && tomatch > 0; ++fi)
     {
@@ -3273,6 +3282,28 @@ ex_vimgrep(eap)
 	    /* Use existing, loaded buffer. */
 	    using_dummy = FALSE;
 
+#ifdef FEAT_AUTOCMD
+	if (cur_qf_start != qi->qf_lists[qi->qf_curlist].qf_start)
+	{
+	    int idx;
+
+	    /* Autocommands changed the quickfix list.  Find the one we were
+	     * using and restore it. */
+	    for (idx = 0; idx < LISTCOUNT; ++idx)
+		if (cur_qf_start == qi->qf_lists[idx].qf_start)
+		{
+		    qi->qf_curlist = idx;
+		    break;
+		}
+	    if (idx == LISTCOUNT)
+	    {
+		/* List cannot be found, create a new one. */
+		qf_new_list(qi, *eap->cmdlinep);
+		cur_qf_start = qi->qf_lists[qi->qf_curlist].qf_start;
+	    }
+	}
+#endif
+
 	if (buf == NULL)
 	{
 	    if (!got_int)
@@ -3324,6 +3355,9 @@ ex_vimgrep(eap)
 		if (got_int)
 		    break;
 	    }
+#ifdef FEAT_AUTOCMD
+	    cur_qf_start = qi->qf_lists[qi->qf_curlist].qf_start;
+#endif
 
 	    if (using_dummy)
 	    {
diff --git a/src/version.c b/src/version.c
index de2329ef0e..aec15bdd02 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 */
+/**/
+    756,
 /**/
     755,
 /**/

From 7c6ed390c9b9e20acf94cba0b012b77c94b6cfd1 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Dec 2012 15:55:20 +0100
Subject: [PATCH 004/106] Added tag v7-3-756 for changeset 706c87d16d40

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

diff --git a/.hgtags b/.hgtags
index 1920566390..dcf4bbae7e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2092,3 +2092,4 @@ ed936effb1f374004db15f092b8c8ab87631fdd4 v7-3-752
 c83cd3d01128204d6926550cbe1064daaf8dee8c v7-3-753
 beceb0a18c79b5b1bda4822b34cb2d62b2967d27 v7-3-754
 d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7-3-755
+706c87d16d40ecdf9c6fba45bc47b911d8e140cc v7-3-756

From 529833bae9f6551c7d7341987560d41d5bdd09b8 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Dec 2012 16:11:36 +0100
Subject: [PATCH 005/106] updated for version 7.3.757 Problem:    Issue 96: May
 access freed memory when a put command triggers 	    autocommands.
 (Dominique Pelle) Solution:   Call u_save() before getting y_array.

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

diff --git a/src/ops.c b/src/ops.c
index f08e576cfe..9b669b3317 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -3351,6 +3351,12 @@ do_put(regname, dir, count, flags)
 	    return;
     }
 
+#ifdef FEAT_AUTOCMD
+    /* Autocommands may be executed when saving lines for undo, which may make
+     * y_array invalid.  Start undo now to avoid that. */
+    u_save(curwin->w_cursor.lnum, curwin->w_cursor.lnum + 1);
+#endif
+
     if (insert_string != NULL)
     {
 	y_type = MCHAR;
diff --git a/src/version.c b/src/version.c
index aec15bdd02..562bb043f5 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 */
+/**/
+    757,
 /**/
     756,
 /**/

From 85161f1d97b71a7c2388dbf9867750c010116718 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Dec 2012 16:11:36 +0100
Subject: [PATCH 006/106] Added tag v7-3-757 for changeset 65ef7c96d65f

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

diff --git a/.hgtags b/.hgtags
index dcf4bbae7e..4e428a0fca 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2093,3 +2093,4 @@ c83cd3d01128204d6926550cbe1064daaf8dee8c v7-3-753
 beceb0a18c79b5b1bda4822b34cb2d62b2967d27 v7-3-754
 d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7-3-755
 706c87d16d40ecdf9c6fba45bc47b911d8e140cc v7-3-756
+65ef7c96d65fb2fbf660797608809f0ac5d0c4b7 v7-3-757

From 5579bc07c8b8bb17076aa97bb83595fff8de8e2c Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Dec 2012 16:43:58 +0100
Subject: [PATCH 007/106] updated for version 7.3.758 Problem:    Matchit
 plugin does not handle space in #ifdef. Solution:   Change matching pattern
 to allow spaces. (Mike Morearty)

---
 runtime/macros/matchit.vim | 4 ++--
 src/version.c              | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/runtime/macros/matchit.vim b/runtime/macros/matchit.vim
index 03dae6a2f7..74c1a1eb92 100644
--- a/runtime/macros/matchit.vim
+++ b/runtime/macros/matchit.vim
@@ -131,7 +131,7 @@ function! s:Match_wrapper(word, forward, mode) range
     " let default = substitute(escape(&mps, '[$^.*~\\/?]'), '[,:]\+',
     "  \ '\\|', 'g').'\|\/\*\|\*\/\|#if\>\|#ifdef\>\|#else\>\|#elif\>\|#endif\>'
     let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") .
-      \ '\/\*:\*\/,#if\%(def\)\=:#else\>:#elif\>:#endif\>'
+      \ '\/\*:\*\/,#\s*if\%(def\)\=:#\s*else\>:#\s*elif\>:#\s*endif\>'
     " s:all = pattern with all the keywords
     let match_words = match_words . (strlen(match_words) ? "," : "") . default
     if match_words !~ s:notslash . '\\\d'
@@ -649,7 +649,7 @@ fun! s:MultiMatch(spflag, mode)
   "   s:all	regexp based on s:pat and the default groups
   " This part is copied and slightly modified from s:Match_wrapper().
   let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") .
-    \ '\/\*:\*\/,#if\%(def\)\=:#else\>:#elif\>:#endif\>'
+    \ '\/\*:\*\/,#\s*if\%(def\)\=:#\s*else\>:#\s*elif\>:#\s*endif\>'
   " Allow b:match_words = "GetVimMatchWords()" .
   if b:match_words =~ ":"
     let match_words = b:match_words
diff --git a/src/version.c b/src/version.c
index 562bb043f5..5a0f8159bc 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 */
+/**/
+    758,
 /**/
     757,
 /**/

From 8dbf1b3558a223062725f5edceb84c93cecabb02 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Dec 2012 16:43:58 +0100
Subject: [PATCH 008/106] Added tag v7-3-758 for changeset 9eb0d30510f7

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

diff --git a/.hgtags b/.hgtags
index 4e428a0fca..ae21946a48 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2094,3 +2094,4 @@ beceb0a18c79b5b1bda4822b34cb2d62b2967d27 v7-3-754
 d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7-3-755
 706c87d16d40ecdf9c6fba45bc47b911d8e140cc v7-3-756
 65ef7c96d65fb2fbf660797608809f0ac5d0c4b7 v7-3-757
+9eb0d30510f7b02aa5f55f400bfab08d847ab447 v7-3-758

From 2775240d121eb8d08d38b001e0a6bcd630f51eef Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Dec 2012 17:12:25 +0100
Subject: [PATCH 009/106] updated for version 7.3.759 Problem:    MS-Windows:
 Updating the tabline is slow when there are many tabs. Solution:   Disable
 redrawing while performing the update. (Arseny Kapoulkine)

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

diff --git a/src/gui_w48.c b/src/gui_w48.c
index 61c53a7d6f..a70fb259ea 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -2452,7 +2452,6 @@ gui_mch_update_tabline(void)
     TCITEM	tie;
     int		nr = 0;
     int		curtabidx = 0;
-    RECT	rc;
 #ifdef FEAT_MBYTE
     static int	use_unicode = FALSE;
     int		uu;
@@ -2479,13 +2478,16 @@ gui_mch_update_tabline(void)
     tie.mask = TCIF_TEXT;
     tie.iImage = -1;
 
+    /* Disable redraw for tab updates to eliminate O(N^2) draws. */
+    SendMessage(s_tabhwnd, WM_SETREDRAW, (WPARAM)FALSE, 0);
+
     /* Add a label for each tab page.  They all contain the same text area. */
     for (tp = first_tabpage; tp != NULL; tp = tp->tp_next, ++nr)
     {
 	if (tp == curtab)
 	    curtabidx = nr;
 
-	if (!TabCtrl_GetItemRect(s_tabhwnd, nr, &rc))
+	if (nr >= TabCtrl_GetItemCount(s_tabhwnd))
 	{
 	    /* Add the tab */
 	    tie.pszText = "-Empty-";
@@ -2519,11 +2521,14 @@ gui_mch_update_tabline(void)
     }
 
     /* Remove any old labels. */
-    while (TabCtrl_GetItemRect(s_tabhwnd, nr, &rc))
+    while (nr < TabCtrl_GetItemCount(s_tabhwnd))
 	TabCtrl_DeleteItem(s_tabhwnd, nr);
 
     if (TabCtrl_GetCurSel(s_tabhwnd) != curtabidx)
 	TabCtrl_SetCurSel(s_tabhwnd, curtabidx);
+
+    /* Re-enable redraw. This should trigger a repaint. */
+    SendMessage(s_tabhwnd, WM_SETREDRAW, (WPARAM)TRUE, 0);
 }
 
 /*
diff --git a/src/version.c b/src/version.c
index 5a0f8159bc..e743fae508 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 */
+/**/
+    759,
 /**/
     758,
 /**/

From f69c630f337c3d291894fe16a4be0b30c963fd88 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Dec 2012 17:12:25 +0100
Subject: [PATCH 010/106] Added tag v7-3-759 for changeset 25ea15fdfa5c

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

diff --git a/.hgtags b/.hgtags
index ae21946a48..7c124752b9 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2095,3 +2095,4 @@ d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7-3-755
 706c87d16d40ecdf9c6fba45bc47b911d8e140cc v7-3-756
 65ef7c96d65fb2fbf660797608809f0ac5d0c4b7 v7-3-757
 9eb0d30510f7b02aa5f55f400bfab08d847ab447 v7-3-758
+25ea15fdfa5c7d5894a06814fe9411b75050ebff v7-3-759

From 5f5db2017f80c0b7fcde94ee2f99d78a912b304f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Dec 2012 17:33:32 +0100
Subject: [PATCH 011/106] updated for version 7.3.760 Problem:    dv_ deletes
 the white space before the line. Solution:   Move the cursor to the first
 non-white. (Christian Brabandt)

---
 src/normal.c          | 4 +++-
 src/testdir/test19.in | 6 +++++-
 src/testdir/test19.ok | 1 +
 src/version.c         | 2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/normal.c b/src/normal.c
index d6773697aa..869ada37af 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -8628,7 +8628,9 @@ nv_lineop(cap)
     cap->oap->motion_type = MLINE;
     if (cursor_down(cap->count1 - 1L, cap->oap->op_type == OP_NOP) == FAIL)
 	clearopbeep(cap->oap);
-    else if (  cap->oap->op_type == OP_DELETE
+    else if (  (cap->oap->op_type == OP_DELETE /* only with linewise motions */
+		&& cap->oap->motion_force != 'v'
+		&& cap->oap->motion_force != Ctrl_V)
 	    || cap->oap->op_type == OP_LSHIFT
 	    || cap->oap->op_type == OP_RSHIFT)
 	beginline(BL_SOL | BL_FIX);
diff --git a/src/testdir/test19.in b/src/testdir/test19.in
index cbb4dd2c22..aafa34e521 100644
--- a/src/testdir/test19.in
+++ b/src/testdir/test19.in
@@ -1,4 +1,5 @@
 Tests for "r<Tab>" with 'smarttab' and 'expandtab' set/not set.
+Also test that dv_ works correctly
 
 STARTTEST
 :so small.vim
@@ -16,7 +17,9 @@ r
 :" Test that copyindent works with expandtab set
 :set expandtab smartindent copyindent ts=8 sw=8 sts=8
 o{
-x:?^start?,$w! test.out
+x:set nosol
+/Second line/
+fwdv_:?^start?,$w! test.out
 :qa!
 ENDTEST
 
@@ -27,3 +30,4 @@ test text
     a cde
     f ghi
 test text
+  Second line beginning with whitespace
diff --git a/src/testdir/test19.ok b/src/testdir/test19.ok
index 23d51507db..4146214919 100644
--- a/src/testdir/test19.ok
+++ b/src/testdir/test19.ok
@@ -7,3 +7,4 @@ test text
 test text
 {
         x
+  with whitespace
diff --git a/src/version.c b/src/version.c
index e743fae508..3f889b6ab7 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 */
+/**/
+    760,
 /**/
     759,
 /**/

From cb822b519b121ed2060c7933eb8bed25cb15d806 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Dec 2012 17:33:33 +0100
Subject: [PATCH 012/106] Added tag v7-3-760 for changeset 8e54a32bcd56

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

diff --git a/.hgtags b/.hgtags
index 7c124752b9..6854b1408f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2096,3 +2096,4 @@ d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7-3-755
 65ef7c96d65fb2fbf660797608809f0ac5d0c4b7 v7-3-757
 9eb0d30510f7b02aa5f55f400bfab08d847ab447 v7-3-758
 25ea15fdfa5c7d5894a06814fe9411b75050ebff v7-3-759
+8e54a32bcd56226647cfd3d8c5e142e3a98c0ca7 v7-3-760

From b695049737e73f2f310f50e7b57d6acb73578eb0 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Dec 2012 18:20:32 +0100
Subject: [PATCH 013/106] updated for version 7.3.761 Problem:    In Visual
 mode a "-p does not work. (Marcin Szamotulski) Solution:   Avoid writing to
 "- before putting it. (Christian Brabandt)

---
 src/normal.c          | 5 +++--
 src/testdir/test48.in | 4 ++++
 src/testdir/test48.ok | 1 +
 src/version.c         | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/normal.c b/src/normal.c
index 869ada37af..4d0bbdbea5 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -9412,14 +9412,15 @@ nv_put(cap)
 # ifdef FEAT_CLIPBOARD
 	    adjust_clip_reg(&regname);
 # endif
-	    if (regname == 0 || regname == '"' || VIM_ISDIGIT(regname)
+           if (regname == 0 || regname == '"'
+				     || VIM_ISDIGIT(regname) || regname == '-'
 # ifdef FEAT_CLIPBOARD
 		    || (clip_unnamed && (regname == '*' || regname == '+'))
 # endif
 
 		    )
 	    {
-		/* the delete is going to overwrite the register we want to
+		/* The delete is going to overwrite the register we want to
 		 * put, save it first. */
 		reg1 = get_register(regname, TRUE);
 	    }
diff --git a/src/testdir/test48.in b/src/testdir/test48.in
index 2179fe6648..48f4abbf75 100644
--- a/src/testdir/test48.in
+++ b/src/testdir/test48.in
@@ -54,8 +54,12 @@ $5lrxa<-- should be 'x'
 ^O3li4li4li   <-- should show the name of a noted text editor
 ^o4li4li4li   <-- and its version number-dd
 :"
+:" Test for yanking and pasting using the small delete register
+gg/^foo
+dewve"-p
 :wq! test.out
 ENDTEST
+foo, bar
 keyword keyw
 all your base are belong to us
 1 2 3 4 5 6
diff --git a/src/testdir/test48.ok b/src/testdir/test48.ok
index 4fcbe5086e..334cb5a29c 100644
--- a/src/testdir/test48.ok
+++ b/src/testdir/test48.ok
@@ -1,3 +1,4 @@
+, foo
 keyword keyword
 all your base 
 are belong to vim
diff --git a/src/version.c b/src/version.c
index 3f889b6ab7..5e7b397068 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 */
+/**/
+    761,
 /**/
     760,
 /**/

From bb846b6b966938f8a212ac9d1168a0112a8a6143 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 12 Dec 2012 18:20:32 +0100
Subject: [PATCH 014/106] Added tag v7-3-761 for changeset 6834d6aeae09

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

diff --git a/.hgtags b/.hgtags
index 6854b1408f..acad0fb474 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2097,3 +2097,4 @@ d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7-3-755
 9eb0d30510f7b02aa5f55f400bfab08d847ab447 v7-3-758
 25ea15fdfa5c7d5894a06814fe9411b75050ebff v7-3-759
 8e54a32bcd56226647cfd3d8c5e142e3a98c0ca7 v7-3-760
+6834d6aeae099d6bfdff5151aa2174cafc22647f v7-3-761

From f1a14b8b6fc988db1ae98b52ac53ccb20c5742ac Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 16 Dec 2012 12:50:39 +0100
Subject: [PATCH 015/106] updated for version 7.3.762 Problem:    On some
 systems the tabline is not redrawn. Solution:   Call RedrawWindow(). (Charles
 Peacech)

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

diff --git a/src/gui_w48.c b/src/gui_w48.c
index a70fb259ea..1d380fbf93 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -2527,8 +2527,10 @@ gui_mch_update_tabline(void)
     if (TabCtrl_GetCurSel(s_tabhwnd) != curtabidx)
 	TabCtrl_SetCurSel(s_tabhwnd, curtabidx);
 
-    /* Re-enable redraw. This should trigger a repaint. */
+    /* Re-enable redraw and redraw. */
     SendMessage(s_tabhwnd, WM_SETREDRAW, (WPARAM)TRUE, 0);
+    RedrawWindow(s_tabhwnd, NULL, NULL,
+		    RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN);
 }
 
 /*
diff --git a/src/version.c b/src/version.c
index 5e7b397068..012ae87e3d 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 */
+/**/
+    762,
 /**/
     761,
 /**/

From f8dda06603db45e15675b6005f020a099f9436f4 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sun, 16 Dec 2012 12:50:40 +0100
Subject: [PATCH 016/106] Added tag v7-3-762 for changeset 699f8d8f096d

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

diff --git a/.hgtags b/.hgtags
index acad0fb474..d3aa0f1d17 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2098,3 +2098,4 @@ d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7-3-755
 25ea15fdfa5c7d5894a06814fe9411b75050ebff v7-3-759
 8e54a32bcd56226647cfd3d8c5e142e3a98c0ca7 v7-3-760
 6834d6aeae099d6bfdff5151aa2174cafc22647f v7-3-761
+699f8d8f096d4627f97e8d3bcf64b8634a484c26 v7-3-762

From f0c569a165ea9ac46e29a6e0696f7a3f5f516bbf Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 13:24:08 +0100
Subject: [PATCH 017/106] updated for version 7.3.763 Problem:    Jumping to a
 mark does not open a fold if it is in the same line. 	    (Wiktor Ruben)
 Solution:   Also compare the column after the jump. (Christian Brabandt)

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

diff --git a/src/normal.c b/src/normal.c
index 4d0bbdbea5..3d5b6d8171 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -7523,7 +7523,7 @@ nv_gomark(cap)
     pos_T	*pos;
     int		c;
 #ifdef FEAT_FOLDING
-    linenr_T	lnum = curwin->w_cursor.lnum;
+    pos_T	old_cursor = curwin->w_cursor;
     int		old_KeyTyped = KeyTyped;    /* getting file may reset it */
 #endif
 
@@ -7552,7 +7552,7 @@ nv_gomark(cap)
 #endif
 #ifdef FEAT_FOLDING
     if (cap->oap->op_type == OP_NOP
-	    && (pos == (pos_T *)-1 || lnum != curwin->w_cursor.lnum)
+	    && (pos == (pos_T *)-1 || !equalpos(old_cursor, *pos))
 	    && (fdo_flags & FDO_MARK)
 	    && old_KeyTyped)
 	foldOpenCursor();
diff --git a/src/version.c b/src/version.c
index 012ae87e3d..83b1bc4ad7 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 */
+/**/
+    763,
 /**/
     762,
 /**/

From be1eda6a25584eb668dfd197f1bbba0e0e090f08 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 13:24:08 +0100
Subject: [PATCH 018/106] Added tag v7-3-763 for changeset b6148e4a9c39

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

diff --git a/.hgtags b/.hgtags
index d3aa0f1d17..862eadc8df 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2099,3 +2099,4 @@ d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7-3-755
 8e54a32bcd56226647cfd3d8c5e142e3a98c0ca7 v7-3-760
 6834d6aeae099d6bfdff5151aa2174cafc22647f v7-3-761
 699f8d8f096d4627f97e8d3bcf64b8634a484c26 v7-3-762
+b6148e4a9c397b5dd1716cdac2f96730bd0f353d v7-3-763

From af9d249e1ffebfa4f278018fe24d557754f8ddaf Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 13:37:32 +0100
Subject: [PATCH 019/106] updated for version 7.3.764 Problem:    Not all
 message translation files are installed. Solution:   Also install the
 converted files.

---
 src/po/Makefile | 24 +++++++++++++++++-------
 src/version.c   |  2 ++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/po/Makefile b/src/po/Makefile
index c049d6a94c..2814b3fe8a 100644
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -34,6 +34,16 @@ LANGUAGES = \
 		zh_TW \
 		zh_TW.UTF-8
 
+CONVERTED = \
+		cs.cp1250 \
+		ja.sjis \
+		pl.cp1250 \
+		pl.UTF-8 \
+		ru.cp1251 \
+		sk.cp1250 \
+		uk.cp1251 \
+		zh_CN.cp936
+
 MOFILES = \
 		af.mo \
 		ca.mo \
@@ -64,7 +74,7 @@ MOFILES = \
 		zh_TW.UTF-8.mo \
 		zh_TW.mo
 
-CONVERTED = \
+MOCONVERTED = \
 		cs.cp1250.mo \
 		ja.sjis.mo \
 		pl.cp1250.mo \
@@ -126,7 +136,7 @@ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes msgmerge
 
 .SUFFIXES:
 .SUFFIXES: .po .mo .pot .ck
-.PHONY: all install uninstall prefixcheck converted check clean checkclean distclean update-po $(LANGUAGES)
+.PHONY: all install uninstall prefixcheck converted check clean checkclean distclean update-po $(LANGUAGES) $(CONVERTED)
 
 .po.mo:
 	$(MSGFMT) -o $@ $<
@@ -135,13 +145,13 @@ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes msgmerge
 	$(VIM) -u NONE -e -X -S check.vim -c "if error == 0 | q | endif" -c cq $<
 	touch $@
 
-all: $(MOFILES)
+all: $(MOFILES) $(MOCONVERTED)
 
 check: $(CHECKFILES)
 
-install: $(MOFILES)
+install: $(MOFILES) $(MOCONVERTED)
 	@$(MAKE) prefixcheck
-	for lang in $(LANGUAGES); do \
+	for lang in $(LANGUAGES) $(CONVERTED); do \
 	  dir=$(LOCALEDIR)/$$lang/; \
 	  if test ! -x "$$dir"; then \
 	    mkdir $$dir; chmod 755 $$dir; \
@@ -158,13 +168,13 @@ install: $(MOFILES)
 
 uninstall:
 	@$(MAKE) prefixcheck
-	for cat in $(MOFILES); do \
+	for cat in $(MOFILES) $(MOCONVERTED); do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  rm -f $(LOCALEDIR)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
 	done
 
-converted: $(CONVERTED)
+converted: $(MOCONVERTED)
 
 # Norwegian/Bokmal: "nb" is an alias for "no".
 # Copying the file is not efficient, but I don't know of another way to make
diff --git a/src/version.c b/src/version.c
index 83b1bc4ad7..c9bf6ded7c 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 */
+/**/
+    764,
 /**/
     763,
 /**/

From 78b3be7cbb32b79502a34fc76fcedf3c33257163 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 13:37:32 +0100
Subject: [PATCH 020/106] Added tag v7-3-764 for changeset b29e55d0ef01

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

diff --git a/.hgtags b/.hgtags
index 862eadc8df..49e4a7ff0f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2100,3 +2100,4 @@ d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7-3-755
 6834d6aeae099d6bfdff5151aa2174cafc22647f v7-3-761
 699f8d8f096d4627f97e8d3bcf64b8634a484c26 v7-3-762
 b6148e4a9c397b5dd1716cdac2f96730bd0f353d v7-3-763
+b29e55d0ef01c506ec48c0c5782e669bb1d80f14 v7-3-764

From 80640894cc7c342c148a78856b2af97a4e851c74 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 14:00:11 +0100
Subject: [PATCH 021/106] updated for version 7.3.765 Problem:    Segfault when
 doing "cclose" on BufUnload in a python function. 	    (Sean
 Reifschneider) Solution:   Skip window with NULL buffer. (Christian Brabandt)

---
 src/main.c    |  3 +++
 src/version.c |  2 ++
 src/window.c  | 11 +++++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main.c b/src/main.c
index 66726d2790..6581ba9397 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1376,6 +1376,9 @@ getout(exitval)
 	    for (wp = (tp == curtab)
 		    ? firstwin : tp->tp_firstwin; wp != NULL; wp = wp->w_next)
 	    {
+		if (wp->w_buffer == NULL)
+		    /* Autocmd must have close the buffer already, skip. */
+		    continue;
 		buf = wp->w_buffer;
 		if (buf->b_changedtick != -1)
 		{
diff --git a/src/version.c b/src/version.c
index c9bf6ded7c..375b07d491 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 */
+/**/
+    765,
 /**/
     764,
 /**/
diff --git a/src/window.c b/src/window.c
index e37450d98e..b5d4afd2b4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2276,9 +2276,15 @@ win_close(win, free_buf)
 #endif
     }
 
+    if (only_one_window() && win_valid(win) && win->w_buffer == NULL
+	    && (last_window() || curtab != prev_curtab
+		|| close_last_window_tabpage(win, free_buf, prev_curtab)))
+	/* Autocommands have close all windows, quit now. */
+	getout(0);
+
     /* Autocommands may have closed the window already, or closed the only
      * other window or moved to another tab page. */
-    if (!win_valid(win) || last_window() || curtab != prev_curtab
+    else if (!win_valid(win) || last_window() || curtab != prev_curtab
 	    || close_last_window_tabpage(win, free_buf, prev_curtab))
 	return;
 
@@ -6282,7 +6288,8 @@ only_one_window()
 	return FALSE;
 
     for (wp = firstwin; wp != NULL; wp = wp->w_next)
-	if ((!((wp->w_buffer->b_help && !curbuf->b_help)
+	if (wp->w_buffer != NULL
+		&& (!((wp->w_buffer->b_help && !curbuf->b_help)
 # ifdef FEAT_QUICKFIX
 		    || wp->w_p_pvw
 # endif

From 88297797f257a983b169f7f8b8c266ae3f0cfc2e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 14:00:12 +0100
Subject: [PATCH 022/106] Added tag v7-3-765 for changeset 915fb3d2dd8f

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

diff --git a/.hgtags b/.hgtags
index 49e4a7ff0f..c3cacf5493 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2101,3 +2101,4 @@ d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7-3-755
 699f8d8f096d4627f97e8d3bcf64b8634a484c26 v7-3-762
 b6148e4a9c397b5dd1716cdac2f96730bd0f353d v7-3-763
 b29e55d0ef01c506ec48c0c5782e669bb1d80f14 v7-3-764
+915fb3d2dd8ffc322a5cc9e294d9bb7dfa8c5a83 v7-3-765

From 5ba9855cdcd4435413d15aa29b9f95d02cba63f5 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 14:09:44 +0100
Subject: [PATCH 023/106] updated for version 7.3.766 Problem:    ":help cpo-*"
 jumps to the wrong place. Solution:   Make it equivalent to ":help cpo-star".

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

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index a217402476..712ba4ff9d 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -5849,14 +5849,14 @@ find_help_tags(arg, num_matches, matches, keep_lang)
     int		i;
     static char *(mtable[]) = {"*", "g*", "[*", "]*", ":*",
 			       "/*", "/\\*", "\"*", "**",
-			       "/\\(\\)",
+			       "cpo-*", "/\\(\\)",
 			       "?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
 			       "/\\?", "/\\z(\\)", "\\=", ":s\\=",
 			       "[count]", "[quotex]", "[range]",
 			       "[pattern]", "\\|", "\\%$"};
     static char *(rtable[]) = {"star", "gstar", "[star", "]star", ":star",
 			       "/star", "/\\\\star", "quotestar", "starstar",
-			       "/\\\\(\\\\)",
+			       "cpo-star", "/\\\\(\\\\)",
 			       "?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
 			       "/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
 			       "\\[count]", "\\[quotex]", "\\[range]",
diff --git a/src/version.c b/src/version.c
index 375b07d491..444a3d92ac 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 */
+/**/
+    766,
 /**/
     765,
 /**/

From 8d94680ace6623b1e77909759e256d313b459ebb Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 14:09:45 +0100
Subject: [PATCH 024/106] Added tag v7-3-766 for changeset b5103b7d9e12

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

diff --git a/.hgtags b/.hgtags
index c3cacf5493..a57fd73272 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2102,3 +2102,4 @@ d9b4cf53be2edbb872cc489aea32a4441b39eaf9 v7-3-755
 b6148e4a9c397b5dd1716cdac2f96730bd0f353d v7-3-763
 b29e55d0ef01c506ec48c0c5782e669bb1d80f14 v7-3-764
 915fb3d2dd8ffc322a5cc9e294d9bb7dfa8c5a83 v7-3-765
+b5103b7d9e1284ef9ffbc7d1170d9105c0769c4d v7-3-766

From 02cc5f062f0c8bed570d2bdfc0784829c40ecefe Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 14:39:47 +0100
Subject: [PATCH 025/106] updated for version 7.3.767 Problem:    (Win32) The
 _errno used for iconv may be the wrong one. Solution:   Use the _errno from
 iconv.dll. (Ken Takata)

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

diff --git a/src/mbyte.c b/src/mbyte.c
index 33e894e88c..5f82edf8d6 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -3242,7 +3242,7 @@ utf_strnicmp(s1, s2, n1, n2)
 
 /*
  * Version of strnicmp() that handles multi-byte characters.
- * Needed for Big5, Sjift-JIS and UTF-8 encoding.  Other DBCS encodings can
+ * Needed for Big5, Shift-JIS and UTF-8 encoding.  Other DBCS encodings can
  * probably use strnicmp(), because there are no ASCII characters in the
  * second byte.
  * Returns zero if s1 and s2 are equal (ignoring case), the difference between
@@ -4293,6 +4293,44 @@ static HINSTANCE hMsvcrtDLL = 0;
 #   define DYNAMIC_MSVCRT_DLL "msvcrt.dll"
 #  endif
 
+/*
+ * Get the address of 'funcname' which is imported by 'hInst' DLL.
+ */
+    static void *
+get_iconv_import_func(HINSTANCE hInst, const char *funcname)
+{
+    PBYTE			pImage = (PBYTE)hInst;
+    PIMAGE_DOS_HEADER		pDOS = (PIMAGE_DOS_HEADER)hInst;
+    PIMAGE_NT_HEADERS		pPE;
+    PIMAGE_IMPORT_DESCRIPTOR	pImpDesc;
+    PIMAGE_THUNK_DATA		pIAT;	    /* Import Address Table */
+    PIMAGE_THUNK_DATA		pINT;	    /* Import Name Table */
+    PIMAGE_IMPORT_BY_NAME	pImpName;
+
+    if (pDOS->e_magic != IMAGE_DOS_SIGNATURE)
+	return NULL;
+    pPE = (PIMAGE_NT_HEADERS)(pImage + pDOS->e_lfanew);
+    if (pPE->Signature != IMAGE_NT_SIGNATURE)
+	return NULL;
+    pImpDesc = (PIMAGE_IMPORT_DESCRIPTOR)(pImage
+	    + pPE->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT]
+							    .VirtualAddress);
+    for (; pImpDesc->FirstThunk; ++pImpDesc)
+    {
+	pIAT = (PIMAGE_THUNK_DATA)(pImage + pImpDesc->FirstThunk);
+	pINT = (PIMAGE_THUNK_DATA)(pImage + pImpDesc->OriginalFirstThunk);
+	for (; pIAT->u1.Function; ++pIAT, ++pINT)
+	{
+	    if (IMAGE_SNAP_BY_ORDINAL(pINT->u1.Ordinal))
+		continue;
+	    pImpName = (PIMAGE_IMPORT_BY_NAME)(pImage + pINT->u1.AddressOfData);
+	    if (strcmp(pImpName->Name, funcname) == 0)
+		return (void *)pIAT->u1.Function;
+	}
+    }
+    return NULL;
+}
+
 /*
  * Try opening the iconv.dll and return TRUE if iconv() can be used.
  */
@@ -4326,7 +4364,9 @@ iconv_enabled(verbose)
     iconv_open	= (void *)GetProcAddress(hIconvDLL, "libiconv_open");
     iconv_close	= (void *)GetProcAddress(hIconvDLL, "libiconv_close");
     iconvctl	= (void *)GetProcAddress(hIconvDLL, "libiconvctl");
-    iconv_errno	= (void *)GetProcAddress(hMsvcrtDLL, "_errno");
+    iconv_errno	= get_iconv_import_func(hIconvDLL, "_errno");
+    if (iconv_errno == NULL)
+	iconv_errno = (void *)GetProcAddress(hMsvcrtDLL, "_errno");
     if (iconv == NULL || iconv_open == NULL || iconv_close == NULL
 	    || iconvctl == NULL || iconv_errno == NULL)
     {
diff --git a/src/version.c b/src/version.c
index 444a3d92ac..3217400109 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 */
+/**/
+    767,
 /**/
     766,
 /**/

From afbc68e5c3e76b41cd31b87b4e104828157f2257 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 14:39:47 +0100
Subject: [PATCH 026/106] Added tag v7-3-767 for changeset be1cffa1e477

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

diff --git a/.hgtags b/.hgtags
index a57fd73272..da2d00269f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2103,3 +2103,4 @@ b6148e4a9c397b5dd1716cdac2f96730bd0f353d v7-3-763
 b29e55d0ef01c506ec48c0c5782e669bb1d80f14 v7-3-764
 915fb3d2dd8ffc322a5cc9e294d9bb7dfa8c5a83 v7-3-765
 b5103b7d9e1284ef9ffbc7d1170d9105c0769c4d v7-3-766
+be1cffa1e477c4a96bb54a3097d3369b23f32825 v7-3-767

From 361a518c2c215113b9db540db9ff2c7429f9ba6b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 15:37:01 +0100
Subject: [PATCH 027/106] updated for version 7.3.768 Problem:    settabvar()
 and setwinvar() may move the cursor. Solution:   Save and restore the cursor
 position when appropriate. (idea by 	    Yasuhiro Matsumoto)

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

diff --git a/src/edit.c b/src/edit.c
index 0d94095466..50c1fca6bd 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -372,6 +372,8 @@ edit(cmdchar, startln, count)
      */
     if (cmdchar != 'r' && cmdchar != 'v')
     {
+	pos_T   save_cursor = curwin->w_cursor;
+
 # ifdef FEAT_EVAL
 	if (cmdchar == 'R')
 	    ptr = (char_u *)"r";
@@ -382,6 +384,19 @@ edit(cmdchar, startln, count)
 	set_vim_var_string(VV_INSERTMODE, ptr, 1);
 # endif
 	apply_autocmds(EVENT_INSERTENTER, NULL, NULL, FALSE, curbuf);
+
+	/* Since Insert mode was not started yet a call to check_cursor_col()
+	 * may have moved the cursor, especially with the "A" command. */
+	if (curwin->w_cursor.col != save_cursor.col
+		&& curwin->w_cursor.lnum == save_cursor.lnum)
+	{
+	    int save_state = State;
+
+	    curwin->w_cursor = save_cursor;
+	    State = INSERT;
+	    check_cursor_col();
+	    State = save_state;
+	}
     }
 #endif
 
diff --git a/src/version.c b/src/version.c
index 3217400109..251cec8133 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 */
+/**/
+    768,
 /**/
     767,
 /**/

From dd726d160666f01b9cb1076ad35cc43480972485 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 15:37:02 +0100
Subject: [PATCH 028/106] Added tag v7-3-768 for changeset 9ea81cd9b1f5

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

diff --git a/.hgtags b/.hgtags
index da2d00269f..5086c97f9c 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2104,3 +2104,4 @@ b29e55d0ef01c506ec48c0c5782e669bb1d80f14 v7-3-764
 915fb3d2dd8ffc322a5cc9e294d9bb7dfa8c5a83 v7-3-765
 b5103b7d9e1284ef9ffbc7d1170d9105c0769c4d v7-3-766
 be1cffa1e477c4a96bb54a3097d3369b23f32825 v7-3-767
+9ea81cd9b1f50054629547ce2eccfac1fa00d096 v7-3-768

From 365f5fa668985136258b955953aa199a64e5124c Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 17:02:05 +0100
Subject: [PATCH 029/106] updated for version 7.3.769 Problem:    'matchpairs'
 does not work with multi-byte characters. Solution:   Make it work.
 (Christian Brabandt)

---
 src/misc1.c           |  12 ++--
 src/option.c          | 142 +++++++++++++++++++++++++++++++++++++++---
 src/proto/option.pro  |   1 +
 src/search.c          |  70 +++++----------------
 src/testdir/test69.in |  10 +++
 src/testdir/test69.ok |   4 ++
 src/version.c         |   2 +
 7 files changed, 176 insertions(+), 65 deletions(-)

diff --git a/src/misc1.c b/src/misc1.c
index 636fc4a07b..ab42f04db1 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -2288,14 +2288,18 @@ ins_char_bytes(buf, charlen)
      */
     if (p_sm && (State & INSERT)
 	    && msg_silent == 0
-#ifdef FEAT_MBYTE
-	    && charlen == 1
-#endif
 #ifdef FEAT_INS_EXPAND
 	    && !ins_compl_active()
 #endif
        )
-	showmatch(c);
+    {
+#ifdef FEAT_MBYTE
+	if (has_mbyte)
+	    showmatch(mb_ptr2char(buf));
+	else
+#endif
+	    showmatch(c);
+    }
 
 #ifdef FEAT_RIGHTLEFT
     if (!p_ri || (State & REPLACE_FLAG))
diff --git a/src/option.c b/src/option.c
index d8eb314d4a..8f52406022 100644
--- a/src/option.c
+++ b/src/option.c
@@ -6149,16 +6149,46 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
     /* 'matchpairs' */
     else if (gvarp == &p_mps)
     {
-	/* Check for "x:y,x:y" */
-	for (p = *varp; *p != NUL; p += 4)
+#ifdef FEAT_MBYTE
+	if (has_mbyte)
 	{
-	    if (p[1] != ':' || p[2] == NUL || (p[3] != NUL && p[3] != ','))
+	    for (p = *varp; *p != NUL; ++p)
 	    {
-		errmsg = e_invarg;
-		break;
+		int x2,x3 = -1;
+
+		if (*p != NUL)
+		    p += mb_ptr2len(p);
+		if (*p != NUL)
+		    x2 = *p++;
+		if (*p != NUL)
+		{
+		    x3 = mb_ptr2char(p);
+		    p += mb_ptr2len(p);
+		}
+		if (x2 != ':' || x2 == -1 || x3 == -1
+						  || (*p != NUL && *p != ','))
+		{
+		    errmsg = e_invarg;
+		    break;
+		}
+		if (*p == NUL)
+		    break;
+	    }
+	}
+	else
+#endif
+	{
+	    /* Check for "x:y,x:y" */
+	    for (p = *varp; *p != NUL; p += 4)
+	    {
+		if (p[1] != ':' || p[2] == NUL || (p[3] != NUL && p[3] != ','))
+		{
+		    errmsg = e_invarg;
+		    break;
+		}
+		if (p[3] == NUL)
+		    break;
 	    }
-	    if (p[3] == NUL)
-		break;
 	}
     }
 
@@ -11453,3 +11483,101 @@ get_sts_value()
 {
     return curbuf->b_p_sts < 0 ? get_sw_value() : curbuf->b_p_sts;
 }
+
+/*
+ * Check matchpairs option for "*initc".
+ * If there is a match set "*initc" to the matching character and "*findc" to
+ * the opposite character.  Set "*backwards" to the direction.
+ * When "switchit" is TRUE swap the direction.
+ */
+    void
+find_mps_values(initc, findc, backwards, switchit)
+    int	    *initc;
+    int	    *findc;
+    int	    *backwards;
+    int	    switchit;
+{
+    char_u	*ptr;
+
+    ptr = curbuf->b_p_mps;
+    while (*ptr != NUL)
+    {
+#ifdef FEAT_MBYTE
+	if (has_mbyte)
+	{
+	    char_u *prev;
+
+	    if (mb_ptr2char(ptr) == *initc)
+	    {
+		if (switchit)
+		{
+		    *findc = *initc;
+		    *initc = mb_ptr2char(ptr + mb_ptr2len(ptr) + 1);
+		    *backwards = TRUE;
+		}
+		else
+		{
+		    *findc = mb_ptr2char(ptr + mb_ptr2len(ptr) + 1);
+		    *backwards = FALSE;
+		}
+		return;
+	    }
+	    prev = ptr;
+	    ptr += mb_ptr2len(ptr) + 1;
+	    if (mb_ptr2char(ptr) == *initc)
+	    {
+		if (switchit)
+		{
+		    *findc = *initc;
+		    *initc = mb_ptr2char(prev);
+		    *backwards = FALSE;
+		}
+		else
+		{
+		    *findc = mb_ptr2char(prev);
+		    *backwards = TRUE;
+		}
+		return;
+	    }
+	    ptr += mb_ptr2len(ptr);
+	}
+	else
+#endif
+	{
+	    if (*ptr == *initc)
+	    {
+		if (switchit)
+		{
+		    *backwards = TRUE;
+		    *findc = *initc;
+		    *initc = ptr[2];
+		}
+		else
+		{
+		    *backwards = FALSE;
+		    *findc = ptr[2];
+		}
+		return;
+	    }
+	    ptr += 2;
+	    if (*ptr == *initc)
+	    {
+		if (switchit)
+		{
+		    *backwards = FALSE;
+		    *findc = *initc;
+		    *initc = ptr[-2];
+		}
+		else
+		{
+		    *backwards = TRUE;
+		    *findc =  ptr[-2];
+		}
+		return;
+	    }
+	    ++ptr;
+	}
+	if (*ptr == ',')
+	    ++ptr;
+    }
+}
diff --git a/src/proto/option.pro b/src/proto/option.pro
index 63570fa4c5..ba0a4e1698 100644
--- a/src/proto/option.pro
+++ b/src/proto/option.pro
@@ -59,4 +59,5 @@ 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));
+void find_mps_values __ARGS((int *initc, int *findc, int *backwards, int switchit));
 /* vim: set ft=c : */
diff --git a/src/search.c b/src/search.c
index d7bfc43b14..0b1c519fb2 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1786,28 +1786,8 @@ findmatchlimit(oap, initc, flags, maxtravel)
     }
     else if (initc != '#' && initc != NUL)
     {
-	/* 'matchpairs' is "x:y,x:y" */
-	for (ptr = curbuf->b_p_mps; *ptr; ptr += 2)
-	{
-	    if (*ptr == initc)
-	    {
-		findc = initc;
-		initc = ptr[2];
-		backwards = TRUE;
-		break;
-	    }
-	    ptr += 2;
-	    if (*ptr == initc)
-	    {
-		findc = initc;
-		initc = ptr[-2];
-		backwards = FALSE;
-		break;
-	    }
-	    if (ptr[1] != ',')
-		break;
-	}
-	if (!findc)		/* invalid initc! */
+	find_mps_values(&initc, &findc, &backwards, TRUE);
+	if (findc == NUL)
 	    return NULL;
     }
     /*
@@ -1886,36 +1866,14 @@ findmatchlimit(oap, initc, flags, maxtravel)
 		    --pos.col;
 		for (;;)
 		{
-		    initc = linep[pos.col];
+		    initc = PTR2CHAR(linep + pos.col);
 		    if (initc == NUL)
 			break;
 
-		    for (ptr = curbuf->b_p_mps; *ptr; ++ptr)
-		    {
-			if (*ptr == initc)
-			{
-			    findc = ptr[2];
-			    backwards = FALSE;
-			    break;
-			}
-			ptr += 2;
-			if (*ptr == initc)
-			{
-			    findc = ptr[-2];
-			    backwards = TRUE;
-			    break;
-			}
-			if (!*++ptr)
-			    break;
-		    }
+		    find_mps_values(&initc, &findc, &backwards, FALSE);
 		    if (findc)
 			break;
-#ifdef FEAT_MBYTE
-		    if (has_mbyte)
-			pos.col += (*mb_ptr2len)(linep + pos.col);
-		    else
-#endif
-			++pos.col;
+		    pos.col += MB_PTR2LEN(linep + pos.col);
 		}
 		if (!findc)
 		{
@@ -2260,7 +2218,8 @@ findmatchlimit(oap, initc, flags, maxtravel)
 	 *   inquote if the number of quotes in a line is even, unless this
 	 *   line or the previous one ends in a '\'.  Complicated, isn't it?
 	 */
-	switch (c = linep[pos.col])
+	c = PTR2CHAR(linep + pos.col);
+	switch (c)
 	{
 	case NUL:
 	    /* at end of line without trailing backslash, reset inquote */
@@ -2469,20 +2428,23 @@ showmatch(c)
      * Only show match for chars in the 'matchpairs' option.
      */
     /* 'matchpairs' is "x:y,x:y" */
-    for (p = curbuf->b_p_mps; *p != NUL; p += 2)
+    for (p = curbuf->b_p_mps; *p != NUL; ++p)
     {
+	if (PTR2CHAR(p) == c
 #ifdef FEAT_RIGHTLEFT
-	if (*p == c && (curwin->w_p_rl ^ p_ri))
-	    break;
+		    && (curwin->w_p_rl ^ p_ri)
 #endif
-	p += 2;
-	if (*p == c
+	   )
+	    break;
+	p += MB_PTR2LEN(p) + 1;
+	if (PTR2CHAR(p) == c
 #ifdef FEAT_RIGHTLEFT
 		&& !(curwin->w_p_rl ^ p_ri)
 #endif
 	   )
 	    break;
-	if (p[1] != ',')
+	p += MB_PTR2LEN(p);
+	if (*p == NUL)
 	    return;
     }
 
diff --git a/src/testdir/test69.in b/src/testdir/test69.in
index 578f76bdf2..5c9a2f3d4c 100644
--- a/src/testdir/test69.in
+++ b/src/testdir/test69.in
@@ -1,4 +1,5 @@
 Test for multi-byte text formatting.
+Also test, that 'mps' with multibyte chars works.
 
 STARTTEST
 :so mbyte.vim
@@ -133,6 +134,15 @@ ENDTEST
 
 }
 
+STARTTEST
+/^{/+1
+:set mps+=u2018:u2019
+d%
+ENDTEST
+
+{
+‘ two three ’ four
+}
 STARTTEST
 :g/^STARTTEST/.,/^ENDTEST/d
 :1;/^Results/,$wq! test.out
diff --git a/src/testdir/test69.ok b/src/testdir/test69.ok
index 3dfe402e98..59a5a6e54e 100644
--- a/src/testdir/test69.ok
+++ b/src/testdir/test69.ok
@@ -140,3 +140,7 @@ a
 a
 }
 
+
+{
+ four
+}
diff --git a/src/version.c b/src/version.c
index 251cec8133..6d15d58647 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 */
+/**/
+    769,
 /**/
     768,
 /**/

From 1106504d46d7d48faebb9a34ad91974846057270 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 17:02:05 +0100
Subject: [PATCH 030/106] Added tag v7-3-769 for changeset d179a8eff9d7

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

diff --git a/.hgtags b/.hgtags
index 5086c97f9c..e80c2b5645 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2105,3 +2105,4 @@ b29e55d0ef01c506ec48c0c5782e669bb1d80f14 v7-3-764
 b5103b7d9e1284ef9ffbc7d1170d9105c0769c4d v7-3-766
 be1cffa1e477c4a96bb54a3097d3369b23f32825 v7-3-767
 9ea81cd9b1f50054629547ce2eccfac1fa00d096 v7-3-768
+d179a8eff9d7b0adc561f4a4dcfb0b7612c1f301 v7-3-769

From 3d1455b16cc02b49c607090df9a6ffd62c090599 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 17:17:26 +0100
Subject: [PATCH 031/106] updated for version 7.3.770 Problem:    Vim.h
 indentation is inconsistent. Solution:   Adjust the indentation. (Elias Diem)

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

diff --git a/src/version.c b/src/version.c
index 6d15d58647..18fcd020f0 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 */
+/**/
+    770,
 /**/
     769,
 /**/
diff --git a/src/vim.h b/src/vim.h
index 35b23105b6..a501a71e4d 100644
--- a/src/vim.h
+++ b/src/vim.h
@@ -104,7 +104,7 @@
 # endif
 #endif
 #if defined(MACOS_X) || defined(MACOS_CLASSIC)
-#  define MACOS
+# define MACOS
 #endif
 #if defined(MACOS_X) && defined(MACOS_CLASSIC)
     Error: To compile for both MACOS X and Classic use a Classic Carbon
@@ -490,7 +490,7 @@ typedef unsigned long u8char_T;	    /* long should be 32 bits or more */
 #  include <string.h>
 # endif
 # if defined(HAVE_STRINGS_H) && !defined(NO_STRINGS_WITH_STRING_H)
-#   include <strings.h>
+#  include <strings.h>
 # endif
 # ifdef HAVE_STAT_H
 #  include <stat.h>
@@ -515,22 +515,22 @@ typedef unsigned long u8char_T;	    /* long should be 32 bits or more */
 # include <stdarg.h>
 #endif
 
-# if defined(HAVE_SYS_SELECT_H) && \
+#if defined(HAVE_SYS_SELECT_H) && \
 	(!defined(HAVE_SYS_TIME_H) || defined(SYS_SELECT_WITH_SYS_TIME))
-#  include <sys/select.h>
-# endif
+# include <sys/select.h>
+#endif
 
-# ifndef HAVE_SELECT
-#  ifdef HAVE_SYS_POLL_H
-#   include <sys/poll.h>
+#ifndef HAVE_SELECT
+# ifdef HAVE_SYS_POLL_H
+#  include <sys/poll.h>
+#  define HAVE_POLL
+# else
+#  ifdef HAVE_POLL_H
+#   include <poll.h>
 #   define HAVE_POLL
-#  else
-#   ifdef HAVE_POLL_H
-#    include <poll.h>
-#    define HAVE_POLL
-#   endif
 #  endif
 # endif
+#endif
 
 /* ================ end of the header file puzzle =============== */
 
@@ -1877,8 +1877,8 @@ typedef int proftime_T;	    /* dummy for function prototypes */
 /* VIM_ATOM_NAME is the older Vim-specific selection type for X11.  Still
  * supported for when a mix of Vim versions is used. VIMENC_ATOM_NAME includes
  * the encoding to support Vims using different 'encoding' values. */
-#define VIM_ATOM_NAME "_VIM_TEXT"
-#define VIMENC_ATOM_NAME "_VIMENC_TEXT"
+# define VIM_ATOM_NAME "_VIM_TEXT"
+# define VIMENC_ATOM_NAME "_VIMENC_TEXT"
 
 /* Selection states for modeless selection */
 # define SELECT_CLEARED		0

From cb4ca03414716e9d0be6968649f4fdb1c4fcdfaf Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 17:17:26 +0100
Subject: [PATCH 032/106] Added tag v7-3-770 for changeset da7a7ba36ed2

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

diff --git a/.hgtags b/.hgtags
index e80c2b5645..16db06c1a1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2106,3 +2106,4 @@ b5103b7d9e1284ef9ffbc7d1170d9105c0769c4d v7-3-766
 be1cffa1e477c4a96bb54a3097d3369b23f32825 v7-3-767
 9ea81cd9b1f50054629547ce2eccfac1fa00d096 v7-3-768
 d179a8eff9d7b0adc561f4a4dcfb0b7612c1f301 v7-3-769
+da7a7ba36ed2a51f28e4d3f7e1fd550303e3ece8 v7-3-770

From f53cfcc3f81a4d92ef957502593a4184c6f9d398 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 17:37:35 +0100
Subject: [PATCH 033/106] updated for version 7.3.771 Problem:    Uninitialized
 variable. (Yasuhiro Matsumoto) Solution:   Set x2 to -1.

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

diff --git a/src/option.c b/src/option.c
index 8f52406022..f38e9c7066 100644
--- a/src/option.c
+++ b/src/option.c
@@ -6154,7 +6154,8 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
 	{
 	    for (p = *varp; *p != NUL; ++p)
 	    {
-		int x2,x3 = -1;
+		int x2 = -1;
+		int x3 = -1;
 
 		if (*p != NUL)
 		    p += mb_ptr2len(p);
@@ -6165,8 +6166,7 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
 		    x3 = mb_ptr2char(p);
 		    p += mb_ptr2len(p);
 		}
-		if (x2 != ':' || x2 == -1 || x3 == -1
-						  || (*p != NUL && *p != ','))
+		if (x2 != ':' || x3 == -1 || (*p != NUL && *p != ','))
 		{
 		    errmsg = e_invarg;
 		    break;
diff --git a/src/version.c b/src/version.c
index 18fcd020f0..f071eb9621 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 */
+/**/
+    771,
 /**/
     770,
 /**/

From cf2c91556661f2e0182c4e978f7accff8cf818eb Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 17:37:36 +0100
Subject: [PATCH 034/106] Added tag v7-3-771 for changeset 3bd2c055319e

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

diff --git a/.hgtags b/.hgtags
index 16db06c1a1..f1351d4996 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2107,3 +2107,4 @@ be1cffa1e477c4a96bb54a3097d3369b23f32825 v7-3-767
 9ea81cd9b1f50054629547ce2eccfac1fa00d096 v7-3-768
 d179a8eff9d7b0adc561f4a4dcfb0b7612c1f301 v7-3-769
 da7a7ba36ed2a51f28e4d3f7e1fd550303e3ece8 v7-3-770
+3bd2c055319e086665af5e449498a4d5bf40f25e v7-3-771

From 31b7236cd892eac3bd8202c9868cd353302e6645 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 18:34:05 +0100
Subject: [PATCH 035/106] updated for version 7.3.772 Problem:    Cursor is at
 the wrong location and below the end of the file 	    after doing
 substitutions with confirm flag: %s/x/y/c 	    (Dominique Pelle)
 Solution:   Update the cursor position. (Christian Brabandt & Dominique)

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

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 712ba4ff9d..acb4da28dd 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -5200,6 +5200,12 @@ outofmem:
 	    EMSG2(_(e_patnotf2), get_search_pat());
     }
 
+#ifdef FEAT_FOLDING
+    if (do_ask && hasAnyFolding(curwin))
+	/* Cursor position may require updating */
+	changed_window_setting();
+#endif
+
     vim_free(regmatch.regprog);
 }
 
diff --git a/src/version.c b/src/version.c
index f071eb9621..8b9a2414b1 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 */
+/**/
+    772,
 /**/
     771,
 /**/

From b55f9b11ea9acdc6f1d7a05a4eb2aba0c9325e59 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 17 Jan 2013 18:34:06 +0100
Subject: [PATCH 036/106] Added tag v7-3-772 for changeset d828cab6964f

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

diff --git a/.hgtags b/.hgtags
index f1351d4996..3a2bda18f0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2108,3 +2108,4 @@ be1cffa1e477c4a96bb54a3097d3369b23f32825 v7-3-767
 d179a8eff9d7b0adc561f4a4dcfb0b7612c1f301 v7-3-769
 da7a7ba36ed2a51f28e4d3f7e1fd550303e3ece8 v7-3-770
 3bd2c055319e086665af5e449498a4d5bf40f25e v7-3-771
+d828cab6964f4249db54bff6df0fe02d0f290387 v7-3-772

From 1c19bd8cbcfae84713c0fb282d686c55d2bf2c03 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sat, 19 Jan 2013 14:02:02 +0100
Subject: [PATCH 037/106] updated for version 7.3.773 Problem:    Crash when
 OriginalFirstThunk is zero. Solution:   Skip items with OriginalFirstThunk
 not set. (Ken Takata)

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

diff --git a/src/mbyte.c b/src/mbyte.c
index 5f82edf8d6..7fdd44dc32 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4317,6 +4317,8 @@ get_iconv_import_func(HINSTANCE hInst, const char *funcname)
 							    .VirtualAddress);
     for (; pImpDesc->FirstThunk; ++pImpDesc)
     {
+	if (!pImpDesc->OriginalFirstThunk)
+	    continue;
 	pIAT = (PIMAGE_THUNK_DATA)(pImage + pImpDesc->FirstThunk);
 	pINT = (PIMAGE_THUNK_DATA)(pImage + pImpDesc->OriginalFirstThunk);
 	for (; pIAT->u1.Function; ++pIAT, ++pINT)
diff --git a/src/version.c b/src/version.c
index 8b9a2414b1..b3e1c2903a 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 */
+/**/
+    773,
 /**/
     772,
 /**/

From 0e601a6548a67576102b289223028a107fd38289 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Sat, 19 Jan 2013 14:02:02 +0100
Subject: [PATCH 038/106] Added tag v7-3-773 for changeset 3db9aee957f7

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

diff --git a/.hgtags b/.hgtags
index 3a2bda18f0..0dd7c2c25b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2109,3 +2109,4 @@ d179a8eff9d7b0adc561f4a4dcfb0b7612c1f301 v7-3-769
 da7a7ba36ed2a51f28e4d3f7e1fd550303e3ece8 v7-3-770
 3bd2c055319e086665af5e449498a4d5bf40f25e v7-3-771
 d828cab6964f4249db54bff6df0fe02d0f290387 v7-3-772
+3db9aee957f7eea6729e5bfd294e3a24d41c79e4 v7-3-773

From 8eba316a0785dcf95299791c75b005895e1a256f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 13:41:00 +0100
Subject: [PATCH 039/106] updated for version 7.3.774 Problem:    Tiny GUI
 version misses console dialog feature. Solution:   Define FEAT_CON_DIALOG
 when apprpriate. (Christian Brabandt)

---
 src/feature.h | 12 ++++++++++++
 src/gui.h     |  9 ---------
 src/version.c |  2 ++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/feature.h b/src/feature.h
index 7ef654bb39..f54f59ac9f 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -791,6 +791,15 @@
 # endif
 #endif
 
+/*
+ * On some systems, when we compile with the GUI, we always use it.  On Mac
+ * there is no terminal version, and on Windows we can't figure out how to
+ * fork one off with :gui.
+ */
+#if defined(FEAT_GUI_MSWIN) || (defined(FEAT_GUI_MAC) && !defined(MACOS_X_UNIX))
+# define ALWAYS_USE_GUI
+#endif
+
 /*
  * +dialog_gui		Use GUI dialog.
  * +dialog_con		May use Console dialog.
@@ -820,6 +829,9 @@
 	 || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) \
 	 || defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC))
 # define FEAT_GUI_TEXTDIALOG
+# ifndef ALWAYS_USE_GUI
+#  define FEAT_CON_DIALOG
+# endif
 #endif
 
 /* Mac specific thing: Codewarrior interface. */
diff --git a/src/gui.h b/src/gui.h
index e0c1c5c8aa..aea450a196 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -58,15 +58,6 @@
 # include "photon/PxProto.h"
 #endif
 
-/*
- * On some systems, when we compile with the GUI, we always use it.  On Mac
- * there is no terminal version, and on Windows we can't figure out how to
- * fork one off with :gui.
- */
-#if defined(FEAT_GUI_MSWIN) || (defined(FEAT_GUI_MAC) && !defined(MACOS_X_UNIX))
-# define ALWAYS_USE_GUI
-#endif
-
 /*
  * On some systems scrolling needs to be done right away instead of in the
  * main loop.
diff --git a/src/version.c b/src/version.c
index b3e1c2903a..0190457066 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 */
+/**/
+    774,
 /**/
     773,
 /**/

From 642b9e5b2ebff017a8ba232e37b16015c0a50378 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 13:41:01 +0100
Subject: [PATCH 040/106] Added tag v7-3-774 for changeset a8f5876e4981

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

diff --git a/.hgtags b/.hgtags
index 0dd7c2c25b..a443373ca1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2110,3 +2110,4 @@ da7a7ba36ed2a51f28e4d3f7e1fd550303e3ece8 v7-3-770
 3bd2c055319e086665af5e449498a4d5bf40f25e v7-3-771
 d828cab6964f4249db54bff6df0fe02d0f290387 v7-3-772
 3db9aee957f7eea6729e5bfd294e3a24d41c79e4 v7-3-773
+a8f5876e498125f4916c5f7168823885c27dad8c v7-3-774

From b0b542fa2a036f71dc79f9e564ff685f5a79831b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 13:55:20 +0100
Subject: [PATCH 041/106] updated for version 7.3.775 Problem:    Cygwin and
 Mingw builds miss dependency on gui_w48.c. Solution:   Add a build rule. (Ken
 Takata)

---
 src/Make_cyg.mak  | 3 +++
 src/Make_ming.mak | 3 +++
 src/version.c     | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index a56141662f..087b68e481 100644
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -600,6 +600,9 @@ $(OUTDIR)/ex_docmd.o:	ex_docmd.c $(INCL) ex_cmds.h
 $(OUTDIR)/ex_eval.o:	ex_eval.c $(INCL) ex_cmds.h
 	$(CC) -c $(CFLAGS) ex_eval.c -o $(OUTDIR)/ex_eval.o
 
+$(OUTDIR)/gui_w32.o:	gui_w32.c gui_w48.c $(INCL)
+	$(CC) -c $(CFLAGS) gui_w32.c -o $(OUTDIR)/gui_w32.o
+
 $(OUTDIR)/if_cscope.o:	if_cscope.c $(INCL) if_cscope.h
 	$(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o
 
diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index 9402ccce7a..b11db8b93a 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -731,6 +731,9 @@ $(OUTDIR)/ex_docmd.o:	ex_docmd.c $(INCL) ex_cmds.h
 $(OUTDIR)/ex_eval.o:	ex_eval.c $(INCL) ex_cmds.h
 	$(CC) -c $(CFLAGS) ex_eval.c -o $(OUTDIR)/ex_eval.o
 
+$(OUTDIR)/gui_w32.o:	gui_w32.c gui_w48.c $(INCL)
+	$(CC) -c $(CFLAGS) gui_w32.c -o $(OUTDIR)/gui_w32.o
+
 $(OUTDIR)/if_cscope.o:	if_cscope.c $(INCL) if_cscope.h
 	$(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o
 
diff --git a/src/version.c b/src/version.c
index 0190457066..725506e33c 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 */
+/**/
+    775,
 /**/
     774,
 /**/

From 7e896accbc9ea5458296827ca32dc643b2361f29 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 13:55:20 +0100
Subject: [PATCH 042/106] Added tag v7-3-775 for changeset a6e60677aea7

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

diff --git a/.hgtags b/.hgtags
index a443373ca1..b732ad5cce 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2111,3 +2111,4 @@ da7a7ba36ed2a51f28e4d3f7e1fd550303e3ece8 v7-3-770
 d828cab6964f4249db54bff6df0fe02d0f290387 v7-3-772
 3db9aee957f7eea6729e5bfd294e3a24d41c79e4 v7-3-773
 a8f5876e498125f4916c5f7168823885c27dad8c v7-3-774
+a6e60677aea727622dde15d1306c61588b805500 v7-3-775

From fed6561294751b33c7f860817a9cc45060c8395c Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 15:53:15 +0100
Subject: [PATCH 043/106] updated for version 7.3.776 Problem:    ml_get error
 when searching, caused by curwin not matching curbuf. Solution:   Avoid
 changing curbuf. (Lech Lorens)

---
 src/charset.c         | 12 ++++++++++--
 src/eval.c            |  2 +-
 src/mark.c            | 36 +++++++++++++++++++++++-------------
 src/proto/charset.pro |  3 ++-
 src/proto/mark.pro    |  3 ++-
 src/regexp.c          | 14 +++++---------
 src/syntax.c          |  6 +++---
 src/version.c         |  2 ++
 8 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/src/charset.c b/src/charset.c
index d3ebfbf765..6f39cf6d07 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -904,6 +904,14 @@ vim_isIDc(c)
     int
 vim_iswordc(c)
     int c;
+{
+    return vim_iswordc_buf(c, curbuf);
+}
+
+    int
+vim_iswordc_buf(c, buf)
+    int		c;
+    buf_T	*buf;
 {
 #ifdef FEAT_MBYTE
     if (c >= 0x100)
@@ -914,7 +922,7 @@ vim_iswordc(c)
 	    return utf_class(c) >= 2;
     }
 #endif
-    return (c > 0 && c < 0x100 && GET_CHARTAB(curbuf, c) != 0);
+    return (c > 0 && c < 0x100 && GET_CHARTAB(buf, c) != 0);
 }
 
 /*
@@ -933,7 +941,7 @@ vim_iswordp(p)
 
 #if defined(FEAT_SYN_HL) || defined(PROTO)
     int
-vim_iswordc_buf(p, buf)
+vim_iswordp_buf(p, buf)
     char_u	*p;
     buf_T	*buf;
 {
diff --git a/src/eval.c b/src/eval.c
index 7c57557654..f645e9683e 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -18884,7 +18884,7 @@ var2fpos(varp, dollar_lnum, fnum)
 #endif
     if (name[0] == '\'')			/* mark */
     {
-	pp = getmark_fnum(name[1], FALSE, fnum);
+	pp = getmark_buf_fnum(curbuf, name[1], FALSE, fnum);
 	if (pp == NULL || pp == (pos_T *)-1 || pp->lnum <= 0)
 	    return NULL;
 	return pp;
diff --git a/src/mark.c b/src/mark.c
index 9b304f3d38..540f70b97b 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -304,7 +304,7 @@ movechangelist(count)
 #endif
 
 /*
- * Find mark "c".
+ * Find mark "c" in buffer pointed to by "buf".
  * If "changefile" is TRUE it's allowed to edit another file for '0, 'A, etc.
  * If "fnum" is not NULL store the fnum there for '0, 'A etc., don't edit
  * another file.
@@ -314,16 +314,26 @@ movechangelist(count)
  * - NULL if there is no mark called 'c'.
  * - -1 if mark is in other file and jumped there (only if changefile is TRUE)
  */
+    pos_T *
+getmark_buf(buf, c, changefile)
+    buf_T	*buf;
+    int		c;
+    int		changefile;
+{
+    return getmark_buf_fnum(buf, c, changefile, NULL);
+}
+
     pos_T *
 getmark(c, changefile)
     int		c;
     int		changefile;
 {
-    return getmark_fnum(c, changefile, NULL);
+    return getmark_buf_fnum(curbuf, c, changefile, NULL);
 }
 
     pos_T *
-getmark_fnum(c, changefile, fnum)
+getmark_buf_fnum(buf, c, changefile, fnum)
+    buf_T	*buf;
     int		c;
     int		changefile;
     int		*fnum;
@@ -351,15 +361,15 @@ getmark_fnum(c, changefile, fnum)
 	posp = &pos_copy;		/*   w_pcmark may be changed soon */
     }
     else if (c == '"')			/* to pos when leaving buffer */
-	posp = &(curbuf->b_last_cursor);
+	posp = &(buf->b_last_cursor);
     else if (c == '^')			/* to where Insert mode stopped */
-	posp = &(curbuf->b_last_insert);
+	posp = &(buf->b_last_insert);
     else if (c == '.')			/* to where last change was made */
-	posp = &(curbuf->b_last_change);
+	posp = &(buf->b_last_change);
     else if (c == '[')			/* to start of previous operator */
-	posp = &(curbuf->b_op_start);
+	posp = &(buf->b_op_start);
     else if (c == ']')			/* to end of previous operator */
-	posp = &(curbuf->b_op_end);
+	posp = &(buf->b_op_end);
     else if (c == '{' || c == '}')	/* to previous/next paragraph */
     {
 	pos_T	pos;
@@ -395,8 +405,8 @@ getmark_fnum(c, changefile, fnum)
 #ifdef FEAT_VISUAL
     else if (c == '<' || c == '>')	/* start/end of visual area */
     {
-	startp = &curbuf->b_visual.vi_start;
-	endp = &curbuf->b_visual.vi_end;
+	startp = &buf->b_visual.vi_start;
+	endp = &buf->b_visual.vi_end;
 	if ((c == '<') == lt(*startp, *endp))
 	    posp = startp;
 	else
@@ -404,7 +414,7 @@ getmark_fnum(c, changefile, fnum)
 	/*
 	 * For Visual line mode, set mark at begin or end of line
 	 */
-	if (curbuf->b_visual.vi_mode == 'V')
+	if (buf->b_visual.vi_mode == 'V')
 	{
 	    pos_copy = *posp;
 	    posp = &pos_copy;
@@ -420,7 +430,7 @@ getmark_fnum(c, changefile, fnum)
 #endif
     else if (ASCII_ISLOWER(c))		/* normal named mark */
     {
-	posp = &(curbuf->b_namedm[c - 'a']);
+	posp = &(buf->b_namedm[c - 'a']);
     }
     else if (ASCII_ISUPPER(c) || VIM_ISDIGIT(c))	/* named file mark */
     {
@@ -435,7 +445,7 @@ getmark_fnum(c, changefile, fnum)
 
 	if (fnum != NULL)
 	    *fnum = namedfm[c].fmark.fnum;
-	else if (namedfm[c].fmark.fnum != curbuf->b_fnum)
+	else if (namedfm[c].fmark.fnum != buf->b_fnum)
 	{
 	    /* mark is in another file */
 	    posp = &pos_copy;
diff --git a/src/proto/charset.pro b/src/proto/charset.pro
index 472f1cd44e..72eed4b071 100644
--- a/src/proto/charset.pro
+++ b/src/proto/charset.pro
@@ -19,8 +19,9 @@ int linetabsize_col __ARGS((int startcol, char_u *s));
 int win_linetabsize __ARGS((win_T *wp, char_u *p, colnr_T len));
 int vim_isIDc __ARGS((int c));
 int vim_iswordc __ARGS((int c));
+int vim_iswordc_buf __ARGS((int c, buf_T *buf));
 int vim_iswordp __ARGS((char_u *p));
-int vim_iswordc_buf __ARGS((char_u *p, buf_T *buf));
+int vim_iswordp_buf __ARGS((char_u *p, buf_T *buf));
 int vim_isfilec __ARGS((int c));
 int vim_isfilec_or_wc __ARGS((int c));
 int vim_isprintc __ARGS((int c));
diff --git a/src/proto/mark.pro b/src/proto/mark.pro
index 1457829a74..e8cef9dd26 100644
--- a/src/proto/mark.pro
+++ b/src/proto/mark.pro
@@ -5,8 +5,9 @@ void setpcmark __ARGS((void));
 void checkpcmark __ARGS((void));
 pos_T *movemark __ARGS((int count));
 pos_T *movechangelist __ARGS((int count));
+pos_T *getmark_buf __ARGS((buf_T *buf, int c, int changefile));
 pos_T *getmark __ARGS((int c, int changefile));
-pos_T *getmark_fnum __ARGS((int c, int changefile, int *fnum));
+pos_T *getmark_buf_fnum __ARGS((buf_T *buf, int c, int changefile, int *fnum));
 pos_T *getnextmark __ARGS((pos_T *startpos, int dir, int begin_line));
 void fmarks_check_names __ARGS((buf_T *buf));
 int check_mark __ARGS((pos_T *pos));
diff --git a/src/regexp.c b/src/regexp.c
index b078de385b..bb63c942f0 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -3623,7 +3623,6 @@ vim_regexec_multi(rmp, win, buf, lnum, col, tm)
     proftime_T	*tm;		/* timeout limit or NULL */
 {
     long	r;
-    buf_T	*save_curbuf = curbuf;
 
     reg_match = NULL;
     reg_mmatch = rmp;
@@ -3638,10 +3637,7 @@ vim_regexec_multi(rmp, win, buf, lnum, col, tm)
 #endif
     ireg_maxcol = rmp->rmm_maxcol;
 
-    /* Need to switch to buffer "buf" to make vim_iswordc() work. */
-    curbuf = buf;
     r = vim_regexec_both(NULL, col, tm);
-    curbuf = save_curbuf;
 
     return r;
 }
@@ -4185,7 +4181,7 @@ regmatch(scan)
 		int	cmp = OPERAND(scan)[1];
 		pos_T	*pos;
 
-		pos = getmark(mark, FALSE);
+		pos = getmark_buf(reg_buf, mark, FALSE);
 		if (pos == NULL		     /* mark doesn't exist */
 			|| pos->lnum <= 0    /* mark isn't set (in curbuf) */
 			|| (pos->lnum == reglnum + reg_firstlnum
@@ -4315,8 +4311,8 @@ regmatch(scan)
 #endif
 	    else
 	    {
-		if (!vim_iswordc(c)
-			|| (reginput > regline && vim_iswordc(reginput[-1])))
+		if (!vim_iswordc_buf(c, reg_buf)
+			|| (reginput > regline && vim_iswordc_buf(reginput[-1], reg_buf)))
 		    status = RA_NOMATCH;
 	    }
 	    break;
@@ -4339,8 +4335,8 @@ regmatch(scan)
 #endif
 	    else
 	    {
-		if (!vim_iswordc(reginput[-1])
-			|| (reginput[0] != NUL && vim_iswordc(c)))
+		if (!vim_iswordc_buf(reginput[-1], reg_buf)
+			|| (reginput[0] != NUL && vim_iswordc_buf(c, reg_buf)))
 		    status = RA_NOMATCH;
 	    }
 	    break; /* Matched with EOW */
diff --git a/src/syntax.c b/src/syntax.c
index 4adbaf087b..8e2930cf50 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1954,9 +1954,9 @@ syn_current_attr(syncing, displaying, can_spell, keep_state)
 	    if (do_keywords)
 	    {
 	      line = syn_getcurline();
-	      if (vim_iswordc_buf(line + current_col, syn_buf)
+	      if (vim_iswordp_buf(line + current_col, syn_buf)
 		      && (current_col == 0
-			  || !vim_iswordc_buf(line + current_col - 1
+			  || !vim_iswordp_buf(line + current_col - 1
 #ifdef FEAT_MBYTE
 			      - (has_mbyte
 				  ? (*mb_head_off)(line, line + current_col - 1)
@@ -3280,7 +3280,7 @@ check_keyword_id(line, startcol, endcolp, flagsp, next_listp, cur_si, ccharp)
 #endif
 	    ++kwlen;
     }
-    while (vim_iswordc_buf(kwp + kwlen, syn_buf));
+    while (vim_iswordp_buf(kwp + kwlen, syn_buf));
 
     if (kwlen > MAXKEYWLEN)
 	return 0;
diff --git a/src/version.c b/src/version.c
index 725506e33c..03a4833146 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 */
+/**/
+    776,
 /**/
     775,
 /**/

From 8efba88984f1fce93573dce416d0b6dc51686b0d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 15:53:15 +0100
Subject: [PATCH 044/106] Added tag v7-3-776 for changeset 80b041b994d1

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

diff --git a/.hgtags b/.hgtags
index b732ad5cce..7f57609663 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2112,3 +2112,4 @@ d828cab6964f4249db54bff6df0fe02d0f290387 v7-3-772
 3db9aee957f7eea6729e5bfd294e3a24d41c79e4 v7-3-773
 a8f5876e498125f4916c5f7168823885c27dad8c v7-3-774
 a6e60677aea727622dde15d1306c61588b805500 v7-3-775
+80b041b994d156360992666110964e74f7473d3e v7-3-776

From e429f1d34ad0f330a25d8dbea6dab9f834435b74 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 16:00:11 +0100
Subject: [PATCH 045/106] updated for version 7.3.777 Problem:    When building
 with Gnome locale gets reset. Solution:   Set locale after
 gnome_program_init(). (Christian Brabandt)

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

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index d70f418603..a8cad32e19 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -3130,8 +3130,16 @@ gui_mch_init(void)
      * exits on failure, but that's a non-issue because we already called
      * gtk_init_check() in gui_mch_init_check(). */
     if (using_gnome)
+    {
 	gnome_program_init(VIMPACKAGE, VIM_VERSION_SHORT,
 			   LIBGNOMEUI_MODULE, gui_argc, gui_argv, NULL);
+# if defined(FEAT_FLOAT) && defined(LC_NUMERIC)
+	/* Make sure strtod() uses a decimal point, not a comma. Gnome init
+	 * may change it. */
+	if (setlocale(LC_NUMERIC, NULL) != (char *) "C")
+	   setlocale(LC_NUMERIC, "C");
+# endif
+    }
 #endif
     vim_free(gui_argv);
     gui_argv = NULL;
diff --git a/src/version.c b/src/version.c
index 03a4833146..3e7d4639ee 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 */
+/**/
+    777,
 /**/
     776,
 /**/

From ae4a8a157a7e83f14cbc36d3ad74752905aff222 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 16:00:11 +0100
Subject: [PATCH 046/106] Added tag v7-3-777 for changeset 9a1a4c486e6b

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

diff --git a/.hgtags b/.hgtags
index 7f57609663..621ed2f52f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2113,3 +2113,4 @@ d828cab6964f4249db54bff6df0fe02d0f290387 v7-3-772
 a8f5876e498125f4916c5f7168823885c27dad8c v7-3-774
 a6e60677aea727622dde15d1306c61588b805500 v7-3-775
 80b041b994d156360992666110964e74f7473d3e v7-3-776
+9a1a4c486e6bb367c639c29c6120d5fb1fadcc38 v7-3-777

From 790813992c12469657a3d728420bea8e6af566b4 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 16:19:23 +0100
Subject: [PATCH 047/106] updated for version 7.3.778 Problem:    Compiler
 error for adding up two pointers. (Titov Anatoly) Solution:   Add a type
 cast. (Ken Takata)

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

diff --git a/src/mbyte.c b/src/mbyte.c
index 7fdd44dc32..b896477fce 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -4325,7 +4325,8 @@ get_iconv_import_func(HINSTANCE hInst, const char *funcname)
 	{
 	    if (IMAGE_SNAP_BY_ORDINAL(pINT->u1.Ordinal))
 		continue;
-	    pImpName = (PIMAGE_IMPORT_BY_NAME)(pImage + pINT->u1.AddressOfData);
+	    pImpName = (PIMAGE_IMPORT_BY_NAME)(pImage
+					+ (UINT_PTR)(pINT->u1.AddressOfData));
 	    if (strcmp(pImpName->Name, funcname) == 0)
 		return (void *)pIAT->u1.Function;
 	}
diff --git a/src/version.c b/src/version.c
index 3e7d4639ee..073c294edd 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 */
+/**/
+    778,
 /**/
     777,
 /**/

From fe856f855b14b8a051dde847c6d583e79f48992f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 16:19:23 +0100
Subject: [PATCH 048/106] Added tag v7-3-778 for changeset 562bbee33aa4

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

diff --git a/.hgtags b/.hgtags
index 621ed2f52f..f8c12e9517 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2114,3 +2114,4 @@ a8f5876e498125f4916c5f7168823885c27dad8c v7-3-774
 a6e60677aea727622dde15d1306c61588b805500 v7-3-775
 80b041b994d156360992666110964e74f7473d3e v7-3-776
 9a1a4c486e6bb367c639c29c6120d5fb1fadcc38 v7-3-777
+562bbee33aa4f9896cb23ed6de8fbf60cac323e0 v7-3-778

From 41c76ce8eec219c12b0f7927903c068ee7600ccf Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 16:43:11 +0100
Subject: [PATCH 049/106] updated for version 7.3.779 Problem:    Backwards
 search lands in wrong place when started on a multibyte 	    character.
 Solution:   Do not set extra_col for a backwards search. (Sung Pae)

---
 src/search.c          | 3 ++-
 src/testdir/test44.in | 4 ++++
 src/testdir/test44.ok | 1 +
 src/version.c         | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/search.c b/src/search.c
index 0b1c519fb2..24b0c4a82e 100644
--- a/src/search.c
+++ b/src/search.c
@@ -572,7 +572,8 @@ searchit(win, buf, pos, dir, pat, count, options, pat_use, stop_lnum, tm)
 	extra_col = 0;
 #ifdef FEAT_MBYTE
     /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */
-    else if (has_mbyte && pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count
+    else if (dir != BACKWARD && has_mbyte
+		    && pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count
 						     && pos->col < MAXCOL - 2)
     {
 	ptr = ml_get_buf(buf, pos->lnum, FALSE) + pos->col;
diff --git a/src/testdir/test44.in b/src/testdir/test44.in
index b8b8d4fb21..e4868697d6 100644
--- a/src/testdir/test44.in
+++ b/src/testdir/test44.in
@@ -29,6 +29,9 @@ x/[\U1234abcd\u1234\uabcd]
 x/\%d21879b
 x/ [[=A=]]* [[=B=]]* [[=C=]]* [[=D=]]* [[=E=]]* [[=F=]]* [[=G=]]* [[=H=]]* [[=I=]]* [[=J=]]* [[=K=]]* [[=L=]]* [[=M=]]* [[=N=]]* [[=O=]]* [[=P=]]* [[=Q=]]* [[=R=]]* [[=S=]]* [[=T=]]* [[=U=]]* [[=V=]]* [[=W=]]* [[=X=]]* [[=Y=]]* [[=Z=]]*/e
 x/ [[=a=]]* [[=b=]]* [[=c=]]* [[=d=]]* [[=e=]]* [[=f=]]* [[=g=]]* [[=h=]]* [[=i=]]* [[=j=]]* [[=k=]]* [[=l=]]* [[=m=]]* [[=n=]]* [[=o=]]* [[=p=]]* [[=q=]]* [[=r=]]* [[=s=]]* [[=t=]]* [[=u=]]* [[=v=]]* [[=w=]]* [[=x=]]* [[=y=]]* [[=z=]]*/e
+x:" Test backwards search from a multi-byte char
+/x
+x?.
 x:?^1?,$w! test.out
 :e! test.out
 G:put =matchstr(\"אבגד\", \".\", 0, 2) " ב
@@ -57,3 +60,4 @@ f 
 g a啷bb
 h AÀÁÂÃÄÅĀĂĄǍǞǠẢ BḂḆ CÇĆĈĊČ DĎĐḊḎḐ EÈÉÊËĒĔĖĘĚẺẼ FḞ GĜĞĠĢǤǦǴḠ HĤĦḢḦḨ IÌÍÎÏĨĪĬĮİǏỈ JĴ KĶǨḰḴ LĹĻĽĿŁḺ MḾṀ NÑŃŅŇṄṈ OÒÓÔÕÖØŌŎŐƠǑǪǬỎ PṔṖ Q RŔŖŘṘṞ SŚŜŞŠṠ TŢŤŦṪṮ UÙÚÛÜŨŪŬŮŰŲƯǓỦ VṼ WŴẀẂẄẆ XẊẌ YÝŶŸẎỲỶỸ ZŹŻŽƵẐẔ
 i aàáâãäåāăąǎǟǡả bḃḇ cçćĉċč dďđḋḏḑ eèéêëēĕėęěẻẽ fḟ gĝğġģǥǧǵḡ hĥħḣḧḩẖ iìíîïĩīĭįǐỉ jĵǰ kķǩḱḵ lĺļľŀłḻ mḿṁ nñńņňʼnṅṉ oòóôõöøōŏőơǒǫǭỏ pṕṗ q rŕŗřṙṟ sśŝşšṡ tţťŧṫṯẗ uùúûüũūŭůűųưǔủ vṽ wŵẁẃẅẇẘ xẋẍ yýÿŷẏẙỳỷỹ zźżžƶẑẕ
+j 0123❤x
diff --git a/src/testdir/test44.ok b/src/testdir/test44.ok
index 2bd5bdad8b..d98ac2ef5d 100644
--- a/src/testdir/test44.ok
+++ b/src/testdir/test44.ok
@@ -16,6 +16,7 @@ f z
 g abb
 h AÀÁÂÃÄÅĀĂĄǍǞǠẢ BḂḆ CÇĆĈĊČ DĎĐḊḎḐ EÈÉÊËĒĔĖĘĚẺẼ FḞ GĜĞĠĢǤǦǴḠ HĤĦḢḦḨ IÌÍÎÏĨĪĬĮİǏỈ JĴ KĶǨḰḴ LĹĻĽĿŁḺ MḾṀ NÑŃŅŇṄṈ OÒÓÔÕÖØŌŎŐƠǑǪǬỎ PṔṖ Q RŔŖŘṘṞ SŚŜŞŠṠ TŢŤŦṪṮ UÙÚÛÜŨŪŬŮŰŲƯǓỦ VṼ WŴẀẂẄẆ XẊẌ YÝŶŸẎỲỶỸ ZŹŻŽƵẐ
 i aàáâãäåāăąǎǟǡả bḃḇ cçćĉċč dďđḋḏḑ eèéêëēĕėęěẻẽ fḟ gĝğġģǥǧǵḡ hĥħḣḧḩẖ iìíîïĩīĭįǐỉ jĵǰ kķǩḱḵ lĺļľŀłḻ mḿṁ nñńņňʼnṅṉ oòóôõöøōŏőơǒǫǭỏ pṕṗ q rŕŗřṙṟ sśŝşšṡ tţťŧṫṯẗ uùúûüũūŭůűųưǔủ vṽ wŵẁẃẅẇẘ xẋẍ yýÿŷẏẙỳỷỹ zźżžƶẑ
+j 012❤
 ב
 בג
 א
diff --git a/src/version.c b/src/version.c
index 073c294edd..a8cfdc567e 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 */
+/**/
+    779,
 /**/
     778,
 /**/

From e279ab259c942488a3f71897f35b03f12bb5f678 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 16:43:12 +0100
Subject: [PATCH 050/106] Added tag v7-3-779 for changeset 2067ed78d37c

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

diff --git a/.hgtags b/.hgtags
index f8c12e9517..d5def8b056 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2115,3 +2115,4 @@ a6e60677aea727622dde15d1306c61588b805500 v7-3-775
 80b041b994d156360992666110964e74f7473d3e v7-3-776
 9a1a4c486e6bb367c639c29c6120d5fb1fadcc38 v7-3-777
 562bbee33aa4f9896cb23ed6de8fbf60cac323e0 v7-3-778
+2067ed78d37c331685ef8f293d6a23c372ca4b78 v7-3-779

From 7550cba718559b0d9d261782d9e2e25791a5c894 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 17:17:10 +0100
Subject: [PATCH 051/106] updated for version 7.3.780 Problem:    char2nr() and
 nr2char() always use 'encoding'. Solution:   Add argument to use utf-8
 characters. (Yasuhiro Matsumoto)

---
 runtime/doc/eval.txt | 20 ++++++++++++--------
 src/eval.c           | 27 +++++++++++++++++++++++----
 src/version.c        |  2 ++
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 6057d61a38..7594ea9805 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1716,7 +1716,7 @@ call( {func}, {arglist} [, {dict}])
 				any	call {func} with arguments {arglist}
 ceil( {expr})			Float	round {expr} up
 changenr()			Number	current change number
-char2nr( {expr})		Number	ASCII value of first char in {expr}
+char2nr( {expr}[, {utf8}])	Number	ASCII/UTF8 value of first char in {expr}
 cindent( {lnum})		Number	C indent for line {lnum}
 clearmatches()			none	clear all matches
 col( {expr})			Number	column nr of cursor or mark
@@ -1873,7 +1873,7 @@ mkdir( {name} [, {path} [, {prot}]])
 mode( [expr])			String	current editing mode
 mzeval( {expr})			any	evaluate |MzScheme| expression
 nextnonblank( {lnum})		Number	line nr of non-blank line >= {lnum}
-nr2char( {expr})		String	single char with ASCII value {expr}
+nr2char( {expr}[, {utf8}])	String	single char with ASCII/UTF8 value {expr}
 or( {expr}, {expr})		Number  bitwise OR
 pathshorten( {expr})		String	shorten directory names in a path
 pow( {x}, {y})			Float	{x} to the power of {y}
@@ -2294,14 +2294,16 @@ changenr()						*changenr()*
 		redo it is the number of the redone change.  After undo it is
 		one less than the number of the undone change.
 
-char2nr({expr})						*char2nr()*
+char2nr({expr}[, {utf8}])					*char2nr()*
 		Return number value of the first char in {expr}.  Examples: >
 			char2nr(" ")		returns 32
 			char2nr("ABC")		returns 65
-<		The current 'encoding' is used.  Example for "utf-8": >
+<		When {utf8} is omitted or zero, the current 'encoding' is used.
+		Example for "utf-8": >
 			char2nr("�")		returns 225
 			char2nr("�"[0])		returns 195
-<		A combining character is a separate character.
+<		With {utf8} set to 1, always treat as utf-8 characters.
+		A combining character is a separate character.
 		|nr2char()| does the opposite.
 
 cindent({lnum})						*cindent()*
@@ -4371,14 +4373,16 @@ nextnonblank({lnum})					*nextnonblank()*
 		below it, zero is returned.
 		See also |prevnonblank()|.
 
-nr2char({expr})						*nr2char()*
+nr2char({expr}[, {utf8}])				*nr2char()*
 		Return a string with a single character, which has the number
 		value {expr}.  Examples: >
 			nr2char(64)		returns "@"
 			nr2char(32)		returns " "
-<		The current 'encoding' is used.  Example for "utf-8": >
+<		When {utf8} is omitted or zero, the current 'encoding' is used.
+		Example for "utf-8": >
 			nr2char(300)		returns I with bow character
-<		Note that a NUL character in the file is specified with
+<		With {utf8} set to 1, always return utf-8 characters.
+		Note that a NUL character in the file is specified with
 		nr2char(10), because NULs are represented with newline
 		characters.  nr2char(0) is a real NUL and terminates the
 		string, thus results in an empty string.
diff --git a/src/eval.c b/src/eval.c
index f645e9683e..46a1963de9 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -7854,7 +7854,7 @@ static struct fst
     {"ceil",		1, 1, f_ceil},
 #endif
     {"changenr",	0, 0, f_changenr},
-    {"char2nr",		1, 1, f_char2nr},
+    {"char2nr",		1, 2, f_char2nr},
     {"cindent",		1, 1, f_cindent},
     {"clearmatches",	0, 0, f_clearmatches},
     {"col",		1, 1, f_col},
@@ -8003,7 +8003,7 @@ static struct fst
     {"mzeval",		1, 1, f_mzeval},
 #endif
     {"nextnonblank",	1, 1, f_nextnonblank},
-    {"nr2char",		1, 1, f_nr2char},
+    {"nr2char",		1, 2, f_nr2char},
     {"or",		2, 2, f_or},
     {"pathshorten",	1, 1, f_pathshorten},
 #ifdef FEAT_FLOAT
@@ -9303,7 +9303,17 @@ f_char2nr(argvars, rettv)
 {
 #ifdef FEAT_MBYTE
     if (has_mbyte)
-	rettv->vval.v_number = (*mb_ptr2char)(get_tv_string(&argvars[0]));
+    {
+	int	utf8 = 0;
+
+	if (argvars[1].v_type != VAR_UNKNOWN)
+	    utf8 = get_tv_number_chk(&argvars[1], NULL);
+
+	if (utf8)
+	    rettv->vval.v_number = (*utf_ptr2char)(get_tv_string(&argvars[0]));
+	else
+	    rettv->vval.v_number = (*mb_ptr2char)(get_tv_string(&argvars[0]));
+    }
     else
 #endif
     rettv->vval.v_number = get_tv_string(&argvars[0])[0];
@@ -14360,7 +14370,16 @@ f_nr2char(argvars, rettv)
 
 #ifdef FEAT_MBYTE
     if (has_mbyte)
-	buf[(*mb_char2bytes)((int)get_tv_number(&argvars[0]), buf)] = NUL;
+    {
+	int	utf8 = 0;
+
+	if (argvars[1].v_type != VAR_UNKNOWN)
+	    utf8 = get_tv_number_chk(&argvars[1], NULL);
+	if (utf8)
+	    buf[(*utf_char2bytes)((int)get_tv_number(&argvars[0]), buf)] = NUL;
+	else
+	    buf[(*mb_char2bytes)((int)get_tv_number(&argvars[0]), buf)] = NUL;
+    }
     else
 #endif
     {
diff --git a/src/version.c b/src/version.c
index a8cfdc567e..72b552ae56 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 */
+/**/
+    780,
 /**/
     779,
 /**/

From 28740349ace6672a36f300bafeba875c4afc2127 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 17:17:11 +0100
Subject: [PATCH 052/106] Added tag v7-3-780 for changeset 42edc5dac33c

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

diff --git a/.hgtags b/.hgtags
index d5def8b056..21d3cb8666 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2116,3 +2116,4 @@ a6e60677aea727622dde15d1306c61588b805500 v7-3-775
 9a1a4c486e6bb367c639c29c6120d5fb1fadcc38 v7-3-777
 562bbee33aa4f9896cb23ed6de8fbf60cac323e0 v7-3-778
 2067ed78d37c331685ef8f293d6a23c372ca4b78 v7-3-779
+42edc5dac33c92876d93f00f8ab8c1f6bb25d3fc v7-3-780

From e0261d18dea01feed30ecad74c84951d4c278ea2 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 17:43:57 +0100
Subject: [PATCH 053/106] updated for version 7.3.781 Problem:    Drawing with
 'guifontwide' can be slow. Solution:   Draw multiple characters at a time.
 (Taro Muraoka)

---
 src/gui.c     | 34 +++++++++++++++++++++-------------
 src/version.c |  2 ++
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/gui.c b/src/gui.c
index 55e841f32c..14706553a0 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -2380,7 +2380,9 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back)
 	int	cl;		/* byte length of current char */
 	int	comping;	/* current char is composing */
 	int	scol = col;	/* screen column */
-	int	dowide;		/* use 'guifontwide' */
+	int	curr_wide;	/* use 'guifontwide' */
+	int	prev_wide = FALSE;
+	int	wide_changed;
 
 	/* Break the string at a composing character, it has to be drawn on
 	 * top of the previous character. */
@@ -2395,9 +2397,9 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back)
 		    && fontset == NOFONTSET
 #  endif
 		    && gui.wide_font != NOFONT)
-		dowide = TRUE;
+		curr_wide = TRUE;
 	    else
-		dowide = FALSE;
+		curr_wide = FALSE;
 	    comping = utf_iscomposing(c);
 	    if (!comping)	/* count cells from non-composing chars */
 		cells += cn;
@@ -2405,9 +2407,11 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back)
 	    if (cl == 0)	/* hit end of string */
 		len = i + cl;	/* len must be wrong "cannot happen" */
 
-	    /* print the string so far if it's the last character or there is
+	    wide_changed = curr_wide != prev_wide;
+
+	    /* Print the string so far if it's the last character or there is
 	     * a composing character. */
-	    if (i + cl >= len || (comping && i > start) || dowide
+	    if (i + cl >= len || (comping && i > start) || wide_changed
 #  if defined(FEAT_GUI_X11)
 		    || (cn > 1
 #   ifdef FEAT_XFONTSET
@@ -2419,25 +2423,28 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back)
 #  endif
 	       )
 	    {
-		if (comping || dowide)
+		if (comping || wide_changed)
 		    thislen = i - start;
 		else
 		    thislen = i - start + cl;
 		if (thislen > 0)
 		{
+		    if (prev_wide)
+			gui_mch_set_font(gui.wide_font);
 		    gui_mch_draw_string(gui.row, scol, s + start, thislen,
 								  draw_flags);
+		    if (prev_wide)
+			gui_mch_set_font(font);
 		    start += thislen;
 		}
 		scol += cells;
 		cells = 0;
-		if (dowide)
+		/* Adjust to not draw a character which width is changed
+		 * against with last one. */
+		if (wide_changed && !comping)
 		{
-		    gui_mch_set_font(gui.wide_font);
-		    gui_mch_draw_string(gui.row, scol - cn,
-						   s + start, cl, draw_flags);
-		    gui_mch_set_font(font);
-		    start += cl;
+		    scol -= cn;
+		    cl = 0;
 		}
 
 #  if defined(FEAT_GUI_X11)
@@ -2447,7 +2454,7 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back)
 #   ifdef FEAT_XFONTSET
 			&& fontset == NOFONTSET
 #   endif
-			&& !dowide)
+			&& !wide_changed)
 		    gui_mch_draw_string(gui.row, scol - 1, (char_u *)" ",
 							       1, draw_flags);
 #  endif
@@ -2465,6 +2472,7 @@ gui_outstr_nowrap(s, len, flags, fg, bg, back)
 #  endif
 		start = i + cl;
 	    }
+	    prev_wide = curr_wide;
 	}
 	/* The stuff below assumes "len" is the length in screen columns. */
 	len = scol - col;
diff --git a/src/version.c b/src/version.c
index 72b552ae56..a3351c3d0d 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 */
+/**/
+    781,
 /**/
     780,
 /**/

From 87feee50da25fd23301ba9343734e99a4de33712 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 17:43:57 +0100
Subject: [PATCH 054/106] Added tag v7-3-781 for changeset 29f29e86602e

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

diff --git a/.hgtags b/.hgtags
index 21d3cb8666..47d7cff969 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2117,3 +2117,4 @@ a6e60677aea727622dde15d1306c61588b805500 v7-3-775
 562bbee33aa4f9896cb23ed6de8fbf60cac323e0 v7-3-778
 2067ed78d37c331685ef8f293d6a23c372ca4b78 v7-3-779
 42edc5dac33c92876d93f00f8ab8c1f6bb25d3fc v7-3-780
+29f29e86602e4a7f83d4572d2fe75b9b0de2752f v7-3-781

From 39d7e0945cf35aecd5dd3058430d28e45bc87227 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 18:37:40 +0100
Subject: [PATCH 055/106] updated for version 7.3.782 Problem:    Windows: IME
 composition may use a wrong font. Solution:   Use 'guifontwide' for IME when
 it is set. (Taro Muraoka)

---
 runtime/doc/options.txt |  4 ++++
 src/gui.c               |  3 +++
 src/gui_w48.c           | 41 ++++++++++++++++++++++++++++++++++++++++-
 src/proto/gui_w16.pro   |  1 +
 src/proto/gui_w32.pro   |  1 +
 src/version.c           |  2 ++
 6 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index a439234987..c3cc0871c4 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3560,6 +3560,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	to set 'guifontwide' at all unless you want to override the choice
 	made by Pango/Xft.
 
+	Windows +multibyte only:		*guifontwide_win_mbyte*
+
+	If set and vaild, 'guifontwide' is used for IME instead of 'guifont'.
+
 						*'guiheadroom'* *'ghr'*
 'guiheadroom' 'ghr'	number	(default 50)
 			global
diff --git a/src/gui.c b/src/gui.c
index 14706553a0..6e5d58b5c6 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -1002,6 +1002,9 @@ gui_get_wide_font()
     else
 #endif
 	gui.wide_font = font;
+#ifdef FEAT_GUI_MSWIN
+    gui_mch_wide_font_changed();
+#endif
     return OK;
 }
 #endif
diff --git a/src/gui_w48.c b/src/gui_w48.c
index 1d380fbf93..0a7f367e87 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -323,10 +323,15 @@ static void TrackUserActivity __ARGS((UINT uMsg));
 
 /*
  * For control IME.
+ *
+ * These LOGFONT used for IME.
  */
 #ifdef FEAT_MBYTE
 # ifdef USE_IM_CONTROL
+/* holds LOGFONT for 'guifontwide' if available, otherwise 'guifont' */
 static LOGFONT norm_logfont;
+/* holds LOGFONT for 'guifont' always. */
+static LOGFONT sub_logfont;
 # endif
 #endif
 
@@ -3090,6 +3095,39 @@ logfont2name(LOGFONT lf)
     return res;
 }
 
+
+#ifdef FEAT_MBYTE_IME
+/*
+ * Set correct LOGFONT to IME.  Use 'guifontwide' if available, otherwise use
+ * 'guifont'
+ */
+    static void
+update_im_font()
+{
+    LOGFONT	lf_wide;
+
+    if (p_guifontwide != NULL && *p_guifontwide != NUL
+	    && get_logfont(&lf_wide, p_guifontwide, NULL, TRUE) == OK)
+	norm_logfont = lf_wide;
+    else
+	norm_logfont = sub_logfont;
+    im_set_font(&norm_logfont);
+}
+#endif
+
+#ifdef FEAT_MBYTE
+/*
+ * Handler of gui.wide_font (p_guifontwide) changed notification.
+ */
+    void
+gui_mch_wide_font_changed()
+{
+# ifdef FEAT_MBYTE_IME
+    update_im_font();
+# endif
+}
+#endif
+
 /*
  * Initialise vim to use the font with the given name.
  * Return FAIL if the font could not be loaded, OK otherwise.
@@ -3112,9 +3150,10 @@ gui_mch_init_font(char_u *font_name, int fontset)
 	font_name = lf.lfFaceName;
 #if defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)
     norm_logfont = lf;
+    sub_logfont = lf;
 #endif
 #ifdef FEAT_MBYTE_IME
-    im_set_font(&lf);
+    update_im_font();
 #endif
     gui_mch_free_font(gui.norm_font);
     gui.norm_font = font;
diff --git a/src/proto/gui_w16.pro b/src/proto/gui_w16.pro
index c8cb06590d..4c53fad305 100644
--- a/src/proto/gui_w16.pro
+++ b/src/proto/gui_w16.pro
@@ -50,6 +50,7 @@ void gui_mch_delete_lines __ARGS((int row, int num_lines));
 void gui_mch_insert_lines __ARGS((int row, int num_lines));
 void gui_mch_exit __ARGS((int rc));
 int gui_mch_init_font __ARGS((char_u *font_name, int fontset));
+void gui_mch_wide_font_changed __ARGS((void));
 int gui_mch_maximized __ARGS((void));
 void gui_mch_newfont __ARGS((void));
 void gui_mch_settitle __ARGS((char_u *title, char_u *icon));
diff --git a/src/proto/gui_w32.pro b/src/proto/gui_w32.pro
index 49690b03e4..405dd2859a 100644
--- a/src/proto/gui_w32.pro
+++ b/src/proto/gui_w32.pro
@@ -50,6 +50,7 @@ void gui_mch_delete_lines __ARGS((int row, int num_lines));
 void gui_mch_insert_lines __ARGS((int row, int num_lines));
 void gui_mch_exit __ARGS((int rc));
 int gui_mch_init_font __ARGS((char_u *font_name, int fontset));
+void gui_mch_wide_font_changed __ARGS((void));
 int gui_mch_maximized __ARGS((void));
 void gui_mch_newfont __ARGS((void));
 void gui_mch_settitle __ARGS((char_u *title, char_u *icon));
diff --git a/src/version.c b/src/version.c
index a3351c3d0d..b60be3cd38 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 */
+/**/
+    782,
 /**/
     781,
 /**/

From 3b11379956f3e65029812f74c75a81d6cdf82b85 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 23 Jan 2013 18:37:40 +0100
Subject: [PATCH 056/106] Added tag v7-3-782 for changeset 0de969850c06

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

diff --git a/.hgtags b/.hgtags
index 47d7cff969..eb901734aa 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2118,3 +2118,4 @@ a6e60677aea727622dde15d1306c61588b805500 v7-3-775
 2067ed78d37c331685ef8f293d6a23c372ca4b78 v7-3-779
 42edc5dac33c92876d93f00f8ab8c1f6bb25d3fc v7-3-780
 29f29e86602e4a7f83d4572d2fe75b9b0de2752f v7-3-781
+0de969850c0687d2018e025f31e5cef9e9ce1444 v7-3-782

From 1ca5a52633b951b0adc94ee8ad9564d91b039f04 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 24 Jan 2013 21:00:20 +0100
Subject: [PATCH 057/106] updated for version 7.3.783 Problem:    Crash when
 mark is not set. (Dominique Pelle) Solution:   Check for NULL.

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

diff --git a/src/normal.c b/src/normal.c
index 3d5b6d8171..b7f3dd4f5a 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -7552,6 +7552,7 @@ nv_gomark(cap)
 #endif
 #ifdef FEAT_FOLDING
     if (cap->oap->op_type == OP_NOP
+	    && pos != NULL
 	    && (pos == (pos_T *)-1 || !equalpos(old_cursor, *pos))
 	    && (fdo_flags & FDO_MARK)
 	    && old_KeyTyped)
diff --git a/src/version.c b/src/version.c
index b60be3cd38..cd838d41bf 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 */
+/**/
+    783,
 /**/
     782,
 /**/

From 48cf1e16043923abcadeca3b9ada4221486e0a50 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 24 Jan 2013 21:00:20 +0100
Subject: [PATCH 058/106] Added tag v7-3-783 for changeset a80af62d5e3b

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

diff --git a/.hgtags b/.hgtags
index eb901734aa..deda1e838d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2119,3 +2119,4 @@ a6e60677aea727622dde15d1306c61588b805500 v7-3-775
 42edc5dac33c92876d93f00f8ab8c1f6bb25d3fc v7-3-780
 29f29e86602e4a7f83d4572d2fe75b9b0de2752f v7-3-781
 0de969850c0687d2018e025f31e5cef9e9ce1444 v7-3-782
+a80af62d5e3b3614ff9e058f42647c99bffe7481 v7-3-783

From 065f43769e9f8852bdc5e972c8eead451e72a106 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 25 Jan 2013 19:28:38 +0100
Subject: [PATCH 059/106] updated for version 7.3.784 Problem:    Error when
 'guifontwide' has a comma. Solution:   Use gui.wide_font. (Taro Muraoka)

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

diff --git a/src/gui_w48.c b/src/gui_w48.c
index 0a7f367e87..2a5f696512 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -3107,7 +3107,8 @@ update_im_font()
     LOGFONT	lf_wide;
 
     if (p_guifontwide != NULL && *p_guifontwide != NUL
-	    && get_logfont(&lf_wide, p_guifontwide, NULL, TRUE) == OK)
+	    && gui.wide_font != NOFONT
+	    && GetObject((HFONT)gui.wide_font, sizeof(lf_wide), &lf_wide))
 	norm_logfont = lf_wide;
     else
 	norm_logfont = sub_logfont;
diff --git a/src/version.c b/src/version.c
index cd838d41bf..9a94c54da6 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 */
+/**/
+    784,
 /**/
     783,
 /**/

From 919cc50779cec5fc847509c0aeaa32fe681f7139 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 25 Jan 2013 19:28:39 +0100
Subject: [PATCH 060/106] Added tag v7-3-784 for changeset fbadf0f69877

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

diff --git a/.hgtags b/.hgtags
index deda1e838d..13d6813142 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2120,3 +2120,4 @@ a6e60677aea727622dde15d1306c61588b805500 v7-3-775
 29f29e86602e4a7f83d4572d2fe75b9b0de2752f v7-3-781
 0de969850c0687d2018e025f31e5cef9e9ce1444 v7-3-782
 a80af62d5e3b3614ff9e058f42647c99bffe7481 v7-3-783
+fbadf0f6987790d98c3b3fd935fea0494743830a v7-3-784

From bfccf8b7c1e0aa01ad0dcd8dab17adbdeba24e07 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 25 Jan 2013 20:11:01 +0100
Subject: [PATCH 061/106] updated for version 7.3.785 Problem:    Crash with
 specific use of search pattern. Solution:   Initialize reg_buf to curbuf.

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

diff --git a/src/regexp.c b/src/regexp.c
index bb63c942f0..e62aae557f 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -3413,7 +3413,7 @@ static unsigned	reg_tofreelen;
  * reg_startpos		<invalid>		reg_mmatch->startpos
  * reg_endpos		<invalid>		reg_mmatch->endpos
  * reg_win		NULL			window in which to search
- * reg_buf		<invalid>		buffer in which to search
+ * reg_buf		curbuf			buffer in which to search
  * reg_firstlnum	<invalid>		first line in which to search
  * reg_maxline		0			last line nr
  * reg_line_lbr		FALSE or TRUE		FALSE
@@ -3571,6 +3571,7 @@ vim_regexec(rmp, line, col)
     reg_mmatch = NULL;
     reg_maxline = 0;
     reg_line_lbr = FALSE;
+    reg_buf = curbuf;
     reg_win = NULL;
     ireg_ic = rmp->rm_ic;
 #ifdef FEAT_MBYTE
@@ -3595,6 +3596,7 @@ vim_regexec_nl(rmp, line, col)
     reg_mmatch = NULL;
     reg_maxline = 0;
     reg_line_lbr = TRUE;
+    reg_buf = curbuf;
     reg_win = NULL;
     ireg_ic = rmp->rm_ic;
 #ifdef FEAT_MBYTE
@@ -4311,8 +4313,8 @@ regmatch(scan)
 #endif
 	    else
 	    {
-		if (!vim_iswordc_buf(c, reg_buf)
-			|| (reginput > regline && vim_iswordc_buf(reginput[-1], reg_buf)))
+		if (!vim_iswordc_buf(c, reg_buf) || (reginput > regline
+				   && vim_iswordc_buf(reginput[-1], reg_buf)))
 		    status = RA_NOMATCH;
 	    }
 	    break;
@@ -7135,6 +7137,7 @@ vim_regsub(rmp, source, dest, copy, magic, backslash)
     reg_match = rmp;
     reg_mmatch = NULL;
     reg_maxline = 0;
+    reg_buf = curbuf;
     return vim_regsub_both(source, dest, copy, magic, backslash);
 }
 #endif
diff --git a/src/version.c b/src/version.c
index 9a94c54da6..0f77ad2557 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 */
+/**/
+    785,
 /**/
     784,
 /**/

From 2fe2b1611bf97ce805976b48b5e872573e7a6bae Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Fri, 25 Jan 2013 20:11:01 +0100
Subject: [PATCH 062/106] Added tag v7-3-785 for changeset be4baed0c933

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

diff --git a/.hgtags b/.hgtags
index 13d6813142..c78070a18b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2121,3 +2121,4 @@ a6e60677aea727622dde15d1306c61588b805500 v7-3-775
 0de969850c0687d2018e025f31e5cef9e9ce1444 v7-3-782
 a80af62d5e3b3614ff9e058f42647c99bffe7481 v7-3-783
 fbadf0f6987790d98c3b3fd935fea0494743830a v7-3-784
+be4baed0c933e1f1543ea175e2e36551ff6caa18 v7-3-785

From 3b7e2e5958952563ef9588690799a27fe79d7af7 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 11:44:39 +0100
Subject: [PATCH 063/106] updated for version 7.3.786 Problem:    Python
 threads don't run in the background (issue 103). Solution:   Move the
 statements to manipulate thread state.

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

diff --git a/src/if_python.c b/src/if_python.c
index 5e792b16d1..1bf737fc4c 100644
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -740,12 +740,11 @@ Python_Init(void)
 #else
 	PyMac_Initialize();
 #endif
-	/* 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. */
+	/* Initialise threads, and below 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
 	get_exceptions();
 #endif
@@ -756,6 +755,10 @@ Python_Init(void)
 	if (PythonMod_Init())
 	    goto fail;
 
+	/* The first python thread is vim's, release the lock. */
+	Python_SaveThread();
+	pygilstate = PyGILState_Ensure();
+
 	globals = PyModule_GetDict(PyImport_AddModule("__main__"));
 
 	/* Remove the element from sys.path that was added because of our
@@ -764,8 +767,7 @@ Python_Init(void)
 	 * the current directory in sys.path. */
 	PyRun_SimpleString("import sys; sys.path = filter(lambda x: x != '/must>not&exist', sys.path)");
 
-	/* the first python thread is vim's, release the lock */
-	Python_SaveThread();
+	PyGILState_Release(pygilstate);
 
 	initialised = 1;
     }
diff --git a/src/version.c b/src/version.c
index 0f77ad2557..8115020bf3 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 */
+/**/
+    786,
 /**/
     785,
 /**/

From 1704fa8a735122798051913f25ec262eb2899963 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 11:44:39 +0100
Subject: [PATCH 064/106] Added tag v7-3-786 for changeset 8b3e88bab702

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

diff --git a/.hgtags b/.hgtags
index c78070a18b..8b3c759524 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2122,3 +2122,4 @@ a6e60677aea727622dde15d1306c61588b805500 v7-3-775
 a80af62d5e3b3614ff9e058f42647c99bffe7481 v7-3-783
 fbadf0f6987790d98c3b3fd935fea0494743830a v7-3-784
 be4baed0c933e1f1543ea175e2e36551ff6caa18 v7-3-785
+8b3e88bab70215a18768fca5a90c6f07ac1aa5eb v7-3-786

From 40b7fd4ec02aa8a6e5c904d3a83fa67fd8e67a36 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 12:31:36 +0100
Subject: [PATCH 065/106] updated for version 7.3.787 Problem:    With
 'relativenumber' set it is not possible to see the absolute 	    line
 number. Solution:   For the cursor line show the absolute line number instead
 of a 	    zero. (Nazri Ramliy)

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

diff --git a/src/screen.c b/src/screen.c
index 7e11fa4d8c..6d2345cbe5 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -2319,6 +2319,7 @@ fold_line(wp, fold_count, foldinfo, lnum, row)
 	{
 	    int	    w = number_width(wp);
 	    long num;
+	    char *fmt = "%*ld ";
 
 	    if (len > w + 1)
 		len = w + 1;
@@ -2327,10 +2328,17 @@ fold_line(wp, fold_count, foldinfo, lnum, row)
 		/* 'number' */
 		num = (long)lnum;
 	    else
+	    {
 		/* 'relativenumber', don't use negative numbers */
 		num = labs((long)get_cursor_rel_lnum(wp, lnum));
+		if (num == 0)
+		{
+		    num = lnum;
+		    fmt = "%-*ld ";
+		}
+	    }
 
-	    sprintf((char *)buf, "%*ld ", w, num);
+	    sprintf((char *)buf, fmt, w, num);
 #ifdef FEAT_RIGHTLEFT
 	    if (wp->w_p_rl)
 		/* the line number isn't reversed */
@@ -3484,15 +3492,23 @@ win_line(wp, lnum, startrow, endrow, nochange)
 			    )
 		    {
 			long num;
+			char *fmt = "%*ld ";
 
 			if (wp->w_p_nu)
 			    /* 'number' */
 			    num = (long)lnum;
 			else
+			{
 			    /* 'relativenumber', don't use negative numbers */
 			    num = labs((long)get_cursor_rel_lnum(wp, lnum));
+			    if (num == 0)
+			    {
+				num = lnum;
+				fmt = "%-*ld ";
+			    }
+			}
 
-			sprintf((char *)extra, "%*ld ",
+			sprintf((char *)extra, fmt,
 						number_width(wp), num);
 			if (wp->w_skipcol > 0)
 			    for (p_extra = extra; *p_extra == ' '; ++p_extra)
@@ -3513,7 +3529,8 @@ win_line(wp, lnum, startrow, endrow, nochange)
 		     * the current line differently.
 		     * TODO: Can we use CursorLine instead of CursorLineNr
 		     * when CursorLineNr isn't set? */
-		    if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
+		    if ((wp->w_p_cul || wp->w_p_rnu)
+						 && lnum == wp->w_cursor.lnum)
 			char_attr = hl_attr(HLF_CLN);
 #endif
 		}
@@ -10238,12 +10255,7 @@ number_width(wp)
     int		n;
     linenr_T	lnum;
 
-    if (wp->w_p_nu)
-	/* 'number' */
-	lnum = wp->w_buffer->b_ml.ml_line_count;
-    else
-	/* 'relativenumber' */
-	lnum = wp->w_height;
+    lnum = wp->w_buffer->b_ml.ml_line_count;
 
     if (lnum == wp->w_nrwidth_line_count)
 	return wp->w_nrwidth_width;
diff --git a/src/version.c b/src/version.c
index 8115020bf3..ed6b493e87 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 */
+/**/
+    787,
 /**/
     786,
 /**/

From 3fe927aefd0219713210b79609557f187083a54e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 12:31:36 +0100
Subject: [PATCH 066/106] Added tag v7-3-787 for changeset e1b98967a985

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

diff --git a/.hgtags b/.hgtags
index 8b3c759524..57045b0f52 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2123,3 +2123,4 @@ a80af62d5e3b3614ff9e058f42647c99bffe7481 v7-3-783
 fbadf0f6987790d98c3b3fd935fea0494743830a v7-3-784
 be4baed0c933e1f1543ea175e2e36551ff6caa18 v7-3-785
 8b3e88bab70215a18768fca5a90c6f07ac1aa5eb v7-3-786
+e1b98967a985f4d1ad889c8e69b822d9126411ab v7-3-787

From b9a86337d4691647a962a098a882810534eb4a52 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 12:50:56 +0100
Subject: [PATCH 067/106] updated for version 7.3.788 Problem:    When only
 using patches build fails on missing nl.po. Solution:   Create an empty nl.po
 file.

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

diff --git a/src/po/Makefile b/src/po/Makefile
index 2814b3fe8a..09c8861b67 100644
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -176,6 +176,10 @@ uninstall:
 
 converted: $(MOCONVERTED)
 
+# nl.po was added later, if it does not exist use an empty file.
+nl.po:
+	touch nl.po
+
 # Norwegian/Bokmal: "nb" is an alias for "no".
 # Copying the file is not efficient, but I don't know of another way to make
 # this work.
diff --git a/src/version.c b/src/version.c
index ed6b493e87..8c19a1519c 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 */
+/**/
+    788,
 /**/
     787,
 /**/

From 9c7838fb89aee518111b8c39be8aeba76e18c35c Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 12:50:57 +0100
Subject: [PATCH 068/106] Added tag v7-3-788 for changeset 386fc822dd00

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

diff --git a/.hgtags b/.hgtags
index 57045b0f52..37011c9213 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2124,3 +2124,4 @@ fbadf0f6987790d98c3b3fd935fea0494743830a v7-3-784
 be4baed0c933e1f1543ea175e2e36551ff6caa18 v7-3-785
 8b3e88bab70215a18768fca5a90c6f07ac1aa5eb v7-3-786
 e1b98967a985f4d1ad889c8e69b822d9126411ab v7-3-787
+386fc822dd002958fdade4329845013cbfaa3dab v7-3-788

From d039f9ced0315b9ff784eb2f34d3482a5fc201e3 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 13:59:37 +0100
Subject: [PATCH 069/106] updated for version 7.3.789 Problem:    "\k" in
 regexp does not work in other window. Solution:   Use the right buffer.
 (Yukihiro Nakadaira)

---
 src/mbyte.c         | 10 +++++++++-
 src/proto/mbyte.pro |  1 +
 src/regexp.c        | 15 ++++++++-------
 src/version.c       |  2 ++
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/mbyte.c b/src/mbyte.c
index b896477fce..80f669135d 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -868,12 +868,20 @@ remove_bom(s)
     int
 mb_get_class(p)
     char_u	*p;
+{
+    return mb_get_class_buf(p, curbuf);
+}
+
+    int
+mb_get_class_buf(p, buf)
+    char_u	*p;
+    buf_T	*buf;
 {
     if (MB_BYTE2LEN(p[0]) == 1)
     {
 	if (p[0] == NUL || vim_iswhite(p[0]))
 	    return 0;
-	if (vim_iswordc(p[0]))
+	if (vim_iswordc_buf(p[0], buf))
 	    return 2;
 	return 1;
     }
diff --git a/src/proto/mbyte.pro b/src/proto/mbyte.pro
index 8c0788c7fa..c599dacec9 100644
--- a/src/proto/mbyte.pro
+++ b/src/proto/mbyte.pro
@@ -4,6 +4,7 @@ char_u *mb_init __ARGS((void));
 int bomb_size __ARGS((void));
 void remove_bom __ARGS((char_u *s));
 int mb_get_class __ARGS((char_u *p));
+int mb_get_class_buf __ARGS((char_u *p, buf_T *buf));
 int dbcs_class __ARGS((unsigned lead, unsigned trail));
 int latin_char2len __ARGS((int c));
 int latin_char2bytes __ARGS((int c, char_u *buf));
diff --git a/src/regexp.c b/src/regexp.c
index e62aae557f..b6506a03a6 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -4013,8 +4013,8 @@ static int reg_prev_class __ARGS((void));
 reg_prev_class()
 {
     if (reginput > regline)
-	return mb_get_class(reginput - 1
-				     - (*mb_head_off)(regline, reginput - 1));
+	return mb_get_class_buf(reginput - 1
+			    - (*mb_head_off)(regline, reginput - 1), reg_buf);
     return -1;
 }
 
@@ -4304,7 +4304,7 @@ regmatch(scan)
 		int this_class;
 
 		/* Get class of current and previous char (if it exists). */
-		this_class = mb_get_class(reginput);
+		this_class = mb_get_class_buf(reginput, reg_buf);
 		if (this_class <= 1)
 		    status = RA_NOMATCH;  /* not on a word at all */
 		else if (reg_prev_class() == this_class)
@@ -4328,7 +4328,7 @@ regmatch(scan)
 		int this_class, prev_class;
 
 		/* Get class of current and previous char (if it exists). */
-		this_class = mb_get_class(reginput);
+		this_class = mb_get_class_buf(reginput, reg_buf);
 		prev_class = reg_prev_class();
 		if (this_class == prev_class
 			|| prev_class == 0 || prev_class == 1)
@@ -4365,14 +4365,14 @@ regmatch(scan)
 	    break;
 
 	  case KWORD:
-	    if (!vim_iswordp(reginput))
+	    if (!vim_iswordp_buf(reginput, reg_buf))
 		status = RA_NOMATCH;
 	    else
 		ADVANCE_REGINPUT();
 	    break;
 
 	  case SKWORD:
-	    if (VIM_ISDIGIT(*reginput) || !vim_iswordp(reginput))
+	    if (VIM_ISDIGIT(*reginput) || !vim_iswordp_buf(reginput, reg_buf))
 		status = RA_NOMATCH;
 	    else
 		ADVANCE_REGINPUT();
@@ -5734,7 +5734,8 @@ regrepeat(p, maxcount)
       case SKWORD + ADD_NL:
 	while (count < maxcount)
 	{
-	    if (vim_iswordp(scan) && (testval || !VIM_ISDIGIT(*scan)))
+	    if (vim_iswordp_buf(scan, reg_buf)
+					  && (testval || !VIM_ISDIGIT(*scan)))
 	    {
 		mb_ptr_adv(scan);
 	    }
diff --git a/src/version.c b/src/version.c
index 8c19a1519c..ecf21ac967 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 */
+/**/
+    789,
 /**/
     788,
 /**/

From 3ed8a115fac66c00b4ca0aba8d6a11fb22c6eaac Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 13:59:37 +0100
Subject: [PATCH 070/106] Added tag v7-3-789 for changeset 43c15135926f

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

diff --git a/.hgtags b/.hgtags
index 37011c9213..d65ff4bdcc 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2125,3 +2125,4 @@ be4baed0c933e1f1543ea175e2e36551ff6caa18 v7-3-785
 8b3e88bab70215a18768fca5a90c6f07ac1aa5eb v7-3-786
 e1b98967a985f4d1ad889c8e69b822d9126411ab v7-3-787
 386fc822dd002958fdade4329845013cbfaa3dab v7-3-788
+43c15135926fb95fa82b01424677a9c37f4d0e46 v7-3-789

From 54f3afd445eec2503c4b1b8cbb9b11b0e3047882 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 14:13:56 +0100
Subject: [PATCH 071/106] updated for version 7.3.790 Problem:    After
 reloading a buffer the modelines are not processed. Solution:   call
 do_modelines(). (Ken Takata)

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

diff --git a/src/fileio.c b/src/fileio.c
index 470cce2525..c177e633c5 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -7243,6 +7243,9 @@ buf_reload(buf, orig_mode)
 	 * reset it, might have had a read error. */
 	if (orig_mode == curbuf->b_orig_mode)
 	    curbuf->b_p_ro |= old_ro;
+
+	/* Modelines must override settings done by autocommands. */
+	do_modelines(0);
     }
 
     /* restore curwin/curbuf and a few other things */
diff --git a/src/version.c b/src/version.c
index ecf21ac967..78dc34db10 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 */
+/**/
+    790,
 /**/
     789,
 /**/

From cd88883907ccde97dfb5786cc72a4ab262f306d7 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 14:13:56 +0100
Subject: [PATCH 072/106] Added tag v7-3-790 for changeset 8819ea6dcb72

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

diff --git a/.hgtags b/.hgtags
index d65ff4bdcc..7485da6940 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2126,3 +2126,4 @@ be4baed0c933e1f1543ea175e2e36551ff6caa18 v7-3-785
 e1b98967a985f4d1ad889c8e69b822d9126411ab v7-3-787
 386fc822dd002958fdade4329845013cbfaa3dab v7-3-788
 43c15135926fb95fa82b01424677a9c37f4d0e46 v7-3-789
+8819ea6dcb72dcf61fd0d20f8ea1904a7546917f v7-3-790

From 8888c8cce46bf337ff4856ad7c12fe135bb89a5e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 14:18:00 +0100
Subject: [PATCH 073/106] Update runtime files.

---
 runtime/doc/cmdline.txt        |   9 +-
 runtime/doc/eval.txt           |   7 +-
 runtime/doc/help.txt           |  12 +-
 runtime/doc/if_pyth.txt        |   6 +-
 runtime/doc/insert.txt         |   6 +-
 runtime/doc/options.txt        |  13 +-
 runtime/doc/pattern.txt        |   4 +-
 runtime/doc/syntax.txt         |  11 +-
 runtime/doc/todo.txt           |  97 ++++--
 runtime/doc/various.txt        |  18 +-
 runtime/indent/sqlanywhere.vim |  11 +-
 runtime/menu.vim               |   4 +-
 runtime/syntax/c.vim           |  10 +-
 runtime/syntax/php.vim         |   3 +-
 src/po/de.po                   |   6 +-
 src/po/uk.cp1251.po            | 608 +++++++++++++++++++--------------
 src/po/uk.po                   | 608 +++++++++++++++++++--------------
 17 files changed, 847 insertions(+), 586 deletions(-)

diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 0ed5cb3d39..c3627d4090 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 Oct 11
+*cmdline.txt*   For Vim version 7.3.  Last change: 2013 Jan 17
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -714,10 +714,15 @@ three lines: >
 Visual Mode and Range					*v_:*
 
 {Visual}:	Starts a command-line with the Visual selected lines as a
-		range.  The code ":'<,'>" is used for this range, which makes
+		range.  The code `:'<,'>` is used for this range, which makes
 		it possible to select a similar line from the command-line
 		history for repeating a command on different Visually selected
 		lines.
+		When Visual mode was already ended, a short way to use the
+		Visual area for a range is `:*`.  This requires that "*" does
+		not appear in 'cpo', see |cpo-star|.  Otherwise you will have
+		to type `:'<,'>`
+
 
 ==============================================================================
 5. Ex command-line flags				*ex-flags*
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 7594ea9805..9819d9bc90 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 Dec 05
+*eval.txt*	For Vim version 7.3.  Last change: 2013 Jan 23
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -5943,8 +5943,9 @@ taglist({expr})							*taglist()*
 		If there are no matching tags, then an empty list is returned.
 
 		To get an exact tag match, the anchors '^' and '$' should be
-		used in {expr}.  Refer to |tag-regexp| for more information
-		about the tag search regular expression pattern.
+		used in {expr}.  This also make the function work faster.
+		Refer to |tag-regexp| for more information about the tag
+		search regular expression pattern.
 
 		Refer to |'tags'| for information about how the tags file is
 		located by Vim. Refer to |tags-file-format| for the format of
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index 4860eb2fc0..bca336498a 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 7.3.  Last change: 2010 Jul 20
+*help.txt*	For Vim version 7.3.  Last change: 2012 Dec 06
 
 			VIM - main help file
 									 k
@@ -195,12 +195,12 @@ Remarks about specific systems ~
 						*standard-plugin-list*
 Standard plugins ~
 |pi_getscript.txt| Downloading latest version of Vim scripts
-|pi_gzip.txt|	   Reading and writing compressed files
-|pi_netrw.txt|	   Reading and writing files over a network
-|pi_paren.txt|	   Highlight matching parens
-|pi_tar.txt|	   Tar file explorer
+|pi_gzip.txt|      Reading and writing compressed files
+|pi_netrw.txt|     Reading and writing files over a network
+|pi_paren.txt|     Highlight matching parens
+|pi_tar.txt|       Tar file explorer
 |pi_vimball.txt|   Create a self-installing Vim script
-|pi_zip.txt|	   Zip archive explorer
+|pi_zip.txt|       Zip archive explorer
 
 LOCAL ADDITIONS:				*local-additions*
 
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index ec7d2396ea..23b6b38abf 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 Sep 23
+*if_pyth.txt*   For Vim version 7.3.  Last change: 2013 Jan 30
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -54,8 +54,8 @@ Example: >
 	EOF
 	endfunction
 <
-Note: Python is very sensitive to the indenting.  Also make sure the "class"
-line and "EOF" do not have any indent.
+Note: Python is very sensitive to the indenting.  Make sure the "class" line
+and "EOF" do not have any indent.
 
 							*:pyfile* *:pyf*
 :[range]pyf[ile] {file}
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index bf020fd427..4db43418b6 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.3.  Last change: 2012 Jul 10
+*insert.txt*    For Vim version 7.3.  Last change: 2013 Jan 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -380,7 +380,9 @@ The CTRL-O command sometimes has a side effect: If the cursor was beyond the
 end of the line, it will be put on the last character in the line.  In
 mappings it's often better to use <Esc> (first put an "x" in the text, <Esc>
 will then always put the cursor on it).  Or use CTRL-\ CTRL-O, but then
-beware of the cursor possibly being beyond the end of the line.
+beware of the cursor possibly being beyond the end of the line.  Note that the
+command following CTRL-\ CTRL-O can still move the cursor, it is not restored
+to its original position.
 
 The CTRL-O command takes you to Normal mode.  If you then use a command enter
 Insert mode again it normally doesn't nest.  Thus when typing "a<C-O>a" and
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c3cc0871c4..3beb2b0cff 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 Oct 21
+*options.txt*	For Vim version 7.3.  Last change: 2013 Jan 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -3562,7 +3562,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	Windows +multibyte only:		*guifontwide_win_mbyte*
 
-	If set and vaild, 'guifontwide' is used for IME instead of 'guifont'.
+	If set and valid, 'guifontwide' is used for IME instead of 'guifont'.
 
 						*'guiheadroom'* *'ghr'*
 'guiheadroom' 'ghr'	number	(default 50)
@@ -3824,7 +3824,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|hl-ModeMsg|	 M  Mode (e.g., "-- INSERT --")
 	|hl-LineNr|	 n  line number for ":number" and ":#" commands, and
 			    when 'number' or 'relativenumber' option is set.
-	|hl-CursorLineNr|  N like n for when 'cursorline' is set.
+	|hl-CursorLineNr|  N like n for when 'cursorline' or 'relativenumber' is
+			    set.
 	|hl-Question|	 r  |hit-enter| prompt and yes/no questions
 	|hl-StatusLine|	 s  status line of current window |status-line|
 	|hl-StatusLineNC| S  status lines of not-current windows
@@ -4717,8 +4718,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 			local to buffer
 			{not in Vi}
 	Characters that form pairs.  The |%| command jumps from one to the
-	other.  Currently only single byte character pairs are allowed, and
-	they must be different.  The characters must be separated by a colon.
+	other.
+	Only character pairs are allowed that are different, thus you cannot
+	jump between two double quotes.
+	The characters must be separated by a colon.
 	The pairs must be separated by a comma.  Example for including '<' and
 	'>' (HTML): >
 		:set mps+=<:>
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 5c4a790208..6040ba88f8 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 7.3.  Last change: 2012 May 18
+*pattern.txt*   For Vim version 7.3.  Last change: 2013 Jan 25
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -993,6 +993,8 @@ x	A single character, with no special meaning, matches itself
 	[xyz]		any 'x', 'y' or 'z'
 	[a-zA-Z]$	any alphabetic character at the end of a line
 	\c[a-z]$	same
+	[А-яЁё]		Russian alphabet (with utf-8 and cp1251)
+
 								*/[\n]*
 	With "\_" prepended the collection also includes the end-of-line.
 	The same can be done by including "\n" in the collection.  The
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 5b565859e4..b48307d015 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.3.  Last change: 2012 Nov 28
+*syntax.txt*	For Vim version 7.3.  Last change: 2013 Jan 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -3903,9 +3903,9 @@ External matches					*:syn-ext-match*
 These extra regular expression items are available in region patterns:
 
 						*/\z(* */\z(\)* *E50* *E52*
-    \z(\)	Marks the sub-expression as "external", meaning that it is can
-		be accessed from another pattern match.  Currently only usable
-		in defining a syntax region start pattern.
+    \z(\)	Marks the sub-expression as "external", meaning that it can be
+		accessed from another pattern match.  Currently only usable in
+		defining a syntax region start pattern.
 
 					*/\z1* */\z2* */\z3* */\z4* */\z5*
     \z1  ...  \z9			*/\z6* */\z7* */\z8* */\z9* *E66* *E67*
@@ -4592,7 +4592,8 @@ IncSearch	'incsearch' highlighting; also used for the text replaced with
 LineNr		Line number for ":number" and ":#" commands, and when 'number'
 		or 'relativenumber' option is set.
 							*hl-CursorLineNr*
-CursorLineNr	Like LineNr when 'cursorline' is set for the cursor line.
+CursorLineNr	Like LineNr when 'cursorline' or 'relativenumber' is set for
+		the cursor line.
 							*hl-MatchParen*
 MatchParen	The character under the cursor or just before it, if it
 		is a paired bracket, and its match. |pi_paren.txt|
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index 47dbce6dd3..a4737ac964 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 Dec 05
+*todo.txt*      For Vim version 7.3.  Last change: 2013 Jan 30
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -34,9 +34,8 @@ not be repeated below, unless there is extra information.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
-On external command get the message: 
-     SIGCHLD handler called (some thread has SIGCHLD unblocked)
-From MzScheme
+Several syntax file match "^\s*" which may get underlined if that's in the
+highlight group.  Add a "\zs" after it?
 
 Go through more coverity reports.
 
@@ -53,30 +52,8 @@ 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.
 
-Patch for matchit.vim. (Mike Morearty, 2012 Nov 28)
-
-Patch to fix that the QuitPre autocommand clears the quitmore flag. (Techlive
-Zheng, 2012 Nov 28)
-
-":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.
-
-Patch to make updating tabline faster. (Arseny Kapoulkine, 2012 Oct 3)
-Also remove the "rc" variable.
-
-Patch to make "- register not always used. (Christian Brabandt, 2012 Nov 28)
-
-Crash with vimdiff. (Don Cruickshank, 2012 Sep 23)
-
-Patch to support subdirectories for help files. (Charles Campbell, 2012 Nov
-21)
-
 Patch for mzscheme.  (Sergey Khorev, 2012 Nov 19)
-What about ignoring SEGV?
-
-Win32: use 'guifontwide' for IME composition. (Taro Muraoka, 2012 Sep 30)
-Update Oct 2.
+Updated patch 2013 Jan 28.
 
 Patch to fix :s command with confirm and typing "a". (Christian Brabandt, 2012
 Oct 28)
@@ -88,24 +65,45 @@ Test files in archive in another message.
 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.
+Patch for building with Ruby and Cygwin. (Ken Takata, 2013 Jan 9)
+
+Patch to make 'relativenumber' show the current lnum instead of zero.
+(Nazri Ramliy, 2013 Jan 29)
+
+It's possible to define an input() function that overrides the built-in one.
 (ZyX, 2012 Sep 28)
 
+Patch to add sha256() function. (Tyru, 2013 Jan 8)
+
+Patch to make pyeval() print error messages. (ZyX, 2013 Jan 12)
+
 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 Win32 clipboard under Cygwin. (Frodak Baksik, Feb 15)
+    Sutcliffe says it works well.
+    Update 2007 May 22 for Vim 7.1
+    Update 2008 Dec 2008 for Vim 7.2.xx (Sharonov)
+    Update by Ken Takata (2012 Dec 31, 2013 Jan 4, 2013 Jan 26)
+
 Problem parsing expression with function(). (Andy Wokula, 2012 Nov 22)
 Patch by Christian Brabandt, Nov 22.  Tests in another patch, Nov 23.
 
+Patch to add default value to getbufvar() et al. (Hirohito Higashi, 2013 Jan 1)
+
 Problem caused by patch 7.3.638: window->open does not update window
 correctly. Issue 91.
 
+Patch to fix compiler warnings for MingW 4.5.3. (Ken Takata, 2013 Jan 26)
+
 Do allow real tags above the !_TAG entries. Undo older patch. Issue 90.
 
 Patch to support 'u' in interactive substitute. (Christian Brabandt, 2012 Sep
 28)  With tests: Oct 9.
 
+Patch to make fold updates much faster. (Christian Brabandt, 2012 Dec)
+
 Patch for IME handling, adds 'imactivatefunc' and 'imstatusfunc' option.
 (Yukihiro Nakadaira, 2012 Aug 16)
 Patch to improve IME handling. (Yasuhiro Matsumoto, 2012 Jul 18)
@@ -136,6 +134,8 @@ MS-Windows: Crash opening very long file name starting with "\\".
 It's probably a good idea to make a negative value for 'sts' use the value of
 'sw'.  Patch by So8res, Oct 3 2012
 
+patch to add "combine" flag to  syntax commands. (so8res, 2012 Dec 6)
+
 Syntax update problem in one buffer opened in two windows, bottom window is
 not correctly updated. (Paul Harris, 2012 Feb 27)
 
@@ -145,9 +145,22 @@ 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 make confirm() display colors. (Christian Brabandt, 2012 Nov 9)
+
+Patch to add functions for signs. (Christian Brabandt,, 2013 Jan 27)
+
+Patch to use directX to draw text on Windows.  Adds the 'directx' option.
+(Taro Muraoka, 2013 Jan 25)
+
+b:undo_ftplugin cannot call a script-local function. (Boris Danilov, 2013 Jan
+7)
+
 Patch for :tabcloseleft, after closing a tab go to left tab. (William Bowers,
 2012 Aug 4)
 
+Patch to improve equivalence classes in regexp patterns.
+(Christian Brabandt, 2013 Jan 16, update Jan 17)
+
 Patch with suggestions for starting.txt. (Tony Mechelynck, 2012 Oct 24)
 But use Gnome instead of GTK?
 
@@ -160,6 +173,7 @@ Crash in autocmd that unloads buffers in a BufUnload event. (Andrew Pimlott,
 
 MS-Windows ACL support doesn't work well.  Patch from Ken Takata, 2012 Aug 29.
 Update Aug 31.
+Another patch for MingW, 2012 Dec 29.
 
 MS-Windows resizing problems:
 - Windows window on screen positioning: Patch by Yukihiro Nakadaira, 2012 Jun
@@ -260,7 +274,7 @@ Update Jun 2.
 
 Patch to add ":py3do". (Lilydjwg, 2012 Apr 7)
 
-`[ moves to character after insert, instead of the last inserted character.
+`] moves to character after insert, instead of the last inserted character.
 (Yukihiro Nakadaira, 2011 Dec 9)
 
 Plugin for Modeleasy. (Massimiliano Tripoli, 2011 Nov 29)
@@ -388,6 +402,11 @@ string() can't parse back "inf" and "nan".  Fix documentation or fix code?
 
 Make 'formatprg' global-local. (Sung Pae)
 
+When a buffer-local mapping is used, but a global mapping starts with the same
+characters, Vim currently waits for the next typed character to find out if
+the global mapping matches.  It is probably better to let the local mapping
+win and not wait. (discussion with Andy Wokula, 2013 Jan 30)
+
 When doing "redir => s:foo" in a script and then "redir END" somewhere else
 (e.g. in a function) it can't find s:foo.
 
@@ -516,6 +535,9 @@ names, shell commands and the like.  (Kikuchan, 2010 Oct 14)
 Assume the system converts between the actual encoding of the filesystem to
 the system encoding (usually utf-8).
 
+Patch to add GUI colors to the terminal, when it supports it. (ZyX, 2013 Jan
+26)
+
 Problem producing tags file when hebrew.frx is present.  It has a BOM.
 Results in E670. (Tony Mechelynck, 2010 May 2)
 
@@ -714,7 +736,7 @@ to avoid changing 'eventignore'?
 Patch for displaying 0x200c and 0x200d. (Ali Gholami Rudi, 2009 May 6)
 Probably needs a bit of work.
 
-List of encoding aliases. (Takao Fujiware, 2009 Jul 18)
+List of encoding aliases. (Takao Fujiwara, 2009 Jul 18)
 Are they all OK?  Update Jul 22.
 
 Win32: Improved Makefile for MSVC. (Leonardo Valeri Manera, 2010 Aug 18)
@@ -744,7 +766,7 @@ Problem with <script> mappings (Andy Wokula, 2009 Mar 8)
 When starting Vim with "gvim -f -u non_existent_file > foo.txt" there are a
 few control characters in the output. (Dale Wiles, 2009 May 28)
 
-'cmdwinheight is only used in last window when 'winheight' is a large value.
+'cmdwinheight' is only used in last window when 'winheight' is a large value.
 (Tony Mechelynck, 2009 Apr 15)
 
 Status line containing winnr() isn't updated when splitting the window (Clark
@@ -1245,11 +1267,6 @@ makes his own wrapper).  Add a magic string with the version number to the
 Changes for Win32 makefile. (Mike Williams, 2007 Jan 22, Alexei Alexandrov,
 2007 Feb 8)
 
-Patch for Win32 clipboard under Cygwin. (Frodak Baksik, Feb 15)
-    Sutcliffe says it works well.
-    Update 2007 May 22 for Vim 7.1
-    Update 2008 Dec 2008 for Vim 7.2.xx (Sharonov)
-
 Win32: Can't complete shell command names.  Why is setting xp_context in
 set_one_cmd_context() inside #ifndef BACKSLASH_IN_FILENAME?
 
@@ -1664,7 +1681,8 @@ Patch to support horizontal scroll wheel in GTK. Untested. (Bjorn Winckler,
 2010 Jun 30)
 
 
-At next release:
+At next release 7.4:
+-   Build a huge version by default.
 -   Rename src/Makefile and create a new one like toplevel Makefile that
     creates auto/config.mk when it's not there? (Ben Schmidt, 2011 Feb 11)
 -   Improve plugin handling: Automatic updates, handle dependencies?
@@ -4297,6 +4315,7 @@ Incsearch:
 
 
 Searching:
+9   Should have an option for :vimgrep to find lines without a match.
 8   Add "g/" and "gb" to search for a pattern in the Visually selected text?
     "g?" is already used for rot13.
     The vis.vim script has a ":S" command that does something like this.
@@ -4428,6 +4447,9 @@ Searching:
 
 
 Undo:
+9   ":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.
 9   After undo/redo, in the message show whether the buffer is modified or
     not.
 8   Use timestamps for undo, so that a version a certain time ago can be found
@@ -4612,6 +4634,7 @@ Options:
 7   There is 'titleold', why is there no 'iconold'? (Chazelas)
 7   Make 'scrolloff' a global-local option, so that it can be different in the
     quickfix window, for example. (Gary Holloway)
+    Also do 'sidescrolloff'.
 
 
 External commands:
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index d339adc4d1..d602af692f 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 7.3.  Last change: 2012 Dec 05
+*various.txt*   For Vim version 7.3.  Last change: 2012 Dec 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -174,27 +174,37 @@ g8			Print the hex values of the bytes used in the
 			the command-line.  {commands} are executed like they
 			are typed.  For undo all commands are undone together.
 			Execution stops when an error is encountered.
+
 			If the [!] is given, mappings will not be used.
+			Without it, when this command is called from a
+			non-remappable mapping (|:noremap|), the argument can
+			be mapped anyway.
+
 			{commands} should be a complete command.  If
 			{commands} does not finish a command, the last one
 			will be aborted as if <Esc> or <C-C> was typed.
-			The display isn't updated while ":normal" is busy.
 			This implies that an insert command must be completed
 			(to start Insert mode, see |:startinsert|).  A ":"
 			command must be completed as well.  And you can't use
 			"Q" or "gQ" to start Ex mode.
+
+			The display is not updated while ":normal" is busy.
+
 			{commands} cannot start with a space.  Put a count of
 			1 (one) before it, "1 " is one space.
+
 			The 'insertmode' option is ignored for {commands}.
+
 			This command cannot be followed by another command,
 			since any '|' is considered part of the command.
+
 			This command can be used recursively, but the depth is
 			limited by 'maxmapdepth'.
-			When this command is called from a non-remappable
-			mapping |:noremap|, the argument can be mapped anyway.
+
 			An alternative is to use |:execute|, which uses an
 			expression as argument.  This allows the use of
 			printable characters to represent special characters.
+
 			Example: >
 				:exe "normal \<c-w>\<c-w>"
 <			{not in Vi, of course}
diff --git a/runtime/indent/sqlanywhere.vim b/runtime/indent/sqlanywhere.vim
index edc9650ad7..d11c54b5af 100644
--- a/runtime/indent/sqlanywhere.vim
+++ b/runtime/indent/sqlanywhere.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:    SQL
 " Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
-" Last Change: 2012 Dec 05
+" Last Change: 2012 Dec 06
 " Version:     3.0
 " Download:    http://vim.sourceforge.net/script.php?script_id=495
 
@@ -36,8 +36,6 @@ if exists("b:did_indent")
 endif
 let b:did_indent     = 1
 let b:current_indent = "sqlanywhere"
-let s:keepcpo= &cpo
-set cpo&vim
 
 setlocal indentkeys-=0{
 setlocal indentkeys-=0}
@@ -57,6 +55,13 @@ setlocal indentkeys+==~end,=~else,=~elseif,=~elsif,0=~when,0=)
 " in the indentkeys is typed
 setlocal indentexpr=GetSQLIndent()
 
+" Only define the functions once.
+if exists("*GetSQLIndent")
+    finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
 " List of all the statements that start a new block.
 " These are typically words that start a line.
 " IS is excluded, since it is difficult to determine when the
diff --git a/runtime/menu.vim b/runtime/menu.vim
index 2b5acb982a..656212e41a 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:	2012 Oct 21
+" Last Change:	2012 Dec 06
 
 " 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.
@@ -132,7 +132,7 @@ an 10.610 &File.Sa&ve-Exit<Tab>:wqa		:confirm wqa<CR>
 an 10.620 &File.E&xit<Tab>:qa			:confirm qa<CR>
 
 func! <SID>SelectAll()
-  exe "norm gg" . (&slm == "" ? "VG" : "gH\<C-O>G")
+  exe "norm! gg" . (&slm == "" ? "VG" : "gH\<C-O>G")
 endfunc
 
 func! s:FnameEscape(fname)
diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim
index 6f99004e3c..501c91a44a 100644
--- a/runtime/syntax/c.vim
+++ b/runtime/syntax/c.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 May 03
+" Last Change:	2012 Dec 14
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -93,16 +93,16 @@ endif
 
 " This should be before cErrInParen to avoid problems with #define ({ xxx })
 if exists("c_curly_error")
-  syntax match cCurlyError "}"
-  syntax region	cBlock		start="{" end="}" contains=ALLBUT,cBadBlock,cCurlyError,@cParenGroup,cErrInParen,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell fold
+  syn match cCurlyError "}"
+  syn region	cBlock		start="{" end="}" contains=ALLBUT,cBadBlock,cCurlyError,@cParenGroup,cErrInParen,cCppParen,cErrInBracket,cCppBracket,cCppString,@Spell fold
 else
-  syntax region	cBlock		start="{" end="}" transparent fold
+  syn region	cBlock		start="{" end="}" transparent fold
 endif
 
 "catch errors caused by wrong parenthesis and brackets
 " also accept <% for {, %> for }, <: for [ and :> for ] (C99)
 " But avoid matching <::.
-syn cluster	cParenGroup	contains=cParenError,cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom
+syn cluster	cParenGroup	contains=cParenError,cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserLabel,cBitField,cOctalZero,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom
 if exists("c_no_curly_error")
   syn region	cParen		transparent start='(' end=')' end='}'me=s-1 contains=ALLBUT,cBlock,@cParenGroup,cCppParen,cCppString,@Spell
   " cCppParen: same as cParen but ends at end-of-line; used in cDefine
diff --git a/runtime/syntax/php.vim b/runtime/syntax/php.vim
index 956197d147..ac3b20c0ab 100644
--- a/runtime/syntax/php.vim
+++ b/runtime/syntax/php.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language: php PHP 3/4/5
 " Maintainer: Jason Woofenden <jason@jasonwoof.com>
-" Last Change: Oct 20, 2011
+" Last Change: Dec 11, 2012
 " URL: https://gitorious.org/jasonwoof/vim-syntax/blobs/master/php.vim
 " Former Maintainers: Peter Hodge <toomuchphp-vim@yahoo.com>
 "         Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
@@ -182,6 +182,7 @@ syn keyword phpFunctions  assert_options assert dl extension_loaded get_cfg_var
 syn keyword phpFunctions  ingres_autocommit ingres_close ingres_commit ingres_connect ingres_fetch_array ingres_fetch_object ingres_fetch_row ingres_field_length ingres_field_name ingres_field_nullable ingres_field_precision ingres_field_scale ingres_field_type ingres_num_fields ingres_num_rows ingres_pconnect ingres_query ingres_rollback  contained
 syn keyword phpFunctions  ircg_channel_mode ircg_disconnect ircg_fetch_error_msg ircg_get_username ircg_html_encode ircg_ignore_add ircg_ignore_del ircg_is_conn_alive ircg_join ircg_kick ircg_lookup_format_messages ircg_msg ircg_nick ircg_nickname_escape ircg_nickname_unescape ircg_notice ircg_part ircg_pconnect ircg_register_format_messages ircg_set_current ircg_set_file ircg_set_on_die ircg_topic ircg_whois  contained
 syn keyword phpFunctions  java_last_exception_clear java_last_exception_get contained
+syn keyword phpFunctions  json_decode json_encode json_last_error contained
 syn keyword phpFunctions  ldap_8859_to_t61 ldap_add ldap_bind ldap_close ldap_compare ldap_connect ldap_count_entries ldap_delete ldap_dn2ufn ldap_err2str ldap_errno ldap_error ldap_explode_dn ldap_first_attribute ldap_first_entry ldap_first_reference ldap_free_result ldap_get_attributes ldap_get_dn ldap_get_entries ldap_get_option ldap_get_values_len ldap_get_values ldap_list ldap_mod_add ldap_mod_del ldap_mod_replace ldap_modify ldap_next_attribute ldap_next_entry ldap_next_reference ldap_parse_reference ldap_parse_result ldap_read ldap_rename ldap_search ldap_set_option ldap_set_rebind_proc ldap_sort ldap_start_tls ldap_t61_to_8859 ldap_unbind  contained
 syn keyword phpFunctions  lzf_compress lzf_decompress lzf_optimized_for contained
 syn keyword phpFunctions  ezmlm_hash mail contained
diff --git a/src/po/de.po b/src/po/de.po
index 1a61bffe84..6369af4cbc 100644
--- a/src/po/de.po
+++ b/src/po/de.po
@@ -2754,16 +2754,16 @@ msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\tEingeschr�nkter Modus (wie \"rvim\")"
 
 msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\tModifikatioen (beim Schreiben von Dateien) sind nicht erlaubt"
+msgstr "-m\t\t\tModifikationen (beim Schreiben von Dateien) sind nicht erlaubt"
 
 msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\tModifikatioen im Text nicht erlaubt"
+msgstr "-M\t\t\tModifikationen im Text nicht erlaubt"
 
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\tBin�rmodus"
 
 msgid "-l\t\t\tLisp mode"
-msgstr "-l\t\t\tList Modus"
+msgstr "-l\t\t\tLisp Modus"
 
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\t\tKompatibel zu Vi: 'compatible'"
diff --git a/src/po/uk.cp1251.po b/src/po/uk.cp1251.po
index ac73ed821d..7d4b572b3c 100644
--- a/src/po/uk.cp1251.po
+++ b/src/po/uk.cp1251.po
@@ -14,10 +14,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vim 7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 12:13+0300\n"
+"POT-Creation-Date: 2013-01-17 10:06+0200\n"
 "PO-Revision-Date: 2010-06-18 21:53+0300\n"
 "Last-Translator: ������� ������ <sakhnik@gmail.com>\n"
 "Language-Team: Bohdan Vlasyuk <bohdan@vstu.edu.ua>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=cp1251\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,6 +44,9 @@ msgstr "[
 msgid "[Quickfix List]"
 msgstr "[������ ����������]"
 
+msgid "E855: Autocommands caused command to abort"
+msgstr "E855: ����������� �������� �� ���������� �������"
+
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: ���� ��������� ��������� ��� ���� �����, ���������� ������..."
 
@@ -174,7 +178,6 @@ msgstr "
 msgid "Top"
 msgstr "����"
 
-#, c-format
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -235,11 +238,11 @@ msgstr ""
 
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: �� ������� ������ ����� \"%s\""
+msgstr "E102: �� ������� ������ ����� �%s�"
 
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: ����� \"%s\" �� � ����� ���������"
+msgstr "E103: ����� �%s� �� � ����� ���������"
 
 msgid "E787: Buffer changed unexpectedly"
 msgstr "E787: ����� ���������� �������"
@@ -302,6 +305,13 @@ msgstr " 
 msgid "Hit end of paragraph"
 msgstr "�������� ����� ���������"
 
+# msgstr "E443: "
+msgid "E839: Completion function changed window"
+msgstr "E839: ������� ���������� ������ ����"
+
+msgid "E840: Completion function deleted text"
+msgstr "E840: ������� ���������� ������� �����"
+
 msgid "'dictionary' option is empty"
 msgstr "����� 'dictionary' �������"
 
@@ -448,7 +458,7 @@ msgid "E711: List value has not enough items"
 msgstr "E711: ������ �� ����������� ��������"
 
 msgid "E690: Missing \"in\" after :for"
-msgstr "E690: ��������� \"in\" ���� :for"
+msgstr "E690: ��������� �in� ���� :for"
 
 #, c-format
 msgid "E107: Missing parentheses: %s"
@@ -456,7 +466,7 @@ msgstr "E107: 
 
 #, c-format
 msgid "E108: No such variable: \"%s\""
-msgstr "E108: ����� ����: \"%s\""
+msgstr "E108: ����� ����: �%s�"
 
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: ����� �� �������� �������� ��� ���� ��-/��������."
@@ -501,11 +511,11 @@ msgstr "E113: 
 
 #, c-format
 msgid "E114: Missing quote: %s"
-msgstr "E114: ����� '\"': %s"
+msgstr "E114: ����� �����: %s"
 
 #, c-format
 msgid "E115: Missing quote: %s"
-msgstr "E115: ����� \"'\": %s"
+msgstr "E115: ����� �����: %s"
 
 # msgstr "E404: "
 #, c-format
@@ -523,7 +533,7 @@ msgstr "E720: 
 
 #, c-format
 msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: ���������� ����� � ��������: \"%s\""
+msgstr "E721: ���������� ����� � ��������: �%s�"
 
 # msgstr "E235: "
 #, c-format
@@ -565,6 +575,10 @@ msgstr "E725: 
 msgid "E808: Number or Float required"
 msgstr "E808: ����� ������� Number �� Float"
 
+# msgstr "E14: "
+msgid "add() argument"
+msgstr "�������� add()"
+
 msgid "E699: Too many arguments"
 msgstr "E699: �������� ���������"
 
@@ -580,11 +594,23 @@ msgstr "E785: complete() 
 msgid "&Ok"
 msgstr "&O:������"
 
+# msgstr "E14: "
+msgid "extend() argument"
+msgstr "�������� extend()"
+
 # msgstr "E226: "
 #, c-format
 msgid "E737: Key already exists: %s"
 msgstr "E737: ���� ��� ����: %s"
 
+# msgstr "E14: "
+msgid "map() argument"
+msgstr "�������� map()"
+
+# msgstr "E14: "
+msgid "filter() argument"
+msgstr "�������� filter()"
+
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld �����: "
@@ -603,6 +629,10 @@ msgstr ""
 msgid "called inputrestore() more often than inputsave()"
 msgstr "������� �� inputrestore() ������, ��� �� inputsave()"
 
+# msgstr "E14: "
+msgid "insert() argument"
+msgstr "�������� insert()"
+
 # msgstr "E406: "
 msgid "E786: Range not allowed"
 msgstr "E786: �������� �� ���������"
@@ -630,12 +660,24 @@ msgstr "E241: 
 msgid "E277: Unable to read a server reply"
 msgstr "E277: �� ������� ��������� ������� �������"
 
+# msgstr "E14: "
+msgid "remove() argument"
+msgstr "�������� remove()"
+
 msgid "E655: Too many symbolic links (cycle?)"
 msgstr "E655: �������� ���������� �������� (����?)"
 
+# msgstr "E14: "
+msgid "reverse() argument"
+msgstr "�������� reverse()"
+
 msgid "E258: Unable to send to client"
 msgstr "E258: �� ������� �������� �볺���"
 
+# msgstr "E14: "
+msgid "sort() argument"
+msgstr "�������� sort()"
+
 # msgstr "E364: "
 msgid "E702: Sort compare function failed"
 msgstr "E702: ������� � ������� ���������"
@@ -672,14 +714,6 @@ msgstr "E731: Dictionary 
 msgid "E806: using Float as a String"
 msgstr "E806: Float ����� �� String"
 
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: ����� ����� Funcref �� ���������� � ������ �����: %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: ����� ����� ������� � �������� ��������: %s"
-
 #, c-format
 msgid "E706: Variable type mismatch for: %s"
 msgstr "E706: ������������ ��� �����: %s"
@@ -688,6 +722,14 @@ msgstr "E706: 
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: �� ����� ������� ����� %s"
 
+#, c-format
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: ����� ����� Funcref �� ���������� � ������ �����: %s"
+
+#, c-format
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: ����� ����� ������� � �������� ��������: %s"
+
 #, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: �������� ��������: %s"
@@ -714,6 +756,10 @@ msgstr "E124: 
 msgid "E125: Illegal argument: %s"
 msgstr "E125: ������������ ��������: %s"
 
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: ����� ��������� ������������: %s"
+
 msgid "E126: Missing :endfunction"
 msgstr "E126: ����� :endfunction"
 
@@ -785,7 +831,7 @@ msgid "No old files"
 msgstr "������� ������� �����"
 
 msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "����� ������������.  ��� ���������� ������ \"cont\"."
+msgstr "����� ������������.  ��� ���������� ������ �cont�."
 
 #, c-format
 msgid "line %ld: %s"
@@ -797,7 +843,7 @@ msgstr "
 
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "����� ������� � \"%s%s\" ����� %ld"
+msgstr "����� ������� � �%s%s� ����� %ld"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -811,21 +857,21 @@ msgid "%3d  %s %s  line %ld"
 msgstr "%3d %s %s   ����� %ld"
 
 msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: �������� ������ \":profile start {����}\""
+msgstr "E750: �������� ������ �:profile start {����}�"
 
 msgid "Save As"
 msgstr "�������� ��"
 
 #, c-format
 msgid "Save changes to \"%s\"?"
-msgstr "�������� ���� � \"%s\"?"
+msgstr "�������� ���� � �%s�?"
 
 msgid "Untitled"
 msgstr "����������"
 
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: ����� \"%s\" �� ����������� ����"
+msgstr "E162: ����� �%s� �� ����������� ����"
 
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr ""
@@ -847,38 +893,38 @@ msgstr "E666: 
 # msgstr "E195: "
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
-msgstr "����� \"%s\" � \"%s\""
+msgstr "����� �%s� � �%s�"
 
 #, c-format
 msgid "Searching for \"%s\""
-msgstr "����� \"%s\""
+msgstr "����� �%s�"
 
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
-msgstr "� 'runtimepath' �� �������� \"%s\""
+msgstr "� 'runtimepath' �� �������� �%s�"
 
 msgid "Source Vim script"
 msgstr "��������� ������ Vim"
 
 #, c-format
 msgid "Cannot source a directory: \"%s\""
-msgstr "�� ������� ��������� �������: \"%s\""
+msgstr "�� ������� ��������� �������: �%s�"
 
 #, c-format
 msgid "could not source \"%s\""
-msgstr "�� ������� �������� \"%s\""
+msgstr "�� ������� �������� �%s�"
 
 #, c-format
 msgid "line %ld: could not source \"%s\""
-msgstr "����� %ld: �� ������� �������� \"%s\""
+msgstr "����� %ld: �� ������� �������� �%s�"
 
 #, c-format
 msgid "sourcing \"%s\""
-msgstr "���������� \"%s\""
+msgstr "���������� �%s�"
 
 #, c-format
 msgid "line %ld: sourcing \"%s\""
-msgstr "����� %ld: ���������� \"%s\""
+msgstr "����� %ld: ���������� �%s�"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -912,11 +958,11 @@ msgstr "E168: :finish 
 
 #, c-format
 msgid "Current %slanguage: \"%s\""
-msgstr "���� (%s): \"%s\""
+msgstr "���� (%s): �%s�"
 
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: �� ������� ���������� ���� \"%s\""
+msgstr "E197: �� ������� ���������� ���� �%s�"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
@@ -959,7 +1005,7 @@ msgstr "E136: viminfo: 
 
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "��������� ���� viminfo: \"%s\"%s%s%s"
+msgstr "��������� ���� viminfo: �%s�%s%s%s"
 
 msgid " info"
 msgstr " ����������"
@@ -976,7 +1022,7 @@ msgstr " 
 #. avoid a wait_return for this message, it's annoying
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: �� ��������� ����� � ���� viminfo: \"%s\""
+msgstr "E137: �� ��������� ����� � ���� viminfo: %s"
 
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
@@ -984,14 +1030,13 @@ msgstr "E138: 
 
 #, c-format
 msgid "Writing viminfo file \"%s\""
-msgstr "���������� ���� viminfo \"%s\""
+msgstr "���������� ���� viminfo �%s�"
 
 #. Write the info:
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# ��� ���� ����������� ��������� Vim %s.\n"
 
-#, c-format
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -999,7 +1044,6 @@ msgstr ""
 "# ������ ����������, ��� ��������!\n"
 "\n"
 
-#, c-format
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# �������� 'encoding' �� ��� ��������� ����� �����\n"
 
@@ -1014,11 +1058,11 @@ msgstr "E140: 
 
 #, c-format
 msgid "Overwrite existing file \"%s\"?"
-msgstr "���������� �������� ���� \"%s\"?"
+msgstr "���������� �������� ���� �%s�?"
 
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "���� ����� \"%s\" ����, ������������?"
+msgstr "���� ����� �%s� ����, ������������?"
 
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
@@ -1036,7 +1080,7 @@ msgid ""
 "'readonly' option is set for \"%s\".\n"
 "Do you wish to write anyway?"
 msgstr ""
-"��� \"%s\" ����������� 'readonly'.\n"
+"��� �%s� ����������� 'readonly'.\n"
 "������ ��� ���� ���������� �����?"
 
 #, c-format
@@ -1045,13 +1089,13 @@ msgid ""
 "It may still be possible to write it.\n"
 "Do you wish to try?"
 msgstr ""
-"���� \"%s\" ��������� ����� ������.\n"
+"���� �%s� ��������� ����� ������.\n"
 "�����, �������, ���� ����� ��������.\n"
 "������ ����������?"
 
 #, c-format
 msgid "E505: \"%s\" is read-only (add ! to override)"
-msgstr "E505: \"%s\" ����� ��� ������� (! ��� �� �������)"
+msgstr "E505: �%s� ����� ��� ������� (! ��� �� �������)"
 
 msgid "Edit File"
 msgstr "���������� ����"
@@ -1108,7 +1152,6 @@ msgstr "E148: 
 msgid "Pattern found in every line: %s"
 msgstr "������ �������� � ������� �����: %s"
 
-#, c-format
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -1131,7 +1174,7 @@ msgstr "E149: 
 
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
-msgstr "�������, ���� �������� \"%s\" �� ��������"
+msgstr "�������, ���� �������� �%s� �� ��������"
 
 #, c-format
 msgid "E150: Not a directory: %s"
@@ -1151,7 +1194,7 @@ msgstr "E670: ̳
 
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: ���������� ��� \"%s\" � ���� %s/%s"
+msgstr "E154: ���������� ��� �%s� � ���� %s/%s"
 
 #, c-format
 msgid "E160: Unknown sign command: %s"
@@ -1192,7 +1235,7 @@ msgid "[Deleted]"
 msgstr "[�������]"
 
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "����� Ex. ��� ���������� �� ����������� ������ ��������� \"visual\""
+msgstr "����� Ex. ��� ���������� �� ����������� ������ ��������� �visual�"
 
 msgid "E501: At end-of-file"
 msgstr "E501: ʳ���� �����"
@@ -1220,7 +1263,7 @@ msgid "E493: Backwards range given"
 msgstr "E493: �������� ������ ��������"
 
 msgid "Backwards range given, OK to swap"
-msgstr "�������� ������ ��������, ��� ������� ������ -- ������"
+msgstr "�������� ������ ��������, ��� ������� ������ � ������"
 
 msgid "E494: Use w or w>>"
 msgstr "E494: ��������� w ��� w>>"
@@ -1288,6 +1331,9 @@ msgstr "E182: 
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr "E183: ������� ����������� ������� ���������� � ������ �����"
 
+msgid "E841: Reserved name, cannot be used for user defined command"
+msgstr "E841: ������������� �����, �� ����� ����������� ��� ������������� �������"
+
 # msgstr "E183: "
 #, c-format
 msgid "E184: No such user-defined command: %s"
@@ -1309,8 +1355,8 @@ msgstr "
 
 # msgstr "E184: "
 #, c-format
-msgid "E185: Cannot find color scheme %s"
-msgstr "E185: �� ������� ������ ����� ������� %s"
+msgid "E185: Cannot find color scheme '%s'"
+msgstr "E185: �� ������� ������ ����� ������� �%s�"
 
 msgid "Greetings, Vim user!"
 msgstr "³�����, ����������� Vim!"
@@ -1380,12 +1426,12 @@ msgstr "E739: 
 
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
-msgstr "E189: ���� \"%s\" ���� (! ��� �� �������)"
+msgstr "E189: ���� �%s� ���� (! ��� �� �������)"
 
 # msgstr "E189: "
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: �� ������� ������� \"%s\" ��� ������"
+msgstr "E190: �� ������� ������� �%s� ��� ������"
 
 # msgstr "E190: "
 #. set mark
@@ -1404,23 +1450,26 @@ msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: ���� ����� ���������� ����� ��� ����� '#'"
 
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
-msgstr "E495: ���� ����� ����� ����������� ��� ����� \"<afile>\""
+msgstr "E495: ���� ����� ����� ����������� ��� ����� �<afile>�"
 
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: ���� ������ ������ ����������� ��� ����� \"<abuf>\""
+msgstr "E496: ���� ������ ������ ����������� ��� ����� �<abuf>�"
 
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
-msgstr "E497: ���� ����� ���� ����������� ��� ����� \"<amatch>\""
+msgstr "E497: ���� ����� ���� ����������� ��� ����� �<amatch>�"
 
 msgid "E498: no :source file name to substitute for \"<sfile>\""
-msgstr "E498: ���� ����� ����� :source ��� ����� \"<sfile>\""
+msgstr "E498: ���� ����� ����� :source ��� ����� �<sfile>�"
+
+msgid "E842: no line number to use for \"<slnum>\""
+msgstr "E842: ���� ������ �����, ��� ����������� � �<sfile>�"
 
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "E499: ����� ����� ��� '%' �� '#' �������, ������ ���� � \":p:h\""
+msgstr "E499: ����� ����� ��� '%' �� '#' �������, ������ ���� � �:p:h�"
 
 msgid "E500: Evaluates to an empty string"
-msgstr "E500: ��������� -- �������� �����"
+msgstr "E500: ��������� � �������� �����"
 
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: �� ������� ��������� ���� viminfo"
@@ -1652,6 +1701,9 @@ msgstr "[
 msgid "[converted]"
 msgstr "[������������]"
 
+msgid "[blowfish]"
+msgstr "[blowfish]"
+
 msgid "[crypted]"
 msgstr "[�����������]"
 
@@ -1853,50 +1905,50 @@ msgstr "
 
 #, c-format
 msgid "E208: Error writing to \"%s\""
-msgstr "E208: ������� ������ � \"%s\""
+msgstr "E208: ������� ������ � �%s�"
 
 #, c-format
 msgid "E209: Error closing \"%s\""
-msgstr "E209: ������� �������� \"%s\""
+msgstr "E209: ������� �������� �%s�"
 
 #, c-format
 msgid "E210: Error reading \"%s\""
-msgstr "E210: ������� ������� \"%s\""
+msgstr "E210: ������� ������� �%s�"
 
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: ����������� FileChangedShell ������� �����"
 
 #, c-format
 msgid "E211: File \"%s\" no longer available"
-msgstr "E211: ���� \"%s\" ����� �� ��������"
+msgstr "E211: ���� �%s� ����� �� ��������"
 
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
-msgstr "W12: ������������: ���� \"%s\" �������, ��� � ����� � Vim �����"
+msgstr "W12: ������������: ���� �%s� �������, ��� � ����� � Vim �����"
 
 msgid "See \":help W12\" for more info."
-msgstr "���. \":help W12\" ��� ���������."
+msgstr "���. �:help W12� ��� ���������."
 
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: ������������: ���� \"%s\" ������� ���� ������� �����������"
+msgstr "W11: ������������: ���� �%s� ������� ���� ������� �����������"
 
 msgid "See \":help W11\" for more info."
-msgstr "���. \":help W11\" ��� ���������."
+msgstr "���. �:help W11� ��� ���������."
 
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr ""
-"W16: ������������: ����� ����� \"%s\" ������� ���� ������� �����������"
+"W16: ������������: ����� ����� �%s� ������� ���� ������� �����������"
 
 msgid "See \":help W16\" for more info."
-msgstr "���. \":help W16\" ��� ���������."
+msgstr "���. �:help W16� ��� ���������."
 
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: ������������: ���� \"%s\" ���� �������� ���� ������� �����������"
+msgstr "W13: ������������: ���� �%s� ���� �������� ���� ������� �����������"
 
 msgid "Warning"
 msgstr "������������"
@@ -1910,11 +1962,11 @@ msgstr ""
 
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
-msgstr "E462: �� ������� ���������� \"%s\" ��� �����������"
+msgstr "E462: �� ������� ���������� �%s�, ��� ����������"
 
 #, c-format
 msgid "E321: Could not reload \"%s\""
-msgstr "E321: �� ������� ���������� \"%s\""
+msgstr "E321: �� ������� ���������� �%s�"
 
 msgid "--Deleted--"
 msgstr "--�������--"
@@ -1926,7 +1978,7 @@ msgstr "
 #. the group doesn't exist
 #, c-format
 msgid "E367: No such group: \"%s\""
-msgstr "E367: ���� ���� �����: \"%s\""
+msgstr "E367: ���� ���� �����: �%s�"
 
 #, c-format
 msgid "E215: Illegal character after *: %s"
@@ -1968,7 +2020,7 @@ msgstr "E218: 
 # msgstr "E218: "
 #, c-format
 msgid "%s Auto commands for \"%s\""
-msgstr "����������� %s ��� \"%s\""
+msgstr "����������� %s ��� �%s�"
 
 #, c-format
 msgid "Executing %s"
@@ -2067,6 +2119,12 @@ msgstr "Scrollbar Widget: 
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: �� ������� �������� BalloonEval � ������������ � ��������"
 
+msgid "E851: Failed to create a new process for the GUI"
+msgstr "E851: �� ������� �������� ����� ������ ��� GUI"
+
+msgid "E852: The child process failed to start the GUI"
+msgstr "E852: �������� ������ �� ��� ��������� GUI"
+
 # msgstr "E228: "
 msgid "E229: Cannot start the GUI"
 msgstr "E229: �� ������� ��������� GUI"
@@ -2074,7 +2132,7 @@ msgstr "E229: 
 # msgstr "E229: "
 #, c-format
 msgid "E230: Cannot read from \"%s\""
-msgstr "E230: �� ������� ��������� � \"%s\""
+msgstr "E230: �� ������� ��������� � �%s�"
 
 msgid "E665: Cannot start GUI, no valid font found"
 msgstr "E665: �� ������� ��������� GUI, �� �������� �����"
@@ -2148,7 +2206,7 @@ msgid "Replace All"
 msgstr "������� ��"
 
 msgid "Vim: Received \"die\" request from session manager\n"
-msgstr "Vim: ������� ����� \"die\" �� ��������� ����\n"
+msgstr "Vim: ������� ����� �die� �� ��������� ����\n"
 
 msgid "Close"
 msgstr "�������"
@@ -2200,11 +2258,11 @@ msgstr "&U:
 
 #, c-format
 msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: �� ������� ������ ���� \"%s\""
+msgstr "E671: �� ������� ������ ���� �%s�"
 
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: �������� �� �����������: \"-%s\"; ������������ ����� � OLE."
+msgstr "E243: �������� �� �����������: �-%s�; ������������ ����� � OLE."
 
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: �� ������� ������� ���� ��������� �������� MDI"
@@ -2349,23 +2407,23 @@ msgstr "E455: 
 
 #, c-format
 msgid "E624: Can't open file \"%s\""
-msgstr "E624: �� ������� ������� ���� \"%s\""
+msgstr "E624: �� ������� ������� ���� �%s�"
 
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: �� ������� ��������� ���� ������� PostScript \"%s\""
+msgstr "E457: �� ������� ��������� ���� ������� PostScript �%s�"
 
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: \"%s\" �� � ������ ������� PostScript"
+msgstr "E618: �%s� �� � ������ ������� PostScript"
 
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: \"%s\" �� � ������������ ������ ������� PostScript"
+msgstr "E619: �%s� �� � ������������ ������ ������� PostScript"
 
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: ����������� ����� ����� ������� \"%s\""
+msgstr "E621: ����������� ����� ����� ������� �%s�"
 
 msgid "E673: Incompatible multi-byte encoding and character set."
 msgstr "E673: �������� ������������� ��������� � ���� �������."
@@ -2382,21 +2440,21 @@ msgstr "E324: 
 
 #, c-format
 msgid "E456: Can't open file \"%s\""
-msgstr "E456: �� ������� ������� ���� \"%s\""
+msgstr "E456: �� ������� ������� ���� �%s�"
 
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: �� ������� ������ ���� ������� PostScript \"prolog.ps\""
+msgstr "E456: �� ������� ������ ���� ������� PostScript �prolog.ps�"
 
 msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: �� ������� ������ ���� ������� PostScript \"cidfont.ps\""
+msgstr "E456: �� ������� ������ ���� ������� PostScript �cidfont.ps�"
 
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: �� ������� ������ ���� ������� PostScript \"%s.ps\""
+msgstr "E456: �� ������� ������ ���� ������� PostScript �%s.ps�"
 
 #, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620: �� ������� ����������� �� ��������� ����� \"%s\""
+msgstr "E620: �� ������� ����������� �� ��������� ����� �%s�"
 
 msgid "Sending to printer..."
 msgstr "³��������� �� �������..."
@@ -2509,7 +2567,7 @@ msgid ""
 "       g: Find this definition\n"
 "       i: Find files #including this file\n"
 "       s: Find this C symbol\n"
-"       t: Find assignments to\n"
+"       t: Find this text string\n"
 msgstr ""
 "\n"
 "       c: ������ �������, �� ���������� �� �������\n"
@@ -2519,7 +2577,7 @@ msgstr ""
 "       g: ������ �� ����������\n"
 "       i: ������ �����, �� ��������� � ���� ��� ����\n"
 "       s: ������ ��� ������ C\n"
-"       t: ������ ��������� �����\n"
+"       t: ������ ��� �����\n"
 
 #, c-format
 msgid "E625: cannot open cscope database: %s"
@@ -2632,12 +2690,12 @@ msgstr "
 msgid "not allowed in the Vim sandbox"
 msgstr "�� ��������� � �������� Vim"
 
-msgid "E836: This Vim cannot execute :python after using :py3"
-msgstr "E836: Python: �� ����� ����������� :py � :py3 � ������ �����"
-
 msgid "E837: This Vim cannot execute :py3 after using :python"
 msgstr "E837: Python: �� ����� ����������� :py � :py3 � ������ �����"
 
+msgid "only string keys are allowed"
+msgstr "��������� ����� ������� �����"
+
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
@@ -2645,23 +2703,28 @@ msgstr ""
 "E263: �������, �� ������� ��������, �������� Python �� ���� ���� "
 "�����������."
 
-msgid "can't delete OutputObject attributes"
-msgstr "�� ������� ������� �������� OutputObject"
+msgid "E860: Eval did not return a valid python 3 object"
+msgstr "E860: Eval �� �������� ������ �ᒺ�� python 3"
 
-msgid "softspace must be an integer"
-msgstr "softspace �� ���� �����"
-
-# msgstr "E180: "
-msgid "invalid attribute"
-msgstr "������������ �������"
+msgid "E861: Failed to convert returned python 3 object to vim value"
+msgstr "E861: �� ������� ����������� �ᒺ�� python 3 � �������� vim"
 
 #, c-format
 msgid "<buffer object (deleted) at %p>"
 msgstr "<��'��� ������ (�������) �� ������� %p>"
 
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836: Python: �� ����� ����������� :py � :py3 � ������ �����"
+
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: �� ����� ���������� ��������� Python"
 
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: Eval �� �������� ������ �ᒺ�� python"
+
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: �� ������� ����������� �ᒺ�� python � �������� vim"
+
 msgid "E265: $_ must be an instance of String"
 msgstr "E265: $_ �� ���� ����������� String"
 
@@ -2846,12 +2909,6 @@ msgid ""
 msgstr ""
 "E571: �������, �� ������� ��������, �������� Tcl �� ���� ���� �����������."
 
-msgid ""
-"E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
-msgstr ""
-"E281: ������� TCL: ��� ������ �� � �����!? ���� �����, �������� � vim-"
-"dev@vim.org"
-
 #, c-format
 msgid "E572: exit code %d"
 msgstr "E572: ��� ������ %d"
@@ -2863,7 +2920,7 @@ msgid "Unable to register a command server name"
 msgstr "�� ������� ������������ ����� ������� ������"
 
 msgid "E248: Failed to send command to the destination program"
-msgstr "E248: �� ������� ������� ������� �� ��������-�����������"
+msgstr "E248: �� ������� ������� ������� �� ��������-���"
 
 #, c-format
 msgid "E573: Invalid server id used: %s"
@@ -2886,7 +2943,7 @@ msgstr "
 
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
 msgstr ""
-"�������� ��������� � \"+�������\", \"-c �������\" ��� \"--cmd �������\""
+"�������� ��������� � �+�������, �-c ������� ��� �--cmd �������"
 
 # msgstr "E14: "
 msgid "Invalid argument for"
@@ -2929,7 +2986,7 @@ msgstr "
 
 #, c-format
 msgid "E282: Cannot read from \"%s\""
-msgstr "E282: �� ������� ��������� � \"%s\""
+msgstr "E282: �� ������� ��������� � �%s�"
 
 # msgstr "E282: "
 msgid ""
@@ -2937,7 +2994,7 @@ msgid ""
 "More info with: \"vim -h\"\n"
 msgstr ""
 "\n"
-"ij�������� �����: \"vim -h\"\n"
+"ij�������� �����: �vim -h�\n"
 
 msgid "[file ..]       edit specified file(s)"
 msgstr "[���� ..]       ���������� ������� �����"
@@ -3000,31 +3057,34 @@ msgid "-unregister\t\tUnregister gvim for OLE"
 msgstr "-unregister\t\t��������� ��������� ����� gvim ��� OLE"
 
 msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-msgstr "-g\t\t\t��������� GUI (���� \"gvim\")"
+msgstr "-g\t\t\t��������� GUI (���� �gvim�)"
 
 msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
 msgstr "-f  ��  --nofork\t�������� ����: ������� ������� ���� ������� GUI"
 
 msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\t����� Vi (���� \"vi\")"
+msgstr "-v\t\t\t����� Vi (���� �vi�)"
 
 msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\t����� Ex (���� \"ex\")"
+msgstr "-e\t\t\t����� Ex (���� �ex�)"
+
+msgid "-E\t\t\tImproved Ex mode"
+msgstr "-E\t\t\t���������� ����� Ex"
 
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t��������� (��������) ����� (���� ��� \"ex\")"
+msgstr "-s\t\t\t��������� (��������) ����� (���� ��� �ex�)"
 
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\t����� ��������� (���� \"vimdiff\")"
+msgstr "-d\t\t\t����� ��������� (���� �vimdiff�)"
 
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t������� ����� (���� \"evim\", ��� ������)"
+msgstr "-y\t\t\t������� ����� (���� �evim�, ��� ������)"
 
 msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\t����� ��������� (���� \"view\")"
+msgstr "-R\t\t\t����� ��������� (���� �view�)"
 
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\t��������� ����� (���� \"rvim\")"
+msgstr "-Z\t\t\t��������� ����� (���� �rvim�)"
 
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\t���� (����� �����) �� ���������"
@@ -3247,19 +3307,6 @@ msgstr "+reverse\t\t
 msgid "-xrm <resource>\tSet the specified resource"
 msgstr "-xrm <������>\t\t���������� ���������� ������"
 
-msgid ""
-"\n"
-"Arguments recognised by gvim (RISC OS version):\n"
-msgstr ""
-"\n"
-"��������� gvim (����� RISC OS):\n"
-
-msgid "--columns <number>\tInitial width of window in columns"
-msgstr "--columns <�������>\t��������� ������� ������� ����"
-
-msgid "--rows <number>\tInitial height of window in rows"
-msgstr "--rows <�������>\t��������� ������� ����� ����"
-
 msgid ""
 "\n"
 "Arguments recognised by gvim (GTK+ version):\n"
@@ -3277,6 +3324,9 @@ msgstr ""
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\t³������ Vim � ������ ������� ���������� GTK"
 
+msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+msgstr "--echo-wid\t\t��� gvim ������� ������������� ���� �� stdout"
+
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <��������� ������>\t³������ Vim ��������� ������������ ����"
 
@@ -3309,7 +3359,7 @@ msgstr "
 
 #, c-format
 msgid "E283: No marks matching \"%s\""
-msgstr "E283: ������ \"%s\" �� ��������"
+msgstr "E283: ������ �%s� �� ��������"
 
 # msgstr "E283: "
 #. Highlight title
@@ -3338,7 +3388,6 @@ msgstr ""
 "������ ���. �����. �����"
 
 # TODO
-#, c-format
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3347,7 +3396,6 @@ msgstr ""
 "# ������:\n"
 
 #. Write the jumplist with -'
-#, c-format
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3356,7 +3404,6 @@ msgstr ""
 "# ������ �������� (�� ���������):\n"
 
 # TODO
-#, c-format
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -3422,6 +3469,9 @@ msgstr "E298: 
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: ���� ����� 2?"
 
+msgid "E843: Error while updating swap file crypt"
+msgstr "E843: ������� ���������� ���������� ����� �����"
+
 #. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: ��, �������� ���� �����!!!"
@@ -3434,7 +3484,7 @@ msgstr "E302: 
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr ""
-"E303: �� ������� ��������� ���� ����� ��� \"%s\", ���������� ���������"
+"E303: �� ������� ��������� ���� ����� ��� �%s�, ���������� ���������"
 
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): ���� ����� 0??"
@@ -3494,18 +3544,18 @@ msgstr " 
 
 #, c-format
 msgid "Using swap file \"%s\""
-msgstr "��������������� ���� ����� \"%s\""
+msgstr "��������������� ���� ����� �%s�"
 
 #, c-format
 msgid "Original file \"%s\""
-msgstr "���������� ���� \"%s\""
+msgstr "���������� ���� �%s�"
 
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: ������������: �������, ���������� ���� ���� ������"
 
 #, c-format
 msgid "Swap file is encrypted: \"%s\""
-msgstr "���� ����� ������������: \"%s\""
+msgstr "���� ����� ������������: �%s�"
 
 msgid ""
 "\n"
@@ -3580,7 +3630,7 @@ msgstr ""
 "����������� � ???"
 
 msgid "See \":help E312\" for more information."
-msgstr "���. \":help E312\" ��� ���������."
+msgstr "���. �:help E312� ��� ���������."
 
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "³��������� ��������, �������� �� ��� ������."
@@ -3770,7 +3820,7 @@ msgstr "E317: 
 
 #, c-format
 msgid "E773: Symlink loop for \"%s\""
-msgstr "E773: ������� ��������� ��������� \"%s\""
+msgstr "E773: ������� ��������� ��������� �%s�"
 
 # msgstr "E317: "
 msgid "E325: ATTENTION"
@@ -3793,54 +3843,50 @@ msgstr "      
 #. * other languages.
 msgid ""
 "\n"
-"(1) Another program may be editing the same file.\n"
-"    If this is the case, be careful not to end up with two\n"
-"    different instances of the same file when making changes.\n"
+"(1) Another program may be editing the same file.  If this is the case,\n"
+"    be careful not to end up with two different instances of the same\n"
+"    file when making changes."
 msgstr ""
 "\n"
-"(1) �������, ���� �������� ��� ������ ��� ����� ����.\n"
-"    ������ ��������, ��� �� ���������� ��� ���� ����������\n"
-"    ������ � ���� ������ ����� ���� ���.\n"
+"(1) �������, ���� �������� ��� ������ ��� ����� ����. ���� �� ���,\n"
+"    ������ ��������, ��� �� ���������� ��� ���� ����������\n"
+"    ������ � ���� ������ ����� ���� ���."
 
-msgid "    Quit, or continue with caution.\n"
-msgstr "    ������, ��� ����������� ��������.\n"
+msgid "  Quit, or continue with caution.\n"
+msgstr "  ������ ��� ����������� ��������.\n"
 
-msgid ""
-"\n"
-"(2) An edit session for this file crashed.\n"
-msgstr ""
-"\n"
-"(2) ����� ����������� ����� ����� ������ �����.\n"
+msgid "(2) An edit session for this file crashed.\n"
+msgstr "(2) ����� ����������� ����� ����� ������ �����.\n"
 
 msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    ���� �� ������ ���������, ��������� \":recover\" ��� \"vim -r "
+msgstr "    ���� �� ������ ���������, ��������� �:recover� ��� �vim -r "
 
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
 msgstr ""
-"\"\n"
-"    ��� �������� ���� (���. \":help recovery\").\n"
+"�\n"
+"    ��� �������� ���� (���. �:help recovery�).\n"
 
 msgid "    If you did this already, delete the swap file \""
-msgstr "    ���� �� ��� �� �������, ������� ���� ����� \""
+msgstr "    ���� �� ��� �� �������, ������� ���� ����� �"
 
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
 msgstr ""
-"\"\n"
+"�,\n"
 "    ��� ��������� ����� �����������.\n"
 "\n"
 
 msgid "Swap file \""
-msgstr "���� ����� \""
+msgstr "���� ����� �"
 
 msgid "\" already exists!"
-msgstr "\" ��� ����!"
+msgstr "� ��� ����!"
 
 msgid "VIM - ATTENTION"
-msgstr "VIM -- �����"
+msgstr "VIM � �����"
 
 msgid "Swap file already exists!"
 msgstr "���� ����� ��� ����!"
@@ -3887,7 +3933,7 @@ msgstr "E328: 
 # msgstr "E328: "
 #, c-format
 msgid "E329: No menu \"%s\""
-msgstr "E329: ���� ���� \"%s\""
+msgstr "E329: ���� ���� �%s�"
 
 #. Only a mnemonic or accelerator is not valid.
 msgid "E792: Empty menu name"
@@ -3937,7 +3983,7 @@ msgstr "E336: 
 
 # msgstr "E336: "
 msgid "E337: Menu not found - check menu names"
-msgstr "E337: ���� �� �������� -- �������� �����"
+msgstr "E337: ���� �� �������� � �������� �����"
 
 # msgstr "E337: "
 #, c-format
@@ -4053,7 +4099,6 @@ msgstr "Vim: 
 msgid "Vim: Finished.\n"
 msgstr "Vim: ���������.\n"
 
-#, c-format
 msgid "ERROR: "
 msgstr "�������: "
 
@@ -4089,7 +4134,7 @@ msgstr "E342: 
 # msgstr "E342: "
 #, c-format
 msgid "Calling shell to execute: \"%s\""
-msgstr "����������� �������� ��� ��������: \"%s\""
+msgstr "����������� �������� ��� ��������: �%s�"
 
 msgid "E545: Missing colon"
 msgstr "E545: ��������� ���������"
@@ -4115,6 +4160,9 @@ msgstr "
 msgid "Keys don't match!"
 msgstr "����� �� �������!"
 
+msgid "E854: path too long for completion"
+msgstr "E854: ���� ������� ������ ��� ����������"
+
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
@@ -4126,22 +4174,22 @@ msgstr ""
 # msgstr "E343: "
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: �� ������� ������ ������� \"%s\" � cdpath"
+msgstr "E344: �� ������� ������ ������� �%s� � cdpath"
 
 # msgstr "E344: "
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: �� ������� ������ ���� \"%s\" � path"
+msgstr "E345: �� ������� ������ ���� �%s� � path"
 
 # msgstr "E345: "
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: � cdpath ���� ����� �������� \"%s\""
+msgstr "E346: � cdpath ���� ����� �������� �%s�"
 
 # msgstr "E346: "
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: � ����� ������ ����� ���� ����� \"%s\""
+msgstr "E347: � ����� ������ ����� ���� ����� �%s�"
 
 msgid "Cannot connect to Netbeans #2"
 msgstr "�� ������� �'�������� �� Netbeans #2"
@@ -4153,7 +4201,7 @@ msgstr "
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668: ������������ ����� ������� �� ����� ���������� ��� �'������� � "
-"NetBenans: \"%s\""
+"NetBenans: �%s�"
 
 msgid "read from Netbeans socket"
 msgstr "�������� � ������ Netbeans"
@@ -4162,11 +4210,15 @@ msgstr "
 msgid "E658: NetBeans connection lost for buffer %ld"
 msgstr "E658: �������� ��'���� �� NetBeans ��� ������ %ld"
 
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: netbeans �� ����������� � ��� GUI"
+
 msgid "E511: netbeans already connected"
 msgstr "E511: netbeans ��� ��'������"
 
-msgid "E505: "
-msgstr "E505: "
+#, c-format
+msgid "E505: %s is read-only (add ! to override)"
+msgstr "E505: %s ����� ��� ������� (! ��� �� �������)"
 
 # msgstr "E348: "
 msgid "E349: No identifier under cursor"
@@ -4310,8 +4362,8 @@ msgid ""
 "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
 "%ld"
 msgstr ""
-"������� %s � %s; ����� %ld � %ld; ����� %ld � %ld; ������ %ld of %ld; ���� %"
-"ld � %ld"
+"������� %s � %s; ����� %ld � %ld; ����� %ld � %ld; ������ %ld of %ld; ���� "
+"%ld � %ld"
 
 #, c-format
 msgid "(+%ld for BOM)"
@@ -4332,6 +4384,9 @@ msgstr "E519: 
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: �� ��������� � modeline"
 
+msgid "E846: Key code not set"
+msgstr "E846: ��� ����� �� �����������"
+
 msgid "E521: Number required after ="
 msgstr "E521: ϳ��� = ������� ������� �����"
 
@@ -4349,7 +4404,7 @@ msgid "E530: Cannot change term in GUI"
 msgstr "E530: �� ������� ������ term � GUI"
 
 msgid "E531: Use \":gui\" to start the GUI"
-msgstr "E531: ���������� \":gui\" ��� ������� GUI"
+msgstr "E531: ���������� �:gui� ��� ������� GUI"
 
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: ����� 'backupext' � 'patchmode' �������"
@@ -4567,11 +4622,11 @@ msgstr "
 
 #, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-msgstr "E244: ���������� ����� ������ ������� \"%s\" � ���� ������ \"%s\""
+msgstr "E244: ���������� ����� ������ ������� �%s� � ���� ������ �%s�"
 
 #, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
-msgstr "E245: ���������� ������ %c � ���� ������ \"%s\""
+msgstr "E245: ���������� ������ %c � ���� ������ �%s�"
 
 msgid "Vim: Double signal, exiting\n"
 msgstr "Vim: ���� �������� ������, �����\n"
@@ -4663,7 +4718,7 @@ msgstr "XSMP 
 
 #, c-format
 msgid "dlerror = \"%s\""
-msgstr "dlerror = \"%s\""
+msgstr "dlerror = �%s�"
 
 msgid "Opening the X display failed"
 msgstr "�� ������� ������� ������� X"
@@ -4794,7 +4849,7 @@ msgstr "E683: 
 
 #, c-format
 msgid "Cannot open file \"%s\""
-msgstr "�� ������� ������� ���� \"%s\""
+msgstr "�� ������� ������� ���� �%s�"
 
 msgid "E681: Buffer is not loaded"
 msgstr "E681: ����� �� �����������"
@@ -5053,14 +5108,18 @@ msgstr "
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: �������� ���������� �� ���������"
 
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr "������������: �� ������� ������ ������ ��� �%s_%s.spl� �� �%s_ascii.spl�"
+
 #, c-format
 msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
 msgstr ""
-"������������: �� ������� ������ ������ ��� \"%s.%s.spl\" �� \"%s.ascii.spl\""
+"������������: �� ������� ������ ������ ��� �%s.%s.spl� �� �%s.ascii.spl�"
 
 #, c-format
 msgid "Reading spell file \"%s\""
-msgstr "�������� ���� ���������� \"%s\""
+msgstr "�������� ���� ���������� �%s�"
 
 msgid "E757: This does not look like a spell file"
 msgstr "E757: �� ����� �� ���� ����������"
@@ -5279,6 +5338,9 @@ msgstr "
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "������������ %d ��� �� ��-ASCII ���������"
 
+msgid "E845: Insufficient memory, word list will be incomplete"
+msgstr "E845: ����������� �����, ������ ��� ���� ��������"
+
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "�������� %d � %d �����; ���������� %d (%d%%)"
@@ -5355,11 +5417,11 @@ msgstr "
 #. avoid more prompt
 #, c-format
 msgid "Change \"%.*s\" to:"
-msgstr "������� \"%.*s\" ��:"
+msgstr "������� �%.*s� ��:"
 
 #, c-format
 msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
+msgstr " < �%.*s�"
 
 # msgstr "E34: "
 msgid "E752: No previous spell replacement"
@@ -5459,6 +5521,10 @@ msgstr " 
 msgid "E395: contains argument not accepted here"
 msgstr "E395: ̳����� ����������� ��� ���������"
 
+# msgstr "E14: "
+msgid "E844: invalid cchar value"
+msgstr "E844: ���������� �������� cchar"
+
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: group[t]hete ��� ������������"
 
@@ -5470,6 +5536,9 @@ msgstr "E394: 
 msgid "E397: Filename required"
 msgstr "E397: ������� ����� �����"
 
+msgid "E847: Too many syntax includes"
+msgstr "E847: �������� ������������ ��������"
+
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: ��������� ']': %s"
@@ -5483,6 +5552,9 @@ msgstr "E398: 
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: ����� ���������: ������������ ����� %s"
 
+msgid "E848: Too many syntax clusters"
+msgstr "E848: �������� ������������ ��������"
+
 msgid "E400: No cluster specified"
 msgstr "E400: ������� �� �������"
 
@@ -5542,12 +5614,12 @@ msgstr "E411: 
 # msgstr "E411: "
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: ����������� ���������: \":highlight link %s\""
+msgstr "E412: ����������� ���������: �:highlight link %s�"
 
 # msgstr "E412: "
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: �������� ���������: \":highlight link %s\""
+msgstr "E413: �������� ���������: �:highlight link %s�"
 
 # msgstr "E413: "
 msgid "E414: group has settings, highlight link ignored"
@@ -5605,6 +5677,9 @@ msgstr "E669: 
 msgid "W18: Invalid character in group name"
 msgstr "W18: ����������� ������ � ���� �����"
 
+msgid "E849: Too many highlight and syntax groups"
+msgstr "E849: �������� ���� ����������� � ����������"
+
 # msgstr "E424: "
 msgid "E555: at bottom of tag stack"
 msgstr "E555: ʳ���� ����� �崳�"
@@ -5622,13 +5697,13 @@ msgstr "E426: 
 
 # msgstr "E426: "
 msgid "  # pri kind tag"
-msgstr "  # �� ���  ��"
+msgstr "  # �� ��� ��"
 
 msgid "file\n"
 msgstr "����\n"
 
 msgid "E427: There is only one matching tag"
-msgstr "E427: ���� ����� ��������� ��"
+msgstr "E427: ���� ���� ��������� ��"
 
 # msgstr "E427: "
 msgid "E428: Cannot go beyond last matching tag"
@@ -5637,7 +5712,7 @@ msgstr "E428: 
 # msgstr "E428: "
 #, c-format
 msgid "File \"%s\" does not exist"
-msgstr "���� \"%s\" �� ����"
+msgstr "���� �%s� �� ����"
 
 #. Give an indication of the number of matching tags
 #, c-format
@@ -5652,7 +5727,7 @@ msgstr "  
 
 #, c-format
 msgid "E429: File \"%s\" does not exist"
-msgstr "E429: ���� \"%s\" �� ����"
+msgstr "E429: ���� �%s� �� ����"
 
 # msgstr "E429: "
 #. Highlight title
@@ -5671,10 +5746,13 @@ msgstr "
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: ���� ����� �崳� ��������� �� %s\n"
 
+msgid "Ignoring long line in tags file"
+msgstr "���������� ������ ����� � ���� � ����������"
+
 # msgstr "E430: "
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: ������� ������� � ���� �崳� \"%s\""
+msgstr "E431: ������� ������� � ���� �崳� �%s�"
 
 # msgstr "E431: "
 #, c-format
@@ -5690,9 +5768,6 @@ msgstr "E432: 
 msgid "E433: No tags file"
 msgstr "E433: ���� ����� �崳�"
 
-msgid "Ignoring long line in tags file"
-msgstr "���������� ������ ����� � ���� � ����������"
-
 # msgstr "E433: "
 msgid "E434: Can't find tag pattern"
 msgstr "E434: �� ������� ������ ������ ���"
@@ -5723,10 +5798,10 @@ msgstr "E559: 
 
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: ���� ������ \"%s\" ��� ��������� ��������"
+msgstr "E436: ���� ������ �%s� ��� ��������� ��������"
 
 msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: ������� ��������� �������� \"cm\""
+msgstr "E437: ������� ��������� �������� �cm�"
 
 #. Highlight title
 msgid ""
@@ -5871,8 +5946,8 @@ msgstr "
 msgid "Nothing to undo"
 msgstr "���� ������ �����������"
 
-msgid "number changes  time            saved"
-msgstr "�����  ���     ���             ���������"
+msgid "number changes  when               saved"
+msgstr "�����  ����    ���             ���������"
 
 #, c-format
 msgid "%ld seconds ago"
@@ -5975,13 +6050,6 @@ msgstr ""
 "\n"
 "����� ��� MacOS"
 
-msgid ""
-"\n"
-"RISC OS version"
-msgstr ""
-"\n"
-"����� ��� RISC OS"
-
 msgid ""
 "\n"
 "OpenVMS version"
@@ -6148,7 +6216,7 @@ msgid "by Bram Moolenaar et al."
 msgstr "�����: Bram Moolenaar �� ��."
 
 msgid "Vim is open source and freely distributable"
-msgstr "Vim -- �� ������� � ����� ��������������� ��������"
+msgstr "Vim � �� ������� � ����� ��������������� ��������"
 
 msgid "Help poor children in Uganda!"
 msgstr "��������� ������� � ������!"
@@ -6250,7 +6318,7 @@ msgstr "E446: 
 # msgstr "E446: "
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: ���� \"%s\" �� �������� � ����� ������"
+msgstr "E447: ���� �%s� �� �������� � ����� ������"
 
 #, c-format
 msgid "E370: Could not load library %s"
@@ -6352,7 +6420,7 @@ msgstr "E235: 
 # msgstr "E235: "
 #, c-format
 msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: ����� \"%s\" �� ������������"
+msgstr "E236: ����� �%s� �� ������������"
 
 msgid "E473: Internal error"
 msgstr "E473: �������� �������"
@@ -6385,11 +6453,11 @@ msgstr "E476: 
 
 #, c-format
 msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" -- �� �������"
+msgstr "E17: �%s� � �� �������"
 
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: ����������� ������ �� \"%s()\" �� ������"
+msgstr "E364: ����������� ������ �� �%s()� �� ������"
 
 #, c-format
 msgid "E448: Could not load library function %s"
@@ -6485,7 +6553,7 @@ msgstr "E36: ̳
 
 #, c-format
 msgid "E247: no registered server named \"%s\""
-msgstr "E247: ���� ������������� ������� � ������ \"%s\""
+msgstr "E247: ���� ������������� ������� � ������ �%s�"
 
 # msgstr "E36: "
 #, c-format
@@ -6552,11 +6620,11 @@ msgstr "E45: 
 
 #, c-format
 msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: ����� ����� ��� �������: \"%s\""
+msgstr "E46: ����� ����� ��� �������: �%s�"
 
 #, c-format
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: �� ����� ���������� ����� � ��������: \"%s\""
+msgstr "E794: �� ����� ���������� ����� � ��������: �%s�"
 
 msgid "E47: Error while reading errorfile"
 msgstr "E47: ������� ������� ����� �������"
@@ -6653,6 +6721,9 @@ msgstr "E139: 
 msgid "E764: Option '%s' is not set"
 msgstr "E764: ����� '%s' �� �����������"
 
+msgid "E850: Invalid register name"
+msgstr "E850: ����������� ����� �������"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "����� ����� �� �������, ������������ � ʲ���"
 
@@ -6661,7 +6732,17 @@ msgstr "
 
 #, c-format
 msgid "Need encryption key for \"%s\""
-msgstr "��� \"%s\" ������� ����: "
+msgstr "��� �%s� ������� ����: "
+
+msgid "can't delete OutputObject attributes"
+msgstr "�� ������� ������� �������� OutputObject"
+
+msgid "softspace must be an integer"
+msgstr "softspace �� ���� �����"
+
+# msgstr "E180: "
+msgid "invalid attribute"
+msgstr "������������ �������"
 
 msgid "writelines() requires list of strings"
 msgstr "��� writelines() ������� ������ �����"
@@ -6672,6 +6753,61 @@ msgstr "E264: Python: 
 msgid "no such buffer"
 msgstr "������ ������ ����"
 
+# msgstr "E406: "
+msgid "empty keys are not allowed"
+msgstr "������� ����� �� ���������"
+
+msgid "failed to add key to dictionary"
+msgstr "�� ������� ������ ���� �� ��������"
+
+msgid "Cannot delete DictionaryObject attributes"
+msgstr "�� ������� ������� �������� DictionaryObject"
+
+msgid "Cannot modify fixed dictionary"
+msgstr "�� ����� ������ ���������� �������"
+
+msgid "Only boolean objects are allowed"
+msgstr "��������� ����� ������ �ᒺ���"
+
+msgid "Cannot set this attribute"
+msgstr "�� ����� ���������� ��� �������"
+
+msgid "no such key in dictionary"
+msgstr "���� ������ ����� � ��������"
+
+msgid "dict is locked"
+msgstr "������� �����������"
+
+msgid "internal error: failed to get vim list item"
+msgstr "�������� �������: �� ������� �������� ������� ������ vim"
+
+msgid "list is locked"
+msgstr "������ �����������"
+
+msgid "Failed to add item to list"
+msgstr "�� ������� ������ ������� �� ������"
+
+msgid "internal error: no vim list item"
+msgstr "�������� �������: ���� �������� ������ vim"
+
+msgid "can only assign lists to slice"
+msgstr "����� ����������� ������ ����� �����"
+
+msgid "internal error: failed to add item to list"
+msgstr "�������� �������: �� ������� ������ ������� �� ������"
+
+msgid "can only concatenate with lists"
+msgstr "����� 璺������� ����� � ��������"
+
+msgid "Cannot modify fixed list"
+msgstr "�� ����� ������ ���������� ������"
+
+msgid "'self' argument must be a dictionary"
+msgstr "�������� �self� �� ���� ���������"
+
+msgid "failed to run function"
+msgstr "�� ������� �������� �������"
+
 msgid "attempt to refer to deleted window"
 msgstr "������ ���������� �� ��������� ����"
 
@@ -6699,43 +6835,11 @@ msgstr "
 msgid "attempt to refer to deleted buffer"
 msgstr "������ ��������� �� ��������� ������"
 
-#~ msgid "-name <name>\t\tUse resource as if vim was <name>"
-#~ msgstr "-name <�����>\t\t����������� �������, ���� vim �� ������ <�����>"
+msgid "unable to convert to vim structure"
+msgstr "�� ������� ����������� �� ��������� vim"
 
-#~ msgid "\t\t\t  (Unimplemented)\n"
-#~ msgstr "\t\t\t  (�� 䳺)\n"
+msgid "NULL reference passed"
+msgstr "�������� ��������� NULL"
 
-#~ msgid "E396: containedin argument not accepted here"
-#~ msgstr "E396: �������� containedin ��� ������������"
-
-# msgstr "E232: "
-#~ msgid "Vim dialog..."
-#~ msgstr "ij���� Vim..."
-
-# msgstr "E234: "
-#~ msgid "Font Selection"
-#~ msgstr "������� �����"
-
-# msgstr "E289: "
-#~ msgid "E290: over-the-spot style requires fontset"
-#~ msgstr "E290: ����� over-the-spot ������ ���� ������"
-
-# msgstr "E290: "
-#~ msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-#~ msgstr "E291: � ��� ������ �� 1.2.3 ����� GTK+. ������� ����� ��������"
-
-# msgstr "E291: "
-#~ msgid "E292: Input Method Server is not running"
-#~ msgstr "E292: ������ ������ ����� �� ���������"
-
-#~ msgid "with GTK-GNOME GUI."
-#~ msgstr "� GUI GTK-GNOME."
-
-#~ msgid "with GTK GUI."
-#~ msgstr "� GUI GTK."
-
-#~ msgid "[NL found]"
-#~ msgstr "[�������� NL]"
-
-#~ msgid "E569: maximum number of cscope connections reached"
-#~ msgstr "E569: ʳ������ �'������ � cscope ������� ���������"
+msgid "internal error: invalid value type"
+msgstr "�������� �������: ������������ ��� ��������"
diff --git a/src/po/uk.po b/src/po/uk.po
index 06722ab279..cd79bdc7ca 100644
--- a/src/po/uk.po
+++ b/src/po/uk.po
@@ -14,10 +14,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vim 7.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 12:13+0300\n"
+"POT-Creation-Date: 2013-01-17 10:06+0200\n"
 "PO-Revision-Date: 2010-06-18 21:53+0300\n"
 "Last-Translator: Анатолій Сахнік <sakhnik@gmail.com>\n"
 "Language-Team: Bohdan Vlasyuk <bohdan@vstu.edu.ua>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -43,6 +44,9 @@ msgstr "[Список місць]"
 msgid "[Quickfix List]"
 msgstr "[Список виправлень]"
 
+msgid "E855: Autocommands caused command to abort"
+msgstr "E855: Автокоманди призвели до скасування команди"
+
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: Немає можливості розмістити хоч один буфер, завершення роботи..."
 
@@ -174,7 +178,6 @@ msgstr "Знизу"
 msgid "Top"
 msgstr "Вгорі"
 
-#, c-format
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -235,11 +238,11 @@ msgstr ""
 
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: Не вдалося знайти буфер \"%s\""
+msgstr "E102: Не вдалося знайти буфер «%s»"
 
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: Буфер \"%s\" не в режимі порівняння"
+msgstr "E103: Буфер «%s» не в режимі порівняння"
 
 msgid "E787: Buffer changed unexpectedly"
 msgstr "E787: Буфер несподівано змінився"
@@ -302,6 +305,13 @@ msgstr " Доповнення місцевих ключових слів (^N^P)"
 msgid "Hit end of paragraph"
 msgstr "Трапився кінець параграфа"
 
+# msgstr "E443: "
+msgid "E839: Completion function changed window"
+msgstr "E839: Функція доповнення змінила вікно"
+
+msgid "E840: Completion function deleted text"
+msgstr "E840: Функція доповнення знищила текст"
+
 msgid "'dictionary' option is empty"
 msgstr "Опція 'dictionary' порожня"
 
@@ -448,7 +458,7 @@ msgid "E711: List value has not enough items"
 msgstr "E711: Список має недостатньо елементів"
 
 msgid "E690: Missing \"in\" after :for"
-msgstr "E690: Пропущено \"in\" після :for"
+msgstr "E690: Пропущено «in» після :for"
 
 #, c-format
 msgid "E107: Missing parentheses: %s"
@@ -456,7 +466,7 @@ msgstr "E107: Пропущено дужки: %s"
 
 #, c-format
 msgid "E108: No such variable: \"%s\""
-msgstr "E108: Змінної немає: \"%s\""
+msgstr "E108: Змінної немає: «%s»"
 
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: Змінна має забагато вкладень щоб бути за-/відкритою."
@@ -501,11 +511,11 @@ msgstr "E113: Невідома опція: %s"
 
 #, c-format
 msgid "E114: Missing quote: %s"
-msgstr "E114: Бракує '\"': %s"
+msgstr "E114: Бракує лапки: %s"
 
 #, c-format
 msgid "E115: Missing quote: %s"
-msgstr "E115: Бракує \"'\": %s"
+msgstr "E115: Бракує лапки: %s"
 
 # msgstr "E404: "
 #, c-format
@@ -523,7 +533,7 @@ msgstr "E720: Бракує двокрапки у словнику: %s"
 
 #, c-format
 msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Повторення ключа в словнику: \"%s\""
+msgstr "E721: Повторення ключа в словнику: «%s»"
 
 # msgstr "E235: "
 #, c-format
@@ -565,6 +575,10 @@ msgstr "E725: Виклик dict-функції без словника: %s"
 msgid "E808: Number or Float required"
 msgstr "E808: Треба вказати Number чи Float"
 
+# msgstr "E14: "
+msgid "add() argument"
+msgstr "аргумент add()"
+
 msgid "E699: Too many arguments"
 msgstr "E699: Забагато аргументів"
 
@@ -580,11 +594,23 @@ msgstr "E785: complete() можна вживати тільки в режимі
 msgid "&Ok"
 msgstr "&O:Гаразд"
 
+# msgstr "E14: "
+msgid "extend() argument"
+msgstr "аргумент extend()"
+
 # msgstr "E226: "
 #, c-format
 msgid "E737: Key already exists: %s"
 msgstr "E737: Ключ вже існує: %s"
 
+# msgstr "E14: "
+msgid "map() argument"
+msgstr "аргумент map()"
+
+# msgstr "E14: "
+msgid "filter() argument"
+msgstr "аргумент filter()"
+
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld рядків: "
@@ -603,6 +629,10 @@ msgstr ""
 msgid "called inputrestore() more often than inputsave()"
 msgstr "Виклики до inputrestore() частіше, ніж до inputsave()"
 
+# msgstr "E14: "
+msgid "insert() argument"
+msgstr "аргумент insert()"
+
 # msgstr "E406: "
 msgid "E786: Range not allowed"
 msgstr "E786: Інтервал не дозволено"
@@ -630,12 +660,24 @@ msgstr "E241: Не вдалося відіслати до %s"
 msgid "E277: Unable to read a server reply"
 msgstr "E277: Не вдалося прочитати відповідь сервера"
 
+# msgstr "E14: "
+msgid "remove() argument"
+msgstr "аргумент remove()"
+
 msgid "E655: Too many symbolic links (cycle?)"
 msgstr "E655: Забагато символьних посилань (цикл?)"
 
+# msgstr "E14: "
+msgid "reverse() argument"
+msgstr "аргумент reverse()"
+
 msgid "E258: Unable to send to client"
 msgstr "E258: Не вдалося надіслати клієнту"
 
+# msgstr "E14: "
+msgid "sort() argument"
+msgstr "аргумент sort()"
+
 # msgstr "E364: "
 msgid "E702: Sort compare function failed"
 msgstr "E702: Помилка у функції порівняння"
@@ -672,14 +714,6 @@ msgstr "E731: Dictionary вжито як String"
 msgid "E806: using Float as a String"
 msgstr "E806: Float вжито як String"
 
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: Назва змінної Funcref має починатися з великої літери: %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: Назва змінної співпадає з існуючою функцією: %s"
-
 #, c-format
 msgid "E706: Variable type mismatch for: %s"
 msgstr "E706: Неправильний тип змінної: %s"
@@ -688,6 +722,14 @@ msgstr "E706: Неправильний тип змінної: %s"
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: Не можна знищити змінну %s"
 
+#, c-format
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Назва змінної Funcref має починатися з великої літери: %s"
+
+#, c-format
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: Назва змінної співпадає з існуючою функцією: %s"
+
 #, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: Значення захищене: %s"
@@ -714,6 +756,10 @@ msgstr "E124: Бракує '(': %s"
 msgid "E125: Illegal argument: %s"
 msgstr "E125: Недозволений аргумент: %s"
 
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: Назва аргументу повторюється: %s"
+
 msgid "E126: Missing :endfunction"
 msgstr "E126: Бракує :endfunction"
 
@@ -785,7 +831,7 @@ msgid "No old files"
 msgstr "Жодного старого файлу"
 
 msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "Режим налагодження.  Щоб продовжити введіть \"cont\"."
+msgstr "Режим налагодження.  Щоб продовжити введіть «cont»."
 
 #, c-format
 msgid "line %ld: %s"
@@ -797,7 +843,7 @@ msgstr "команда: %s"
 
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %ld"
-msgstr "Точка зупинки в \"%s%s\" рядок %ld"
+msgstr "Точка зупинки в «%s%s» рядок %ld"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -811,21 +857,21 @@ msgid "%3d  %s %s  line %ld"
 msgstr "%3d %s %s   рядок %ld"
 
 msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: Спочатку зробіть \":profile start {файл}\""
+msgstr "E750: Спочатку зробіть «:profile start {файл}»"
 
 msgid "Save As"
 msgstr "Зберегти як"
 
 #, c-format
 msgid "Save changes to \"%s\"?"
-msgstr "Зберегти зміни в \"%s\"?"
+msgstr "Зберегти зміни в «%s»?"
 
 msgid "Untitled"
 msgstr "Неназваний"
 
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: Буфер \"%s\" має незбережені зміни"
+msgstr "E162: Буфер «%s» має незбережені зміни"
 
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr ""
@@ -847,38 +893,38 @@ msgstr "E666: Компілятор не підтримується: %s"
 # msgstr "E195: "
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
-msgstr "Пошук \"%s\" в \"%s\""
+msgstr "Пошук «%s» в «%s»"
 
 #, c-format
 msgid "Searching for \"%s\""
-msgstr "Пошук \"%s\""
+msgstr "Пошук «%s»"
 
 #, c-format
 msgid "not found in 'runtimepath': \"%s\""
-msgstr "В 'runtimepath' не знайдено \"%s\""
+msgstr "В 'runtimepath' не знайдено «%s»"
 
 msgid "Source Vim script"
 msgstr "Прочитати скрипт Vim"
 
 #, c-format
 msgid "Cannot source a directory: \"%s\""
-msgstr "Не вдалося прочитати каталог: \"%s\""
+msgstr "Не вдалося прочитати каталог: «%s»"
 
 #, c-format
 msgid "could not source \"%s\""
-msgstr "Не вдалося виконати \"%s\""
+msgstr "Не вдалося виконати «%s»"
 
 #, c-format
 msgid "line %ld: could not source \"%s\""
-msgstr "рядок %ld: не вдалося виконати \"%s\""
+msgstr "рядок %ld: не вдалося виконати «%s»"
 
 #, c-format
 msgid "sourcing \"%s\""
-msgstr "виконується \"%s\""
+msgstr "виконується «%s»"
 
 #, c-format
 msgid "line %ld: sourcing \"%s\""
-msgstr "рядок %ld: виконується \"%s\""
+msgstr "рядок %ld: виконується «%s»"
 
 #, c-format
 msgid "finished sourcing %s"
@@ -912,11 +958,11 @@ msgstr "E168: :finish використано поза виконуваним ф
 
 #, c-format
 msgid "Current %slanguage: \"%s\""
-msgstr "Мова (%s): \"%s\""
+msgstr "Мова (%s): «%s»"
 
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: Не вдалося встановити мову \"%s\""
+msgstr "E197: Не вдалося встановити мову «%s»"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
@@ -959,7 +1005,7 @@ msgstr "E136: viminfo: Забагато помилок, решта файлу б
 
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "Зчитується файл viminfo: \"%s\"%s%s%s"
+msgstr "Зчитується файл viminfo: «%s»%s%s%s"
 
 msgid " info"
 msgstr " інформація"
@@ -976,7 +1022,7 @@ msgstr " НЕ ВДАЛОСЯ"
 #. avoid a wait_return for this message, it's annoying
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Не дозволено запис у файл viminfo: \"%s\""
+msgstr "E137: Не дозволено запис у файл viminfo: %s"
 
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
@@ -984,14 +1030,13 @@ msgstr "E138: Не вдалося записати файл viminfo %s!"
 
 #, c-format
 msgid "Writing viminfo file \"%s\""
-msgstr "Записується файл viminfo \"%s\""
+msgstr "Записується файл viminfo «%s»"
 
 #. Write the info:
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# Цей файл автоматично створений Vim %s.\n"
 
-#, c-format
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -999,7 +1044,6 @@ msgstr ""
 "# Можете редагувати, але ОБЕРЕЖНО!\n"
 "\n"
 
-#, c-format
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# Значення 'encoding' під час створення цього файлу\n"
 
@@ -1014,11 +1058,11 @@ msgstr "E140: Використайте ! для запису частини бу
 
 #, c-format
 msgid "Overwrite existing file \"%s\"?"
-msgstr "Переписати існуючий файл \"%s\"?"
+msgstr "Переписати існуючий файл «%s»?"
 
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "Файл обміну \"%s\" існує, перезаписати?"
+msgstr "Файл обміну «%s» існує, перезаписати?"
 
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
@@ -1036,7 +1080,7 @@ msgid ""
 "'readonly' option is set for \"%s\".\n"
 "Do you wish to write anyway?"
 msgstr ""
-"Для \"%s\" встановлено 'readonly'.\n"
+"Для «%s» встановлено 'readonly'.\n"
 "Бажаєте все одно продовжити запис?"
 
 #, c-format
@@ -1045,13 +1089,13 @@ msgid ""
 "It may still be possible to write it.\n"
 "Do you wish to try?"
 msgstr ""
-"Файл \"%s\" дозволено тільки читати.\n"
+"Файл «%s» дозволено тільки читати.\n"
 "Проте, можливо, його можна записати.\n"
 "Хочете спробувати?"
 
 #, c-format
 msgid "E505: \"%s\" is read-only (add ! to override)"
-msgstr "E505: \"%s\" тільки для читання (! щоб не зважати)"
+msgstr "E505: «%s» тільки для читання (! щоб не зважати)"
 
 msgid "Edit File"
 msgstr "Редагувати Файл"
@@ -1108,7 +1152,6 @@ msgstr "E148: У global бракує зразка"
 msgid "Pattern found in every line: %s"
 msgstr "Зразок знайдено у кожному рядку: %s"
 
-#, c-format
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -1131,7 +1174,7 @@ msgstr "E149: Вибачте, немає допомоги для %s"
 
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
-msgstr "Вибачте, файл допомоги \"%s\" не знайдено"
+msgstr "Вибачте, файл допомоги «%s» не знайдено"
 
 #, c-format
 msgid "E150: Not a directory: %s"
@@ -1151,7 +1194,7 @@ msgstr "E670: Мішанина кодувань файлу допомоги дл
 
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: Повторення теґу \"%s\" у файлі %s/%s"
+msgstr "E154: Повторення теґу «%s» у файлі %s/%s"
 
 #, c-format
 msgid "E160: Unknown sign command: %s"
@@ -1192,7 +1235,7 @@ msgid "[Deleted]"
 msgstr "[Знищено]"
 
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "Режим Ex. Для повернення до нормального режиму виконайте \"visual\""
+msgstr "Режим Ex. Для повернення до нормального режиму виконайте «visual»"
 
 msgid "E501: At end-of-file"
 msgstr "E501: Кінець файлу"
@@ -1220,7 +1263,7 @@ msgid "E493: Backwards range given"
 msgstr "E493: Інтервал задано навиворіт"
 
 msgid "Backwards range given, OK to swap"
-msgstr "Інтервал задано навиворіт, щоб поміняти місцями -- ГАРАЗД"
+msgstr "Інтервал задано навиворіт, щоб поміняти місцями — ГАРАЗД"
 
 msgid "E494: Use w or w>>"
 msgstr "E494: Спробуйте w або w>>"
@@ -1288,6 +1331,9 @@ msgstr "E182: Неправильна назва команди"
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr "E183: Команди користувача повинні починатися з великої літери"
 
+msgid "E841: Reserved name, cannot be used for user defined command"
+msgstr "E841: Зарезервована назва, не можна використати для користувацької команди"
+
 # msgstr "E183: "
 #, c-format
 msgid "E184: No such user-defined command: %s"
@@ -1309,8 +1355,8 @@ msgstr "Невідомо"
 
 # msgstr "E184: "
 #, c-format
-msgid "E185: Cannot find color scheme %s"
-msgstr "E185: Не вдалося знайти схему кольорів %s"
+msgid "E185: Cannot find color scheme '%s'"
+msgstr "E185: Не вдалося знайти схему кольорів «%s»"
 
 msgid "Greetings, Vim user!"
 msgstr "Вітання, користувачу Vim!"
@@ -1380,12 +1426,12 @@ msgstr "E739: Не вдалося створити каталог: %s"
 
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
-msgstr "E189: Файл \"%s\" існує (! щоб не зважати)"
+msgstr "E189: Файл «%s» існує (! щоб не зважати)"
 
 # msgstr "E189: "
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: Не вдалося відкрити \"%s\" для запису"
+msgstr "E190: Не вдалося відкрити «%s» для запису"
 
 # msgstr "E190: "
 #. set mark
@@ -1404,23 +1450,26 @@ msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: Немає назви вторинного файлу для заміни '#'"
 
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
-msgstr "E495: Немає назви файлу автокоманди для заміни \"<afile>\""
+msgstr "E495: Немає назви файлу автокоманди для заміни «<afile>»"
 
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: Немає номера буфера автокоманди для заміни \"<abuf>\""
+msgstr "E496: Немає номера буфера автокоманди для заміни «<abuf>»"
 
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
-msgstr "E497: Немає назви збігу автокоманди для заміни \"<amatch>\""
+msgstr "E497: Немає назви збігу автокоманди для заміни «<amatch>»"
 
 msgid "E498: no :source file name to substitute for \"<sfile>\""
-msgstr "E498: Немає назви файлу :source для заміни \"<sfile>\""
+msgstr "E498: Немає назви файлу :source для заміни «<sfile>»"
+
+msgid "E842: no line number to use for \"<slnum>\""
+msgstr "E842: немає номера рядка, щоб використати з «<sfile>»"
 
 #, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "E499: Назва файлу для '%' чи '#' порожня, працює лише з \":p:h\""
+msgstr "E499: Назва файлу для '%' чи '#' порожня, працює лише з «:p:h»"
 
 msgid "E500: Evaluates to an empty string"
-msgstr "E500: Результат -- порожній рядок"
+msgstr "E500: Результат — порожній рядок"
 
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: Не вдалося прочитати файл viminfo"
@@ -1652,6 +1701,9 @@ msgstr "[НЕ конвертовано]"
 msgid "[converted]"
 msgstr "[конвертовано]"
 
+msgid "[blowfish]"
+msgstr "[blowfish]"
+
 msgid "[crypted]"
 msgstr "[зашифровано]"
 
@@ -1853,50 +1905,50 @@ msgstr "Ви справді хочете його переписати??"
 
 #, c-format
 msgid "E208: Error writing to \"%s\""
-msgstr "E208: Помилка запису у \"%s\""
+msgstr "E208: Помилка запису у «%s»"
 
 #, c-format
 msgid "E209: Error closing \"%s\""
-msgstr "E209: Помилка закриття \"%s\""
+msgstr "E209: Помилка закриття «%s»"
 
 #, c-format
 msgid "E210: Error reading \"%s\""
-msgstr "E210: Помилка читання \"%s\""
+msgstr "E210: Помилка читання «%s»"
 
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: Автокоманда FileChangedShell знищила буфер"
 
 #, c-format
 msgid "E211: File \"%s\" no longer available"
-msgstr "E211: Файл \"%s\" більше не досяжний"
+msgstr "E211: Файл «%s» більше не досяжний"
 
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
-msgstr "W12: Застереження: Файл \"%s\" змінився, але й буфер у Vim також"
+msgstr "W12: Застереження: Файл «%s» змінився, але й буфер у Vim також"
 
 msgid "See \":help W12\" for more info."
-msgstr "Див. \":help W12\" для уточнення."
+msgstr "Див. «:help W12» для уточнення."
 
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: Застереження: Файл \"%s\" змінився після початку редагування"
+msgstr "W11: Застереження: Файл «%s» змінився після початку редагування"
 
 msgid "See \":help W11\" for more info."
-msgstr "Див. \":help W11\" для уточнення."
+msgstr "Див. «:help W11» для уточнення."
 
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr ""
-"W16: Застереження: Режим файлу \"%s\" змінився після початку редагування"
+"W16: Застереження: Режим файлу «%s» змінився після початку редагування"
 
 msgid "See \":help W16\" for more info."
-msgstr "Див. \":help W16\" для уточнення."
+msgstr "Див. «:help W16» для уточнення."
 
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: Застереження: Файл \"%s\" було створено після початку редагування"
+msgstr "W13: Застереження: Файл «%s» було створено після початку редагування"
 
 msgid "Warning"
 msgstr "Застереження"
@@ -1910,11 +1962,11 @@ msgstr ""
 
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
-msgstr "E462: Не вдалося підготувати \"%s\" для перечитання"
+msgstr "E462: Не вдалося підготувати «%s», щоб перечитати"
 
 #, c-format
 msgid "E321: Could not reload \"%s\""
-msgstr "E321: Не вдалося перечитати \"%s\""
+msgstr "E321: Не вдалося перечитати «%s»"
 
 msgid "--Deleted--"
 msgstr "--Знищено--"
@@ -1926,7 +1978,7 @@ msgstr "Автоматичне знищення автокоманди: %s <бу
 #. the group doesn't exist
 #, c-format
 msgid "E367: No such group: \"%s\""
-msgstr "E367: Немає такої групи: \"%s\""
+msgstr "E367: Немає такої групи: «%s»"
 
 #, c-format
 msgid "E215: Illegal character after *: %s"
@@ -1968,7 +2020,7 @@ msgstr "E218: Забагато вкладених автокоманд"
 # msgstr "E218: "
 #, c-format
 msgid "%s Auto commands for \"%s\""
-msgstr "Автокоманди %s для \"%s\""
+msgstr "Автокоманди %s для «%s»"
 
 #, c-format
 msgid "Executing %s"
@@ -2067,6 +2119,12 @@ msgstr "Scrollbar Widget: Не вдалося визначити розмір с
 msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr "E232: Не вдалося створити BalloonEval з повідомленням і функцією"
 
+msgid "E851: Failed to create a new process for the GUI"
+msgstr "E851: Не вдалося створити новий процес для GUI"
+
+msgid "E852: The child process failed to start the GUI"
+msgstr "E852: Дочірній процес не зміг запустити GUI"
+
 # msgstr "E228: "
 msgid "E229: Cannot start the GUI"
 msgstr "E229: Не вдалося запустити GUI"
@@ -2074,7 +2132,7 @@ msgstr "E229: Не вдалося запустити GUI"
 # msgstr "E229: "
 #, c-format
 msgid "E230: Cannot read from \"%s\""
-msgstr "E230: Не вдалося прочитати з \"%s\""
+msgstr "E230: Не вдалося прочитати з «%s»"
 
 msgid "E665: Cannot start GUI, no valid font found"
 msgstr "E665: Не вдалося запустити GUI, не знайдено шрифт"
@@ -2148,7 +2206,7 @@ msgid "Replace All"
 msgstr "Замінити усі"
 
 msgid "Vim: Received \"die\" request from session manager\n"
-msgstr "Vim: Отримав запит \"die\" від менеджера сесій\n"
+msgstr "Vim: Отримав запит «die» від менеджера сесій\n"
 
 msgid "Close"
 msgstr "Закрити"
@@ -2200,11 +2258,11 @@ msgstr "&U:Скасувати"
 
 #, c-format
 msgid "E671: Cannot find window title \"%s\""
-msgstr "E671: Не вдалося знайти вікно \"%s\""
+msgstr "E671: Не вдалося знайти вікно «%s»"
 
 #, c-format
 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-msgstr "E243: Аргумент не підтримується: \"-%s\"; користуйтесь версією з OLE."
+msgstr "E243: Аргумент не підтримується: «-%s»; користуйтесь версією з OLE."
 
 msgid "E672: Unable to open window inside MDI application"
 msgstr "E672: Не вдалося відкрити вікно всередині програми MDI"
@@ -2349,23 +2407,23 @@ msgstr "E455: Не вдалося записати вихідний файл Pos
 
 #, c-format
 msgid "E624: Can't open file \"%s\""
-msgstr "E624: Не вдалося відкрити файл \"%s\""
+msgstr "E624: Не вдалося відкрити файл «%s»"
 
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: Не вдалося прочитати файл ресурсів PostScript \"%s\""
+msgstr "E457: Не вдалося прочитати файл ресурсів PostScript «%s»"
 
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: \"%s\" не є файлом ресурсів PostScript"
+msgstr "E618: «%s» не є файлом ресурсів PostScript"
 
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: \"%s\" не є підтримуваним файлом ресурсів PostScript"
+msgstr "E619: «%s» не є підтримуваним файлом ресурсів PostScript"
 
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: Неправильна версія файлу ресурсів \"%s\""
+msgstr "E621: Неправильна версія файлу ресурсів «%s»"
 
 msgid "E673: Incompatible multi-byte encoding and character set."
 msgstr "E673: Несумісні багатобайтове кодування й набір символів."
@@ -2382,21 +2440,21 @@ msgstr "E324: Не вдалося відкрити файл PostScript для в
 
 #, c-format
 msgid "E456: Can't open file \"%s\""
-msgstr "E456: Не вдалося відкрити файл \"%s\""
+msgstr "E456: Не вдалося відкрити файл «%s»"
 
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: Не вдалося знайти файл ресурсів PostScript \"prolog.ps\""
+msgstr "E456: Не вдалося знайти файл ресурсів PostScript «prolog.ps»"
 
 msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: Не вдалося знайти файл ресурсів PostScript \"cidfont.ps\""
+msgstr "E456: Не вдалося знайти файл ресурсів PostScript «cidfont.ps»"
 
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: Не вдалося знайти файл ресурсів PostScript \"%s.ps\""
+msgstr "E456: Не вдалося знайти файл ресурсів PostScript «%s.ps»"
 
 #, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620: Не вдалося перетворити до кодування друку \"%s\""
+msgstr "E620: Не вдалося перетворити до кодування друку «%s»"
 
 msgid "Sending to printer..."
 msgstr "Відсилається на принтер..."
@@ -2509,7 +2567,7 @@ msgid ""
 "       g: Find this definition\n"
 "       i: Find files #including this file\n"
 "       s: Find this C symbol\n"
-"       t: Find assignments to\n"
+"       t: Find this text string\n"
 msgstr ""
 "\n"
 "       c: Знайти функції, що викликають цю функцію\n"
@@ -2519,7 +2577,7 @@ msgstr ""
 "       g: Знайти це визначення\n"
 "       i: Знайти файли, які включають в себе цей файл\n"
 "       s: Знайти цей символ C\n"
-"       t: Знайти присвоєння цьому\n"
+"       t: Знайти цей текст\n"
 
 #, c-format
 msgid "E625: cannot open cscope database: %s"
@@ -2632,12 +2690,12 @@ msgstr "номер рядка за межами файлу"
 msgid "not allowed in the Vim sandbox"
 msgstr "не дозволено у пісочниці Vim"
 
-msgid "E836: This Vim cannot execute :python after using :py3"
-msgstr "E836: Python: Не можна використати :py і :py3 в одному сеансі"
-
 msgid "E837: This Vim cannot execute :py3 after using :python"
 msgstr "E837: Python: Не можна використати :py і :py3 в одному сеансі"
 
+msgid "only string keys are allowed"
+msgstr "Дозволено тільки текстові ключі"
+
 msgid ""
 "E263: Sorry, this command is disabled, the Python library could not be "
 "loaded."
@@ -2645,23 +2703,28 @@ msgstr ""
 "E263: Вибачте, ця команда вимкнена, бібліотека Python не може бути "
 "завантажена."
 
-msgid "can't delete OutputObject attributes"
-msgstr "не вдалося знищити атрибути OutputObject"
+msgid "E860: Eval did not return a valid python 3 object"
+msgstr "E860: Eval не повернув дійсний об’єкт python 3"
 
-msgid "softspace must be an integer"
-msgstr "softspace має бути цілим"
-
-# msgstr "E180: "
-msgid "invalid attribute"
-msgstr "неправильний атрибут"
+msgid "E861: Failed to convert returned python 3 object to vim value"
+msgstr "E861: Не вдалося перетворити об’єкт python 3 у значення vim"
 
 #, c-format
 msgid "<buffer object (deleted) at %p>"
 msgstr "<об'єкт буфера (знищено) за адресою %p>"
 
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836: Python: Не можна використати :py і :py3 в одному сеансі"
+
 msgid "E659: Cannot invoke Python recursively"
 msgstr "E659: Не можна рекурсивно викликати Python"
 
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: Eval не повернув дійсний об’єкт python"
+
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: Не вдалося перетворити об’єкт python у значення vim"
+
 msgid "E265: $_ must be an instance of String"
 msgstr "E265: $_ має бути екземпляром String"
 
@@ -2846,12 +2909,6 @@ msgid ""
 msgstr ""
 "E571: Вибачте, ця команда вимкнена, бібліотека Tcl не може бути завантажена."
 
-msgid ""
-"E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim.org"
-msgstr ""
-"E281: ПОМИЛКА TCL: код виходу не є цілим!? Будь ласка, повідомте у vim-"
-"dev@vim.org"
-
 #, c-format
 msgid "E572: exit code %d"
 msgstr "E572: Код виходу %d"
@@ -2863,7 +2920,7 @@ msgid "Unable to register a command server name"
 msgstr "Не вдалося зареєструвати назву сервера команд"
 
 msgid "E248: Failed to send command to the destination program"
-msgstr "E248: Не вдалося відіслати команду до програми-призначення"
+msgstr "E248: Не вдалося відіслати команду до програми-цілі"
 
 #, c-format
 msgid "E573: Invalid server id used: %s"
@@ -2886,7 +2943,7 @@ msgstr "Сміття після аргументу опції"
 
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
 msgstr ""
-"Забагато аргументів у \"+команда\", \"-c команда\" або \"--cmd команда\""
+"Забагато аргументів у «+команда», «-c команда» або «--cmd команда»"
 
 # msgstr "E14: "
 msgid "Invalid argument for"
@@ -2929,7 +2986,7 @@ msgstr "команди перед vimrc"
 
 #, c-format
 msgid "E282: Cannot read from \"%s\""
-msgstr "E282: Не вдалося прочитати з \"%s\""
+msgstr "E282: Не вдалося прочитати з «%s»"
 
 # msgstr "E282: "
 msgid ""
@@ -2937,7 +2994,7 @@ msgid ""
 "More info with: \"vim -h\"\n"
 msgstr ""
 "\n"
-"Дізнайтеся більше: \"vim -h\"\n"
+"Дізнайтеся більше: «vim -h»\n"
 
 msgid "[file ..]       edit specified file(s)"
 msgstr "[файл ..]       редагувати вказані файли"
@@ -3000,31 +3057,34 @@ msgid "-unregister\t\tUnregister gvim for OLE"
 msgstr "-unregister\t\tСкасувати реєстрацію цього gvim для OLE"
 
 msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-msgstr "-g\t\t\tЗапустити GUI (ніби \"gvim\")"
+msgstr "-g\t\t\tЗапустити GUI (ніби «gvim»)"
 
 msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
 msgstr "-f  чи  --nofork\tПередній план: тримати термінал після запуску GUI"
 
 msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\tРежим Vi (ніби \"vi\")"
+msgstr "-v\t\t\tРежим Vi (ніби «vi»)"
 
 msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\tРежим Ex (ніби \"ex\")"
+msgstr "-e\t\t\tРежим Ex (ніби «ex»)"
+
+msgid "-E\t\t\tImproved Ex mode"
+msgstr "-E\t\t\tПокращений режим Ex"
 
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\tМовчазний (пакетний) режим (лише для \"ex\")"
+msgstr "-s\t\t\tМовчазний (пакетний) режим (лише для «ex»)"
 
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tРежим порівняння (ніби \"vimdiff\")"
+msgstr "-d\t\t\tРежим порівняння (ніби «vimdiff»)"
 
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\tПростий режим (ніби \"evim\", без режимів)"
+msgstr "-y\t\t\tПростий режим (ніби «evim», без режимів)"
 
 msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\tРежим перегляду (ніби \"view\")"
+msgstr "-R\t\t\tРежим перегляду (ніби «view»)"
 
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\tОбмежений режим (ніби \"rvim\")"
+msgstr "-Z\t\t\tОбмежений режим (ніби «rvim»)"
 
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\tЗміни (запис файлів) не дозволено"
@@ -3247,19 +3307,6 @@ msgstr "+reverse\t\tНе обертати кольори (також: +rv)"
 msgid "-xrm <resource>\tSet the specified resource"
 msgstr "-xrm <ресурс>\t\tВстановити зазначений ресурс"
 
-msgid ""
-"\n"
-"Arguments recognised by gvim (RISC OS version):\n"
-msgstr ""
-"\n"
-"Аргументи gvim (версія RISC OS):\n"
-
-msgid "--columns <number>\tInitial width of window in columns"
-msgstr "--columns <кількість>\tПочаткова кількість колонок вікна"
-
-msgid "--rows <number>\tInitial height of window in rows"
-msgstr "--rows <кількість>\tПочаткова кількість рядків вікна"
-
 msgid ""
 "\n"
 "Arguments recognised by gvim (GTK+ version):\n"
@@ -3277,6 +3324,9 @@ msgstr ""
 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
 msgstr "--socketid <xid>\tВідкрити Vim в іншому елементі інтерфейсу GTK"
 
+msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+msgstr "--echo-wid\t\tХай gvim надрукує ідентифікатор вікна на stdout"
+
 msgid "-P <parent title>\tOpen Vim inside parent application"
 msgstr "-P <заголовок батька>\tВідкрити Vim всередині батьківського вікна"
 
@@ -3309,7 +3359,7 @@ msgstr "Не встановлено жодної помітки"
 
 #, c-format
 msgid "E283: No marks matching \"%s\""
-msgstr "E283: Помітку \"%s\" не знайдено"
+msgstr "E283: Помітку «%s» не знайдено"
 
 # msgstr "E283: "
 #. Highlight title
@@ -3338,7 +3388,6 @@ msgstr ""
 "змінити ряд. стовп. текст"
 
 # TODO
-#, c-format
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3347,7 +3396,6 @@ msgstr ""
 "# Помітки:\n"
 
 #. Write the jumplist with -'
-#, c-format
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3356,7 +3404,6 @@ msgstr ""
 "# Список переходів (від найновіших):\n"
 
 # TODO
-#, c-format
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -3422,6 +3469,9 @@ msgstr "E298: Немає блоку 1?"
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: Немає блоку 2?"
 
+msgid "E843: Error while updating swap file crypt"
+msgstr "E843: Помилка поновлення шифрування файлу обміну"
+
 #. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: Ой, втрачено файл обміну!!!"
@@ -3434,7 +3484,7 @@ msgstr "E302: Не вдалося перейменувати файлу обмі
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr ""
-"E303: Не вдалося прочитати файл обміну для \"%s\", відновлення неможливе"
+"E303: Не вдалося прочитати файл обміну для «%s», відновлення неможливе"
 
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): Немає блоку 0??"
@@ -3494,18 +3544,18 @@ msgstr " пошкоджений (розмір сторінки менший мі
 
 #, c-format
 msgid "Using swap file \"%s\""
-msgstr "Використовується файл обміну \"%s\""
+msgstr "Використовується файл обміну «%s»"
 
 #, c-format
 msgid "Original file \"%s\""
-msgstr "Початковий файл \"%s\""
+msgstr "Початковий файл «%s»"
 
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: Застереження: Можливо, початковий файл було змінено"
 
 #, c-format
 msgid "Swap file is encrypted: \"%s\""
-msgstr "Файл обміну зашифрований: \"%s\""
+msgstr "Файл обміну зашифрований: «%s»"
 
 msgid ""
 "\n"
@@ -3580,7 +3630,7 @@ msgstr ""
 "починаються з ???"
 
 msgid "See \":help E312\" for more information."
-msgstr "Див. \":help E312\" для уточнення."
+msgstr "Див. «:help E312» для уточнення."
 
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "Відновлення закінчено, перевірте чи все гаразд."
@@ -3770,7 +3820,7 @@ msgstr "E317: Вказівник блоку помилковий 2"
 
 #, c-format
 msgid "E773: Symlink loop for \"%s\""
-msgstr "E773: Циклічні символьні посилання \"%s\""
+msgstr "E773: Циклічні символьні посилання «%s»"
 
 # msgstr "E317: "
 msgid "E325: ATTENTION"
@@ -3793,54 +3843,50 @@ msgstr "      НОВІШИЙ за файл обміну!\n"
 #. * other languages.
 msgid ""
 "\n"
-"(1) Another program may be editing the same file.\n"
-"    If this is the case, be careful not to end up with two\n"
-"    different instances of the same file when making changes.\n"
+"(1) Another program may be editing the same file.  If this is the case,\n"
+"    be careful not to end up with two different instances of the same\n"
+"    file when making changes."
 msgstr ""
 "\n"
-"(1) Можливо, інша програма вже редагує цей самий файл.\n"
-"    Будьте обережні, щоб не залишилися два різні екземпляри\n"
-"    одного й того самого файлу після змін.\n"
+"(1) Можливо, інша програма вже редагує цей самий файл. Якщо це так,\n"
+"    будьте обережні, щоб не залишилися два різні екземпляри\n"
+"    одного й того самого файлу після змін."
 
-msgid "    Quit, or continue with caution.\n"
-msgstr "    Вийдіть, або продовжуйте обережно.\n"
+msgid "  Quit, or continue with caution.\n"
+msgstr "  Вийдіть або продовжуйте обережно.\n"
 
-msgid ""
-"\n"
-"(2) An edit session for this file crashed.\n"
-msgstr ""
-"\n"
-"(2) Сеанс редагування цього файлу зазнав краху.\n"
+msgid "(2) An edit session for this file crashed.\n"
+msgstr "(2) Сеанс редагування цього файлу зазнав краху.\n"
 
 msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Якщо це справді трапилося, спробуйте \":recover\" або \"vim -r "
+msgstr "    Якщо це справді трапилося, спробуйте «:recover» або «vim -r "
 
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
 msgstr ""
-"\"\n"
-"    щоб відновити зміни (див. \":help recovery\").\n"
+"»\n"
+"    щоб відновити зміни (див. «:help recovery»).\n"
 
 msgid "    If you did this already, delete the swap file \""
-msgstr "    Якщо ви вже це зробили, знищіть файл обміну \""
+msgstr "    Якщо ви вже це зробили, знищіть файл обміну «"
 
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
 msgstr ""
-"\"\n"
+"»,\n"
 "    щоб позбутися цього повідомлення.\n"
 "\n"
 
 msgid "Swap file \""
-msgstr "Файл обміну \""
+msgstr "Файл обміну «"
 
 msgid "\" already exists!"
-msgstr "\" вже існує!"
+msgstr "» вже існує!"
 
 msgid "VIM - ATTENTION"
-msgstr "VIM -- УВАГА"
+msgstr "VIM — УВАГА"
 
 msgid "Swap file already exists!"
 msgstr "Файл обміну вже існує!"
@@ -3887,7 +3933,7 @@ msgstr "E328: Меню може бути тільки в іншому режим
 # msgstr "E328: "
 #, c-format
 msgid "E329: No menu \"%s\""
-msgstr "E329: Немає меню \"%s\""
+msgstr "E329: Немає меню «%s»"
 
 #. Only a mnemonic or accelerator is not valid.
 msgid "E792: Empty menu name"
@@ -3937,7 +3983,7 @@ msgstr "E336: Шлях повинен вести до підменю"
 
 # msgstr "E336: "
 msgid "E337: Menu not found - check menu names"
-msgstr "E337: Меню не знайдено -- перевірте назву"
+msgstr "E337: Меню не знайдено — перевірте назву"
 
 # msgstr "E337: "
 #, c-format
@@ -4053,7 +4099,6 @@ msgstr "Vim: Заготовлюються файли...\n"
 msgid "Vim: Finished.\n"
 msgstr "Vim: Завершено.\n"
 
-#, c-format
 msgid "ERROR: "
 msgstr "ПОМИЛКА: "
 
@@ -4089,7 +4134,7 @@ msgstr "E342: Забракло пам'яті!  (потрібно було %lu б
 # msgstr "E342: "
 #, c-format
 msgid "Calling shell to execute: \"%s\""
-msgstr "Викликається оболонка щоб виконати: \"%s\""
+msgstr "Викликається оболонка щоб виконати: «%s»"
 
 msgid "E545: Missing colon"
 msgstr "E545: Пропущено двокрапку"
@@ -4115,6 +4160,9 @@ msgstr "Повторіть ключ: "
 msgid "Keys don't match!"
 msgstr "Ключі не однакові!"
 
+msgid "E854: path too long for completion"
+msgstr "E854: шлях занадто довгий для доповнення"
+
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
@@ -4126,22 +4174,22 @@ msgstr ""
 # msgstr "E343: "
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: Не вдалося знайти каталог \"%s\" у cdpath"
+msgstr "E344: Не вдалося знайти каталог «%s» у cdpath"
 
 # msgstr "E344: "
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: Не вдалося знайти файл \"%s\" у path"
+msgstr "E345: Не вдалося знайти файл «%s» у path"
 
 # msgstr "E345: "
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: У cdpath немає більше каталогу \"%s\""
+msgstr "E346: У cdpath немає більше каталогу «%s»"
 
 # msgstr "E346: "
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: У шляху пошуку більше немає файлів \"%s\""
+msgstr "E347: У шляху пошуку більше немає файлів «%s»"
 
 msgid "Cannot connect to Netbeans #2"
 msgstr "Не вдалося з'єднатися із Netbeans #2"
@@ -4153,7 +4201,7 @@ msgstr "Не вдалося з'єднатися із Netbeans"
 msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
 msgstr ""
 "E668: Неправильний режим доступу до файлу інформації про з'єднання з "
-"NetBenans: \"%s\""
+"NetBenans: «%s»"
 
 msgid "read from Netbeans socket"
 msgstr "читається з сокета Netbeans"
@@ -4162,11 +4210,15 @@ msgstr "читається з сокета Netbeans"
 msgid "E658: NetBeans connection lost for buffer %ld"
 msgstr "E658: Втрачено зв'язок із NetBeans для буфера %ld"
 
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: netbeans не підтримується з цим GUI"
+
 msgid "E511: netbeans already connected"
 msgstr "E511: netbeans вже під'єднано"
 
-msgid "E505: "
-msgstr "E505: "
+#, c-format
+msgid "E505: %s is read-only (add ! to override)"
+msgstr "E505: %s тільки для читання (! щоб не зважати)"
 
 # msgstr "E348: "
 msgid "E349: No identifier under cursor"
@@ -4310,8 +4362,8 @@ msgid ""
 "Col %s of %s; Line %ld of %ld; Word %ld of %ld; Char %ld of %ld; Byte %ld of "
 "%ld"
 msgstr ""
-"Колонка %s з %s; рядок %ld з %ld; слово %ld з %ld; символ %ld of %ld; байт %"
-"ld з %ld"
+"Колонка %s з %s; рядок %ld з %ld; слово %ld з %ld; символ %ld of %ld; байт "
+"%ld з %ld"
 
 #, c-format
 msgid "(+%ld for BOM)"
@@ -4332,6 +4384,9 @@ msgstr "E519: Опція не підтримується"
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: Не дозволено у modeline"
 
+msgid "E846: Key code not set"
+msgstr "E846: Код ключа не встановлено"
+
 msgid "E521: Number required after ="
 msgstr "E521: Після = потрібно вказати число"
 
@@ -4349,7 +4404,7 @@ msgid "E530: Cannot change term in GUI"
 msgstr "E530: Не вдалося змінити term в GUI"
 
 msgid "E531: Use \":gui\" to start the GUI"
-msgstr "E531: Застосуйте \":gui\" для запуску GUI"
+msgstr "E531: Застосуйте «:gui» для запуску GUI"
 
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: Опції 'backupext' і 'patchmode' однакові"
@@ -4567,11 +4622,11 @@ msgstr "Друкується '%s'"
 
 #, c-format
 msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-msgstr "E244: Некоректна назва набору символів \"%s\" у назві шрифту \"%s\""
+msgstr "E244: Некоректна назва набору символів «%s» у назві шрифту «%s»"
 
 #, c-format
 msgid "E245: Illegal char '%c' in font name \"%s\""
-msgstr "E245: Помилковий символ %c в назві шрифту \"%s\""
+msgstr "E245: Помилковий символ %c в назві шрифту «%s»"
 
 msgid "Vim: Double signal, exiting\n"
 msgstr "Vim: Двічі отримано сигнал, вихід\n"
@@ -4663,7 +4718,7 @@ msgstr "XSMP втратив з'єднання ICE"
 
 #, c-format
 msgid "dlerror = \"%s\""
-msgstr "dlerror = \"%s\""
+msgstr "dlerror = «%s»"
 
 msgid "Opening the X display failed"
 msgstr "Не вдалося відкрити дисплей X"
@@ -4794,7 +4849,7 @@ msgstr "E683: Пропущено назву файлу чи некоректни
 
 #, c-format
 msgid "Cannot open file \"%s\""
-msgstr "Не вдалося відкрити файл \"%s\""
+msgstr "Не вдалося відкрити файл «%s»"
 
 msgid "E681: Buffer is not loaded"
 msgstr "E681: Буфер не завантажено"
@@ -5053,14 +5108,18 @@ msgstr "Стискується дерево слів..."
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: Перевірка орфографії не дозволена"
 
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr "Застереження: Не вдалося знайти список слів «%s_%s.spl» чи «%s_ascii.spl»"
+
 #, c-format
 msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
 msgstr ""
-"Застереження: Не вдалося знайти список слів \"%s.%s.spl\" чи \"%s.ascii.spl\""
+"Застереження: Не вдалося знайти список слів «%s.%s.spl» чи «%s.ascii.spl»"
 
 #, c-format
 msgid "Reading spell file \"%s\""
-msgstr "Читається файл орфографії \"%s\""
+msgstr "Читається файл орфографії «%s»"
 
 msgid "E757: This does not look like a spell file"
 msgstr "E757: Не схоже на файл орфографії"
@@ -5279,6 +5338,9 @@ msgstr "Нерозпізнані прапорці у %s у рядку %d: %s"
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "Проігноровано %d слів із не-ASCII символами"
 
+msgid "E845: Insufficient memory, word list will be incomplete"
+msgstr "E845: Недостатньо пам’яті, список слів буде неповним"
+
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "Стиснено %d з %d вузлів; залишилося %d (%d%%)"
@@ -5355,11 +5417,11 @@ msgstr "Пробачте, тільки %ld пропозицій"
 #. avoid more prompt
 #, c-format
 msgid "Change \"%.*s\" to:"
-msgstr "Замінити \"%.*s\" на:"
+msgstr "Замінити «%.*s» на:"
 
 #, c-format
 msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
+msgstr " < «%.*s»"
 
 # msgstr "E34: "
 msgid "E752: No previous spell replacement"
@@ -5459,6 +5521,10 @@ msgstr " розриви рядків"
 msgid "E395: contains argument not accepted here"
 msgstr "E395: Містить неприйнятні тут аргументи"
 
+# msgstr "E14: "
+msgid "E844: invalid cchar value"
+msgstr "E844: Некоректне значення cchar"
+
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: group[t]hete тут неприйнятний"
 
@@ -5470,6 +5536,9 @@ msgstr "E394: Не знайдено елемент регіону для %s"
 msgid "E397: Filename required"
 msgstr "E397: Потрібна назва файлу"
 
+msgid "E847: Too many syntax includes"
+msgstr "E847: Забагато синтаксичних включень"
+
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: Пропущено ']': %s"
@@ -5483,6 +5552,9 @@ msgstr "E398: Пропущено `=': %s"
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: Бракує аргументів: синтаксичний регіон %s"
 
+msgid "E848: Too many syntax clusters"
+msgstr "E848: Забагато синтаксичних кластерів"
+
 msgid "E400: No cluster specified"
 msgstr "E400: Кластер не вказано"
 
@@ -5542,12 +5614,12 @@ msgstr "E411: Групу підсвічування не знайдено: %s"
 # msgstr "E411: "
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: Недостатньо аргументів: \":highlight link %s\""
+msgstr "E412: Недостатньо аргументів: «:highlight link %s»"
 
 # msgstr "E412: "
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: Забагато аргументів: \":highlight link %s\""
+msgstr "E413: Забагато аргументів: «:highlight link %s»"
 
 # msgstr "E413: "
 msgid "E414: group has settings, highlight link ignored"
@@ -5605,6 +5677,9 @@ msgstr "E669: Недруковний символ у назві групи"
 msgid "W18: Invalid character in group name"
 msgstr "W18: Некоректний символ у назві групи"
 
+msgid "E849: Too many highlight and syntax groups"
+msgstr "E849: Забагато груп підсвічування і синтаксису"
+
 # msgstr "E424: "
 msgid "E555: at bottom of tag stack"
 msgstr "E555: Кінець стеку теґів"
@@ -5622,13 +5697,13 @@ msgstr "E426: Теґ не знайдено: %s"
 
 # msgstr "E426: "
 msgid "  # pri kind tag"
-msgstr "  # прі тип  теґ"
+msgstr "  # прі тип теґ"
 
 msgid "file\n"
 msgstr "файл\n"
 
 msgid "E427: There is only one matching tag"
-msgstr "E427: Лише однин відповідний теґ"
+msgstr "E427: Лише один відповідний теґ"
 
 # msgstr "E427: "
 msgid "E428: Cannot go beyond last matching tag"
@@ -5637,7 +5712,7 @@ msgstr "E428: Це вже останній відповідний теґ"
 # msgstr "E428: "
 #, c-format
 msgid "File \"%s\" does not exist"
-msgstr "Файл \"%s\" не існує"
+msgstr "Файл «%s» не існує"
 
 #. Give an indication of the number of matching tags
 #, c-format
@@ -5652,7 +5727,7 @@ msgstr "  Використано теґ, не розрізняючи велик
 
 #, c-format
 msgid "E429: File \"%s\" does not exist"
-msgstr "E429: Файл \"%s\" не існує"
+msgstr "E429: Файл «%s» не існує"
 
 # msgstr "E429: "
 #. Highlight title
@@ -5671,10 +5746,13 @@ msgstr "Шукається у файлі теґів %s"
 msgid "E430: Tag file path truncated for %s\n"
 msgstr "E430: Шлях файлу теґів скорочено до %s\n"
 
+msgid "Ignoring long line in tags file"
+msgstr "Ігнорується довгий рядок у файлі з позначками"
+
 # msgstr "E430: "
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: Помилка формату у файлі теґів \"%s\""
+msgstr "E431: Помилка формату у файлі теґів «%s»"
 
 # msgstr "E431: "
 #, c-format
@@ -5690,9 +5768,6 @@ msgstr "E432: Файл теґів не впорядкований: %s"
 msgid "E433: No tags file"
 msgstr "E433: Немає файлу теґів"
 
-msgid "Ignoring long line in tags file"
-msgstr "Ігнорується довгий рядок у файлі з позначками"
-
 # msgstr "E433: "
 msgid "E434: Can't find tag pattern"
 msgstr "E434: Не вдалося знайти зразок теґу"
@@ -5723,10 +5798,10 @@ msgstr "E559: Немає інформації про можливості тер
 
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: Немає запису \"%s\" про можливості терміналу"
+msgstr "E436: Немає запису «%s» про можливості терміналу"
 
 msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: Потрібна можливість терміналу \"cm\""
+msgstr "E437: Потрібна можливість терміналу «cm»"
 
 #. Highlight title
 msgid ""
@@ -5871,8 +5946,8 @@ msgstr "після"
 msgid "Nothing to undo"
 msgstr "Немає нічого скасовувати"
 
-msgid "number changes  time            saved"
-msgstr "номер  змін     час             збережено"
+msgid "number changes  when               saved"
+msgstr "номер  зміни    час             збережено"
 
 #, c-format
 msgid "%ld seconds ago"
@@ -5975,13 +6050,6 @@ msgstr ""
 "\n"
 "Версія для MacOS"
 
-msgid ""
-"\n"
-"RISC OS version"
-msgstr ""
-"\n"
-"Версія для RISC OS"
-
 msgid ""
 "\n"
 "OpenVMS version"
@@ -6148,7 +6216,7 @@ msgid "by Bram Moolenaar et al."
 msgstr "автор: Bram Moolenaar та ін."
 
 msgid "Vim is open source and freely distributable"
-msgstr "Vim -- це відкрита й вільно розповсюджувана програма"
+msgstr "Vim — це відкрита й вільно розповсюджувана програма"
 
 msgid "Help poor children in Uganda!"
 msgstr "Допоможіть сиротам з Уганди!"
@@ -6250,7 +6318,7 @@ msgstr "E446: Немає назви файлу над курсором"
 # msgstr "E446: "
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: Файл \"%s\" не знайдено у шляху пошуку"
+msgstr "E447: Файл «%s» не знайдено у шляху пошуку"
 
 #, c-format
 msgid "E370: Could not load library %s"
@@ -6352,7 +6420,7 @@ msgstr "E235: Невідомий шрифт: %s"
 # msgstr "E235: "
 #, c-format
 msgid "E236: Font \"%s\" is not fixed-width"
-msgstr "E236: Шрифт \"%s\" не моноширинний"
+msgstr "E236: Шрифт «%s» не моноширинний"
 
 msgid "E473: Internal error"
 msgstr "E473: Внутрішня помилка"
@@ -6385,11 +6453,11 @@ msgstr "E476: Некоректна команда"
 
 #, c-format
 msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" -- це каталог"
+msgstr "E17: «%s» — це каталог"
 
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: Бібліотечний виклик до \"%s()\" не вдався"
+msgstr "E364: Бібліотечний виклик до «%s()» не вдався"
 
 #, c-format
 msgid "E448: Could not load library function %s"
@@ -6485,7 +6553,7 @@ msgstr "E36: Місця не вистачить"
 
 #, c-format
 msgid "E247: no registered server named \"%s\""
-msgstr "E247: Немає зареєстрованих серверів з назвою \"%s\""
+msgstr "E247: Немає зареєстрованих серверів з назвою «%s»"
 
 # msgstr "E36: "
 #, c-format
@@ -6552,11 +6620,11 @@ msgstr "E45: Встановлено опцію 'readonly' (! щоб не зва
 
 #, c-format
 msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: Змінна тільки для читання: \"%s\""
+msgstr "E46: Змінна тільки для читання: «%s»"
 
 #, c-format
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: Не можна встановити змінну у пісочниці: \"%s\""
+msgstr "E794: Не можна встановити змінну у пісочниці: «%s»"
 
 msgid "E47: Error while reading errorfile"
 msgstr "E47: Помилка читання файлу помилок"
@@ -6653,6 +6721,9 @@ msgstr "E139: Файл уже завантажено в інший буфер"
 msgid "E764: Option '%s' is not set"
 msgstr "E764: Опція '%s' не встановлена"
 
+msgid "E850: Invalid register name"
+msgstr "E850: Неправильна назва регістру"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "Пошук дійшов до ПОЧАТКУ, продовжується з КІНЦЯ"
 
@@ -6661,7 +6732,17 @@ msgstr "Пошук дійшов до КІНЦЯ, продовжується з 
 
 #, c-format
 msgid "Need encryption key for \"%s\""
-msgstr "Для \"%s\" потрібен ключ: "
+msgstr "Для «%s» потрібен ключ: "
+
+msgid "can't delete OutputObject attributes"
+msgstr "не вдалося знищити атрибути OutputObject"
+
+msgid "softspace must be an integer"
+msgstr "softspace має бути цілим"
+
+# msgstr "E180: "
+msgid "invalid attribute"
+msgstr "неправильний атрибут"
 
 msgid "writelines() requires list of strings"
 msgstr "для writelines() потрібен список рядків"
@@ -6672,6 +6753,61 @@ msgstr "E264: Python: Помилка ініціалізації об'єктів
 msgid "no such buffer"
 msgstr "такого буфера немає"
 
+# msgstr "E406: "
+msgid "empty keys are not allowed"
+msgstr "порожні ключі не дозволені"
+
+msgid "failed to add key to dictionary"
+msgstr "не вдалося додати ключ до словника"
+
+msgid "Cannot delete DictionaryObject attributes"
+msgstr "не вдалося знищити атрибути DictionaryObject"
+
+msgid "Cannot modify fixed dictionary"
+msgstr "Не можна змінити фіксований словник"
+
+msgid "Only boolean objects are allowed"
+msgstr "Дозволено тільки логічні об’єкти"
+
+msgid "Cannot set this attribute"
+msgstr "Не можна встановити цей атрибут"
+
+msgid "no such key in dictionary"
+msgstr "немає такого ключа в словнику"
+
+msgid "dict is locked"
+msgstr "словник заблоковано"
+
+msgid "internal error: failed to get vim list item"
+msgstr "внутрішня помилка: не вдалося отримати елемент списку vim"
+
+msgid "list is locked"
+msgstr "список заблоковано"
+
+msgid "Failed to add item to list"
+msgstr "Не вдалося додати елемент до списку"
+
+msgid "internal error: no vim list item"
+msgstr "внутрішня помилка: немає елемента списку vim"
+
+msgid "can only assign lists to slice"
+msgstr "можна присвоювати списки тільки зрізам"
+
+msgid "internal error: failed to add item to list"
+msgstr "внутрішня помилка: не вдалося додати елемент до списку"
+
+msgid "can only concatenate with lists"
+msgstr "можна з’єднувати тільки зі списками"
+
+msgid "Cannot modify fixed list"
+msgstr "Не можна змінити фіксований список"
+
+msgid "'self' argument must be a dictionary"
+msgstr "Аргумент «self» має бути словником"
+
+msgid "failed to run function"
+msgstr "Не вдалося виконати функцію"
+
 msgid "attempt to refer to deleted window"
 msgstr "спроба звернутися до знищеного вікна"
 
@@ -6699,43 +6835,11 @@ msgstr "такого вікна немає"
 msgid "attempt to refer to deleted buffer"
 msgstr "спроба звернення до знищеного буфера"
 
-#~ msgid "-name <name>\t\tUse resource as if vim was <name>"
-#~ msgstr "-name <назва>\t\tВикористати ресурси, ніби vim має задану <назву>"
+msgid "unable to convert to vim structure"
+msgstr "не вдалося перетворити до структури vim"
 
-#~ msgid "\t\t\t  (Unimplemented)\n"
-#~ msgstr "\t\t\t  (Не діє)\n"
+msgid "NULL reference passed"
+msgstr "передано посилання NULL"
 
-#~ msgid "E396: containedin argument not accepted here"
-#~ msgstr "E396: Аргумент containedin тут неприйнятний"
-
-# msgstr "E232: "
-#~ msgid "Vim dialog..."
-#~ msgstr "Діалог Vim..."
-
-# msgstr "E234: "
-#~ msgid "Font Selection"
-#~ msgstr "Вибрати шрифт"
-
-# msgstr "E289: "
-#~ msgid "E290: over-the-spot style requires fontset"
-#~ msgstr "E290: Стиль over-the-spot вимагає набір шрифтів"
-
-# msgstr "E290: "
-#~ msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-#~ msgstr "E291: У вас старша за 1.2.3 версія GTK+. Область стану вимкнено"
-
-# msgstr "E291: "
-#~ msgid "E292: Input Method Server is not running"
-#~ msgstr "E292: Сервер методу вводу не функціонує"
-
-#~ msgid "with GTK-GNOME GUI."
-#~ msgstr "з GUI GTK-GNOME."
-
-#~ msgid "with GTK GUI."
-#~ msgstr "з GUI GTK."
-
-#~ msgid "[NL found]"
-#~ msgstr "[Знайдено NL]"
-
-#~ msgid "E569: maximum number of cscope connections reached"
-#~ msgstr "E569: Кількість з'єднань з cscope досягла максимуму"
+msgid "internal error: invalid value type"
+msgstr "внутрішня помилка: неправильний тип значення"

From 4d3c07fb049df2f28cc24759680da286ba7471f1 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 14:55:42 +0100
Subject: [PATCH 074/106] updated for version 7.3.791 Problem:    MzScheme
 interface doesn't work propely. Solution:   Make it work better. (Sergey
 Khorev)

---
 runtime/doc/if_mzsch.txt |  41 ++-
 src/Make_ming.mak        |   3 +
 src/Make_mvc.mak         |   2 +-
 src/auto/configure       |   7 +-
 src/configure.in         |   7 +-
 src/eval.c               |  16 ++
 src/if_mzsch.c           | 531 ++++++++++++++++++++++++++++-----------
 src/if_mzsch.h           |  36 ++-
 src/os_unix.c            |   7 +-
 src/proto/eval.pro       |   1 +
 src/testdir/test70.in    |  15 +-
 src/testdir/test70.ok    |   1 +
 src/version.c            |   2 +
 13 files changed, 490 insertions(+), 179 deletions(-)

diff --git a/runtime/doc/if_mzsch.txt b/runtime/doc/if_mzsch.txt
index 52440b6d7a..f9b87f7fbf 100644
--- a/runtime/doc/if_mzsch.txt
+++ b/runtime/doc/if_mzsch.txt
@@ -11,7 +11,8 @@ The MzScheme Interface to Vim				*mzscheme* *MzScheme*
 3. Threads				|mzscheme-threads|
 4. Vim access from MzScheme		|mzscheme-vim|
 5. mzeval() Vim function		|mzscheme-mzeval|
-6. Dynamic loading			|mzscheme-dynamic|
+6. Using Function references		|mzscheme-funcref|
+7. Dynamic loading			|mzscheme-dynamic|
 
 {Vi does not have any of these commands}
 
@@ -21,10 +22,17 @@ The MzScheme interface is available only if Vim was compiled with the
 Based on the work of Brent Fulgham.
 Dynamic loading added by Sergey Khorev
 
-For downloading MzScheme and other info:
-	http://www.plt-scheme.org/software/mzscheme/
+MzScheme and PLT Scheme names have been rebranded as Racket. For more
+information please check http://racket-lang.org
 
-Note: On FreeBSD you should use the "drscheme" port.
+Futures and places of Racket version 5.x up to and including 5.3.1 do not
+work correctly with processes created by Vim.
+The simplest solution is to build Racket on your own with these features
+disabled: >
+  ./configure --disable-futures --disable-places --prefix=your-install-prefix
+
+To speed up the process, you might also want to use --disable-gracket and
+--disable-docs
 
 ==============================================================================
 1. Commands						*mzscheme-commands*
@@ -155,8 +163,11 @@ Common
     (eval {expr-string})	    Evaluate the vim expression into
 				    respective MzScheme object: |Lists| are
 				    represented as Scheme lists,
-				    |Dictionaries| as hash tables.
-				    NOTE the name clashes with MzScheme eval
+				    |Dictionaries| as hash tables,
+				    |Funcref|s as functions (see also
+				    |mzscheme-funcref|)
+				    NOTE the name clashes with MzScheme eval,
+				    use module qualifiers to overcome this.
     (range-start)		    Start/End of the range passed with
     (range-end)			    the Scheme command.
     (beep)			    beep
@@ -237,7 +248,23 @@ To facilitate bi-directional interface, you can use |mzeval()| function to
 evaluate MzScheme expressions and pass their values to VimL.
 
 ==============================================================================
-6. Dynamic loading				    *mzscheme-dynamic* *E815*
+6. Using Function references				    *mzscheme-funcref*
+
+MzScheme interface allows use of |Funcref|s so you can call Vim functions
+directly from Scheme. For instance: >
+    function! MyAdd2(arg)
+	return a:arg + 2
+    endfunction
+    mz (define f2 (vim-eval "function(\"MyAdd2\")"))
+    mz (f2 7)
+< or : >
+    :mz (define indent (vim-eval "function('indent')"))
+    " return Vim indent for line 12
+    :mz (indent 12)
+<
+
+==============================================================================
+7. Dynamic loading				    *mzscheme-dynamic* *E815*
 
 On MS-Windows the MzScheme libraries can be loaded dynamically. The |:version|
 output then includes |+mzscheme/dyn|.
diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index b11db8b93a..80a0c6670e 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -384,6 +384,9 @@ CFLAGS += -I$(MZSCHEME)/include -DFEAT_MZSCHEME -DMZSCHEME_COLLECTS=\"$(MZSCHEME
 ifeq (yes, $(DYNAMIC_MZSCHEME))
 CFLAGS += -DDYNAMIC_MZSCHEME -DDYNAMIC_MZSCH_DLL=\"lib$(MZSCHEME_MAIN_LIB)$(MZSCHEME_VER).dll\" -DDYNAMIC_MZGC_DLL=\"libmzgc$(MZSCHEME_VER).dll\"
 endif
+ifeq (yes, "$(MZSCHEME_DEBUG)")
+CFLAGS += -DMZSCHEME_FORCE_GC
+endif
 endif
 
 ifdef RUBY
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 4d8b6691bb..769aebf697 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1096,7 +1096,7 @@ $(OUTDIR)/if_perl.obj: $(OUTDIR) if_perl.c  $(INCL)
 $(OUTDIR)/if_perlsfio.obj: $(OUTDIR) if_perlsfio.c  $(INCL)
 	$(CC) $(CFLAGS) $(PERL_INC) if_perlsfio.c
 
-$(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c  $(INCL) $(MZSCHEME_EXTRA_DEP)
+$(OUTDIR)/if_mzsch.obj: $(OUTDIR) if_mzsch.c if_mzsch.h $(INCL) $(MZSCHEME_EXTRA_DEP)
 	$(CC) $(CFLAGS) if_mzsch.c \
 		-DMZSCHEME_COLLECTS=\"$(MZSCHEME:\=\\)\\collects\"
 mzscheme_base.c:
diff --git a/src/auto/configure b/src/auto/configure
index e73867f9a6..3ef90c87ff 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4927,7 +4927,8 @@ $as_echo "no" >&6; }
 
   if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
     if test "x$MACOSX" = "xyes"; then
-      MZSCHEME_LIBS="-framework PLT_MzScheme"
+      MZSCHEME_LIBS="-framework Racket"
+      MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
       MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
@@ -4968,6 +4969,10 @@ $as_echo_n "checking for racket collects directory... " >&6; }
       else
 	if test -d $vi_cv_path_mzscheme_pfx/share/racket/collects; then
 	  SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/
+	else
+	  if test -d $vi_cv_path_mzscheme_pfx/collects; then
+	    SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/
+	  fi
 	fi
       fi
     fi
diff --git a/src/configure.in b/src/configure.in
index 2dae429613..431bc2cbdf 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -617,7 +617,8 @@ if test "$enable_mzschemeinterp" = "yes"; then
 
   if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
     if test "x$MACOSX" = "xyes"; then
-      MZSCHEME_LIBS="-framework PLT_MzScheme"
+      MZSCHEME_LIBS="-framework Racket"
+      MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
     elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"; then
       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme3m.a"
       MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
@@ -660,6 +661,10 @@ if test "$enable_mzschemeinterp" = "yes"; then
       else
 	if test -d $vi_cv_path_mzscheme_pfx/share/racket/collects; then
 	  SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/
+	else
+	  if test -d $vi_cv_path_mzscheme_pfx/collects; then
+	    SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/
+	  fi
 	fi
       fi
     fi
diff --git a/src/eval.c b/src/eval.c
index 46a1963de9..dc7c2409f1 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -14333,6 +14333,22 @@ f_mzeval(argvars, rettv)
     str = get_tv_string_buf(&argvars[0], buf);
     do_mzeval(str, rettv);
 }
+
+    void
+mzscheme_call_vim(name, args, rettv)
+    char_u	*name;
+    typval_T	*args;
+    typval_T	*rettv;
+{
+    typval_T argvars[3];
+
+    argvars[0].v_type = VAR_STRING;
+    argvars[0].vval.v_string = name;
+    copy_tv(args, &argvars[1]);
+    argvars[2].v_type = VAR_UNKNOWN;
+    f_call(argvars, rettv);
+    clear_tv(&argvars[1]);
+}
 #endif
 
 /*
diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index 9a92fee87a..8b8c8016f0 100644
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -1,11 +1,9 @@
 /* vi:set ts=8 sts=4 sw=4:
  *
  * MzScheme interface by Sergey Khorev <sergey.khorev@gmail.com>
- * Original work by Brent Fulgham <bfulgham@debian.org>
+ * Based on work by Brent Fulgham <bfulgham@debian.org>
  * (Based on lots of help from Matthew Flatt)
  *
- * TODO Convert byte-strings to char strings?
- *
  * This consists of six parts:
  * 1. MzScheme interpreter main program
  * 2. Routines that handle the external interface between MzScheme and
@@ -142,7 +140,12 @@ static int vim_error_check(void);
 static int do_mzscheme_command(exarg_T *, void *, Scheme_Closed_Prim *what);
 static void startup_mzscheme(void);
 static char *string_to_line(Scheme_Object *obj);
-static void do_output(char *mesg, intptr_t len);
+#if MZSCHEME_VERSION_MAJOR >= 500
+# define OUTPUT_LEN_TYPE intptr_t
+#else
+# define OUTPUT_LEN_TYPE long
+#endif
+static void do_output(char *mesg, OUTPUT_LEN_TYPE len);
 static void do_printf(char *format, ...);
 static void do_flush(void);
 static Scheme_Object *_apply_thunk_catch_exceptions(
@@ -166,10 +169,13 @@ static void init_exn_catching_apply(void);
 static int mzscheme_env_main(Scheme_Env *env, int argc, char **argv);
 static int mzscheme_init(void);
 #ifdef FEAT_EVAL
-static Scheme_Object *vim_to_mzscheme(typval_T *vim_value, int depth,
+static Scheme_Object *vim_to_mzscheme(typval_T *vim_value);
+static Scheme_Object *vim_to_mzscheme_impl(typval_T *vim_value, int depth,
 	Scheme_Hash_Table *visited);
-static int mzscheme_to_vim(Scheme_Object *obj, typval_T *tv, int depth,
+static int mzscheme_to_vim(Scheme_Object *obj, typval_T *tv);
+static int mzscheme_to_vim_impl(Scheme_Object *obj, typval_T *tv, int depth,
 	Scheme_Hash_Table *visited);
+static Scheme_Object *vim_funcref(void *data, int argc, Scheme_Object **argv);
 #endif
 
 #ifdef MZ_PRECISE_GC
@@ -183,6 +189,13 @@ static int buffer_mark_proc(void *obj)
 }
 static int buffer_fixup_proc(void *obj)
 {
+    /* apparently not needed as the object will be uncollectable while
+     * the buffer is alive
+     */
+    /*
+    vim_mz_buffer* buf = (vim_mz_buffer*) obj;
+    buf->buf->b_mzscheme_ref = GC_fixup_self(obj);
+    */
     return buffer_size_proc(obj);
 }
 static int window_size_proc(void *obj UNUSED)
@@ -195,12 +208,26 @@ static int window_mark_proc(void *obj)
 }
 static int window_fixup_proc(void *obj)
 {
+    /* apparently not needed as the object will be uncollectable while
+     * the window is alive
+     */
+    /*
+    vim_mz_window* win = (vim_mz_window*) obj;
+    win->win->w_mzscheme_ref = GC_fixup_self(obj);
+    */
     return window_size_proc(obj);
 }
+/* with precise GC, w_mzscheme_ref and b_mzscheme_ref are immobile boxes
+ * containing pointers to a window/buffer
+ * with conservative GC these are simply pointers*/
+# define WINDOW_REF(win) *(vim_mz_window **)((win)->w_mzscheme_ref)
+# define BUFFER_REF(buf) *(vim_mz_buffer **)((buf)->b_mzscheme_ref)
+#else
+# define WINDOW_REF(win) (vim_mz_window *)((win)->w_mzscheme_ref)
+# define BUFFER_REF(buf) (vim_mz_buffer *)((buf)->b_mzscheme_ref)
 #endif
 
 #ifdef DYNAMIC_MZSCHEME
-
 static Scheme_Object *dll_scheme_eof;
 static Scheme_Object *dll_scheme_false;
 static Scheme_Object *dll_scheme_void;
@@ -319,6 +346,7 @@ static Scheme_Object *(*dll_scheme_char_string_to_byte_string)
     (Scheme_Object *s);
 static Scheme_Object *(*dll_scheme_char_string_to_path)
     (Scheme_Object *s);
+static void *(*dll_scheme_set_collects_path)(Scheme_Object *p);
 # endif
 static Scheme_Hash_Table *(*dll_scheme_make_hash_table)(int type);
 static void (*dll_scheme_hash_set)(Scheme_Hash_Table *table,
@@ -378,11 +406,11 @@ static Scheme_Object *(*dll_scheme_namespace_require)(Scheme_Object *req);
 # endif
 # define scheme_gc_ptr_ok dll_scheme_gc_ptr_ok
 # if MZSCHEME_VERSION_MAJOR < 299
-#  define scheme_get_sized_string_output dll_scheme_get_sized_string_output
+#  define scheme_get_sized_byte_string_output dll_scheme_get_sized_string_output
 # else
 #  define scheme_get_sized_byte_string_output \
     dll_scheme_get_sized_byte_string_output
-# define scheme_get_param dll_scheme_get_param
+#  define scheme_get_param dll_scheme_get_param
 # endif
 # define scheme_intern_symbol dll_scheme_intern_symbol
 # define scheme_lookup_global dll_scheme_lookup_global
@@ -391,8 +419,8 @@ static Scheme_Object *(*dll_scheme_namespace_require)(Scheme_Object *req);
 # define scheme_make_pair dll_scheme_make_pair
 # define scheme_make_prim_w_arity dll_scheme_make_prim_w_arity
 # if MZSCHEME_VERSION_MAJOR < 299
-#  define scheme_make_string dll_scheme_make_string
-#  define scheme_make_string_output_port dll_scheme_make_string_output_port
+#  define scheme_make_byte_string dll_scheme_make_string
+#  define scheme_make_byte_string_output_port dll_scheme_make_string_output_port
 # else
 #  define scheme_make_byte_string dll_scheme_make_byte_string
 #  define scheme_make_byte_string_output_port \
@@ -421,6 +449,7 @@ static Scheme_Object *(*dll_scheme_namespace_require)(Scheme_Object *req);
     dll_scheme_char_string_to_byte_string
 #  define scheme_char_string_to_path \
     dll_scheme_char_string_to_path
+#  define scheme_set_collects_path dll_scheme_set_collects_path
 # endif
 # define scheme_make_hash_table dll_scheme_make_hash_table
 # define scheme_hash_set dll_scheme_hash_set
@@ -529,6 +558,7 @@ static Thunk_Info mzsch_imports[] = {
     {"scheme_char_string_to_byte_string",
 	(void **)&dll_scheme_char_string_to_byte_string},
     {"scheme_char_string_to_path", (void **)&dll_scheme_char_string_to_path},
+    {"scheme_set_collects_path", (void **)&dll_scheme_set_collects_path},
 # endif
     {"scheme_make_hash_table", (void **)&dll_scheme_make_hash_table},
     {"scheme_hash_set", (void **)&dll_scheme_hash_set},
@@ -625,11 +655,40 @@ dynamic_mzscheme_end(void)
 }
 #endif /* DYNAMIC_MZSCHEME */
 
+#if MZSCHEME_VERSION_MAJOR < 299
+# define GUARANTEED_STRING_ARG(proc, num) GUARANTEE_STRING(proc, num)
+#else
+    static Scheme_Object *
+guaranteed_byte_string_arg(char *proc, int num, int argc, Scheme_Object **argv)
+{
+    if (SCHEME_BYTE_STRINGP(argv[num]))
+    {
+	return argv[num];
+    }
+    else if (SCHEME_CHAR_STRINGP(argv[num]))
+    {
+	Scheme_Object *tmp = NULL;
+	MZ_GC_DECL_REG(2);
+	MZ_GC_VAR_IN_REG(0, argv[num]);
+	MZ_GC_VAR_IN_REG(1, tmp);
+	MZ_GC_REG();
+	tmp = scheme_char_string_to_byte_string(argv[num]);
+	MZ_GC_UNREG();
+	return tmp;
+    }
+    else
+	scheme_wrong_type(proc, "string", num, argc, argv);
+    /* unreachable */
+    return scheme_void;
+}
+# define GUARANTEED_STRING_ARG(proc, num) guaranteed_byte_string_arg(proc, num, argc, argv)
+#endif
+
 /* need to put it here for dynamic stuff to work */
 #if defined(INCLUDE_MZSCHEME_BASE)
 # include "mzscheme_base.c"
 #elif MZSCHEME_VERSION_MAJOR >= 400
-# error MzScheme 4.x must include mzscheme_base.c, for MinGW32 you need to define MZSCHEME_GENERATE_BASE=yes
+# error MzScheme >=4 must include mzscheme_base.c, for MinGW32 you need to define MZSCHEME_GENERATE_BASE=yes
 #endif
 
 /*
@@ -861,6 +920,11 @@ startup_mzscheme(void)
     scheme_set_stack_base(stack_base, 1);
 #endif
 
+#ifndef TRAMPOLINED_MZVIM_STARTUP
+    /* in newer versions of precise GC the initial env has been created */
+    environment = scheme_basic_env();
+#endif
+
     MZ_REGISTER_STATIC(environment);
     MZ_REGISTER_STATIC(curout);
     MZ_REGISTER_STATIC(curerr);
@@ -869,10 +933,6 @@ startup_mzscheme(void)
     MZ_REGISTER_STATIC(exn_message);
     MZ_REGISTER_STATIC(vim_exn);
 
-#ifndef TRAMPOLINED_MZVIM_STARTUP
-    /* in newer versions of precise GC the initial env has been created */
-    environment = scheme_basic_env();
-#endif
     MZ_GC_CHECK();
 
 #ifdef INCLUDE_MZSCHEME_BASE
@@ -909,15 +969,11 @@ startup_mzscheme(void)
 	Scheme_Object	*coll_byte_string = NULL;
 	Scheme_Object	*coll_char_string = NULL;
 	Scheme_Object	*coll_path = NULL;
-	Scheme_Object	*coll_pair = NULL;
-	Scheme_Config	*config = NULL;
 
-	MZ_GC_DECL_REG(5);
+	MZ_GC_DECL_REG(3);
 	MZ_GC_VAR_IN_REG(0, coll_byte_string);
 	MZ_GC_VAR_IN_REG(1, coll_char_string);
 	MZ_GC_VAR_IN_REG(2, coll_path);
-	MZ_GC_VAR_IN_REG(3, coll_pair);
-	MZ_GC_VAR_IN_REG(4, config);
 	MZ_GC_REG();
 	coll_byte_string = scheme_make_byte_string(MZSCHEME_COLLECTS);
 	MZ_GC_CHECK();
@@ -925,11 +981,7 @@ startup_mzscheme(void)
 	MZ_GC_CHECK();
 	coll_path = scheme_char_string_to_path(coll_char_string);
 	MZ_GC_CHECK();
-	coll_pair = scheme_make_pair(coll_path, scheme_null);
-	MZ_GC_CHECK();
-	config = scheme_config;
-	MZ_GC_CHECK();
-	scheme_set_param(config, MZCONFIG_COLLECTION_PATHS, coll_pair);
+	scheme_set_collects_path(coll_path);
 	MZ_GC_CHECK();
 	MZ_GC_UNREG();
     }
@@ -944,11 +996,11 @@ startup_mzscheme(void)
 	MZ_GC_VAR_IN_REG(1, coll_pair);
 	MZ_GC_VAR_IN_REG(2, config);
 	MZ_GC_REG();
-	coll_string = scheme_make_string(MZSCHEME_COLLECTS);
+	coll_string = scheme_make_byte_string(MZSCHEME_COLLECTS);
 	MZ_GC_CHECK();
 	coll_pair = scheme_make_pair(coll_string, scheme_null);
 	MZ_GC_CHECK();
-	config = scheme_config;
+	config = scheme_current_config();
 	MZ_GC_CHECK();
 	scheme_set_param(config, MZCONFIG_COLLECTION_PATHS, coll_pair);
 	MZ_GC_CHECK();
@@ -991,7 +1043,7 @@ startup_mzscheme(void)
 	    MZ_GC_VAR_IN_REG(3, guard);
 	    MZ_GC_VAR_IN_REG(4, config);
 	    MZ_GC_REG();
-	    config = scheme_config;
+	    config = scheme_current_config();
 	    MZ_GC_CHECK();
 	    args[0] = scheme_get_param(config, MZCONFIG_SECURITY_GUARD);
 	    MZ_GC_CHECK();
@@ -1055,12 +1107,12 @@ mzscheme_init(void)
 	MZ_GC_DECL_REG(1);
 	MZ_GC_VAR_IN_REG(0, config);
 	MZ_GC_REG();
-	config = scheme_config;
+	config = scheme_current_config();
 	MZ_GC_CHECK();
 	/* recreate ports each call effectively clearing these ones */
-	curout = scheme_make_string_output_port();
+	curout = scheme_make_byte_string_output_port();
 	MZ_GC_CHECK();
-	curerr = scheme_make_string_output_port();
+	curerr = scheme_make_byte_string_output_port();
 	MZ_GC_CHECK();
 	scheme_set_param(config, MZCONFIG_OUTPUT_PORT, curout);
 	MZ_GC_CHECK();
@@ -1149,13 +1201,21 @@ mzscheme_buffer_free(buf_T *buf)
 {
     if (buf->b_mzscheme_ref)
     {
-	vim_mz_buffer *bp;
+	vim_mz_buffer *bp = NULL;
+	MZ_GC_DECL_REG(1);
+	MZ_GC_VAR_IN_REG(0, bp);
+	MZ_GC_REG();
 
-	bp = buf->b_mzscheme_ref;
+	bp = BUFFER_REF(buf);
 	bp->buf = INVALID_BUFFER_VALUE;
-	buf->b_mzscheme_ref = NULL;
+#ifndef MZ_PRECISE_GC
 	scheme_gc_ptr_ok(bp);
+#else
+	scheme_free_immobile_box(buf->b_mzscheme_ref);
+#endif
+	buf->b_mzscheme_ref = NULL;
 	MZ_GC_CHECK();
+	MZ_GC_UNREG();
     }
 }
 
@@ -1167,12 +1227,20 @@ mzscheme_window_free(win_T *win)
 {
     if (win->w_mzscheme_ref)
     {
-	vim_mz_window *wp;
-	wp = win->w_mzscheme_ref;
+	vim_mz_window *wp = NULL;
+	MZ_GC_DECL_REG(1);
+	MZ_GC_VAR_IN_REG(0, wp);
+	MZ_GC_REG();
+	wp = WINDOW_REF(win);
 	wp->win = INVALID_WINDOW_VALUE;
-	win->w_mzscheme_ref = NULL;
+#ifndef MZ_PRECISE_GC
 	scheme_gc_ptr_ok(wp);
+#else
+	scheme_free_immobile_box(win->w_mzscheme_ref);
+#endif
+	win->w_mzscheme_ref = NULL;
 	MZ_GC_CHECK();
+	MZ_GC_UNREG();
     }
 }
 
@@ -1349,7 +1417,7 @@ do_intrnl_output(char *mesg, int error)
 }
 
     static void
-do_output(char *mesg, intptr_t len UNUSED)
+do_output(char *mesg, OUTPUT_LEN_TYPE len UNUSED)
 {
     /* TODO: use len, the string may not be NUL terminated */
     do_intrnl_output(mesg, 0);
@@ -1371,9 +1439,9 @@ do_printf(char *format, ...)
 do_flush(void)
 {
     char *buff;
-    intptr_t length;
+    OUTPUT_LEN_TYPE length;
 
-    buff = scheme_get_sized_string_output(curerr, &length);
+    buff = scheme_get_sized_byte_string_output(curerr, &length);
     MZ_GC_CHECK();
     if (length)
     {
@@ -1381,7 +1449,7 @@ do_flush(void)
 	return;
     }
 
-    buff = scheme_get_sized_string_output(curout, &length);
+    buff = scheme_get_sized_byte_string_output(curout, &length);
     MZ_GC_CHECK();
     if (length)
 	do_output(buff, length);
@@ -1398,12 +1466,17 @@ do_flush(void)
 vim_command(void *data, int argc, Scheme_Object **argv)
 {
     Vim_Prim	*prim = (Vim_Prim *)data;
-    char	*cmd = SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0));
+    Scheme_Object *cmd = NULL;
+    MZ_GC_DECL_REG(1);
+    MZ_GC_VAR_IN_REG(0, cmd);
+    MZ_GC_REG();
+    cmd = GUARANTEED_STRING_ARG(prim->name, 0);
 
     /* may be use do_cmdline_cmd? */
-    do_cmdline((char_u *)cmd, NULL, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE);
+    do_cmdline(BYTE_STRING_VALUE(cmd), NULL, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE);
     update_screen(VALID);
 
+    MZ_GC_UNREG();
     raise_if_error();
     return scheme_void;
 }
@@ -1414,26 +1487,22 @@ vim_eval(void *data, int argc, Scheme_Object **argv)
 {
 #ifdef FEAT_EVAL
     Vim_Prim		*prim = (Vim_Prim *)data;
-    char		*expr;
-    Scheme_Object	*result;
-    /* hash table to store visited values to avoid infinite loops */
-    Scheme_Hash_Table	*visited = NULL;
+    Scheme_Object	*result = NULL;
     typval_T		*vim_result;
-
-    MZ_GC_DECL_REG(1);
-    MZ_GC_VAR_IN_REG(0, visited);
+    Scheme_Object *expr = NULL;
+    MZ_GC_DECL_REG(2);
+    MZ_GC_VAR_IN_REG(0, result);
+    MZ_GC_VAR_IN_REG(1, expr);
     MZ_GC_REG();
+    expr = GUARANTEED_STRING_ARG(prim->name, 0);
 
-    visited = scheme_make_hash_table(SCHEME_hash_ptr);
-    MZ_GC_CHECK();
-
-    expr = SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0));
-    vim_result = eval_expr((char_u *)expr, NULL);
+    vim_result = eval_expr(BYTE_STRING_VALUE(expr), NULL);
 
     if (vim_result == NULL)
 	raise_vim_exn(_("invalid expression"));
 
-    result = vim_to_mzscheme(vim_result, 1, visited);
+    result = vim_to_mzscheme(vim_result);
+    MZ_GC_CHECK();
     free_tv(vim_result);
 
     MZ_GC_UNREG();
@@ -1474,16 +1543,21 @@ static Scheme_Object *M_global = NULL;
 get_option(void *data, int argc, Scheme_Object **argv)
 {
     Vim_Prim	    *prim = (Vim_Prim *)data;
-    char_u	    *name;
     long	    value;
     char	    *strval;
     int		    rc;
-    Scheme_Object   *rval;
+    Scheme_Object   *rval = NULL;
+    Scheme_Object   *name = NULL;
     int		    opt_flags = 0;
     buf_T	    *save_curb = curbuf;
     win_T	    *save_curw = curwin;
 
-    name = (char_u *)SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0));
+    MZ_GC_DECL_REG(2);
+    MZ_GC_VAR_IN_REG(0, rval);
+    MZ_GC_VAR_IN_REG(1, name);
+    MZ_GC_REG();
+
+    name = GUARANTEED_STRING_ARG(prim->name, 0);
 
     if (argc > 1)
     {
@@ -1513,23 +1587,27 @@ get_option(void *data, int argc, Scheme_Object **argv)
 	    scheme_wrong_type(prim->name, "vim-buffer/window", 1, argc, argv);
     }
 
-    rc = get_option_value(name, &value, (char_u **)&strval, opt_flags);
+    rc = get_option_value(BYTE_STRING_VALUE(name), &value, (char_u **)&strval, opt_flags);
     curbuf = save_curb;
     curwin = save_curw;
 
     switch (rc)
     {
     case 1:
+	MZ_GC_UNREG();
 	return scheme_make_integer_value(value);
     case 0:
-	rval = scheme_make_string(strval);
+	rval = scheme_make_byte_string(strval);
 	MZ_GC_CHECK();
 	vim_free(strval);
+	MZ_GC_UNREG();
 	return rval;
     case -1:
     case -2:
+	MZ_GC_UNREG();
 	raise_vim_exn(_("hidden option"));
     case -3:
+	MZ_GC_UNREG();
 	raise_vim_exn(_("unknown option"));
     }
     /* unreachable */
@@ -1540,13 +1618,18 @@ get_option(void *data, int argc, Scheme_Object **argv)
     static Scheme_Object *
 set_option(void *data, int argc, Scheme_Object **argv)
 {
-    char_u	*cmd;
+    char_u	*command = NULL;
     int		opt_flags = 0;
     buf_T	*save_curb = curbuf;
     win_T	*save_curw = curwin;
     Vim_Prim	*prim = (Vim_Prim *)data;
+    Scheme_Object *cmd = NULL;
+
+    MZ_GC_DECL_REG(1);
+    MZ_GC_VAR_IN_REG(0, cmd);
+    MZ_GC_REG();
+    cmd = GUARANTEED_STRING_ARG(prim->name, 0);
 
-    GUARANTEE_STRING(prim->name, 0);
     if (argc > 1)
     {
 	if (M_global == NULL)
@@ -1575,9 +1658,10 @@ set_option(void *data, int argc, Scheme_Object **argv)
     }
 
     /* do_set can modify cmd, make copy */
-    cmd = vim_strsave((char_u *)SCHEME_STR_VAL(argv[0]));
-    do_set(cmd, opt_flags);
-    vim_free(cmd);
+    command = vim_strsave(BYTE_STRING_VALUE(cmd));
+    MZ_GC_UNREG();
+    do_set(command, opt_flags);
+    vim_free(command);
     update_screen(NOT_VALID);
     curbuf = save_curb;
     curwin = save_curw;
@@ -1639,7 +1723,6 @@ window_new(win_T *win)
 
     MZ_GC_DECL_REG(1);
     MZ_GC_VAR_IN_REG(0, self);
-    MZ_GC_REG();
 
     /* We need to handle deletion of windows underneath us.
      * If we add a "w_mzscheme_ref" field to the win_T structure,
@@ -1650,18 +1733,24 @@ window_new(win_T *win)
      * object, and reject them if the win_T *field is invalid.
      */
     if (win->w_mzscheme_ref != NULL)
-	return win->w_mzscheme_ref;
+	return (Scheme_Object *)WINDOW_REF(win);
 
-    self = scheme_malloc_fail_ok(scheme_malloc, sizeof(vim_mz_window));
+    MZ_GC_REG();
+    self = scheme_malloc_fail_ok(scheme_malloc_tagged, sizeof(vim_mz_window));
     vim_memset(self, 0, sizeof(vim_mz_window));
+#ifndef MZ_PRECISE_GC
     scheme_dont_gc_ptr(self);	/* because win isn't visible to GC */
+#else
+    win->w_mzscheme_ref = scheme_malloc_immobile_box(NULL);
+#endif
+    MZ_GC_CHECK();
+    WINDOW_REF(win) = self;
     MZ_GC_CHECK();
-    win->w_mzscheme_ref = self;
     self->win = win;
     self->so.type = mz_window_type;
 
     MZ_GC_UNREG();
-    return (Scheme_Object *)(self);
+    return (Scheme_Object *)self;
 }
 
 /* (get-win-num [window]) */
@@ -1837,22 +1926,31 @@ set_cursor(void *data, int argc, Scheme_Object **argv)
 mzscheme_open_buffer(void *data, int argc, Scheme_Object **argv)
 {
     Vim_Prim	    *prim = (Vim_Prim *)data;
-    char_u	    *fname;
     int		    num = 0;
-    Scheme_Object   *onum;
+    Scheme_Object   *onum = NULL;
+    Scheme_Object   *buf = NULL;
+    Scheme_Object   *fname;
+
+    MZ_GC_DECL_REG(3);
+    MZ_GC_VAR_IN_REG(0, onum);
+    MZ_GC_VAR_IN_REG(1, buf);
+    MZ_GC_VAR_IN_REG(2, fname);
+    MZ_GC_REG();
+    fname = GUARANTEED_STRING_ARG(prim->name, 0);
 
 #ifdef HAVE_SANDBOX
     sandbox_check();
 #endif
-    fname = (char_u *)SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0));
     /* TODO make open existing file */
-    num = buflist_add(fname, BLN_LISTED | BLN_CURBUF);
+    num = buflist_add(BYTE_STRING_VALUE(fname), BLN_LISTED | BLN_CURBUF);
 
     if (num == 0)
 	raise_vim_exn(_("couldn't open buffer"));
 
     onum = scheme_make_integer(num);
-    return get_buffer_by_num(data, 1, &onum);
+    buf = get_buffer_by_num(data, 1, &onum);
+    MZ_GC_UNREG();
+    return buf;
 }
 
 /* (get-buff-by-num {buffernum}) */
@@ -1878,23 +1976,34 @@ get_buffer_by_name(void *data, int argc, Scheme_Object **argv)
 {
     Vim_Prim	*prim = (Vim_Prim *)data;
     buf_T	*buf;
-    char_u	*fname;
+    Scheme_Object *buffer = NULL;
+    Scheme_Object *fname = NULL;
 
-    fname = (char_u *)SCHEME_STR_VAL(GUARANTEE_STRING(prim->name, 0));
+    MZ_GC_DECL_REG(2);
+    MZ_GC_VAR_IN_REG(0, buffer);
+    MZ_GC_VAR_IN_REG(1, fname);
+    MZ_GC_REG();
+    fname = GUARANTEED_STRING_ARG(prim->name, 0);
+    buffer = scheme_false;
 
     for (buf = firstbuf; buf; buf = buf->b_next)
+    {
 	if (buf->b_ffname == NULL || buf->b_sfname == NULL)
 	    /* empty string */
 	{
-	    if (fname[0] == NUL)
-		return buffer_new(buf);
+	    if (BYTE_STRING_VALUE(fname)[0] == NUL)
+		buffer = buffer_new(buf);
 	}
-	else if (!fnamecmp(buf->b_ffname, fname)
-		|| !fnamecmp(buf->b_sfname, fname))
+	else if (!fnamecmp(buf->b_ffname, BYTE_STRING_VALUE(fname))
+		|| !fnamecmp(buf->b_sfname, BYTE_STRING_VALUE(fname)))
+	{
 	    /* either short or long filename matches */
-	    return buffer_new(buf);
+	    buffer = buffer_new(buf);
+	}
+    }
 
-    return scheme_false;
+    MZ_GC_UNREG();
+    return buffer;
 }
 
 /* (get-next-buff [buffer]) */
@@ -1951,7 +2060,7 @@ get_buffer_name(void *data, int argc, Scheme_Object **argv)
     Vim_Prim	    *prim = (Vim_Prim *)data;
     vim_mz_buffer   *buf = get_buffer_arg(prim->name, 0, argc, argv);
 
-    return scheme_make_string((char *)buf->buf->b_ffname);
+    return scheme_make_byte_string((char *)buf->buf->b_ffname);
 }
 
 /* (curr-buff) */
@@ -1968,25 +2077,30 @@ buffer_new(buf_T *buf)
 
     MZ_GC_DECL_REG(1);
     MZ_GC_VAR_IN_REG(0, self);
-    MZ_GC_REG();
 
     /* We need to handle deletion of buffers underneath us.
      * If we add a "b_mzscheme_ref" field to the buf_T structure,
      * then we can get at it in buf_freeall() in vim.
      */
     if (buf->b_mzscheme_ref)
-	return buf->b_mzscheme_ref;
+	return (Scheme_Object *)BUFFER_REF(buf);
 
-    self = scheme_malloc_fail_ok(scheme_malloc, sizeof(vim_mz_buffer));
+    MZ_GC_REG();
+    self = scheme_malloc_fail_ok(scheme_malloc_tagged, sizeof(vim_mz_buffer));
     vim_memset(self, 0, sizeof(vim_mz_buffer));
-    scheme_dont_gc_ptr(self); /* because buf isn't visible to GC */
+#ifndef MZ_PRECISE_GC
+    scheme_dont_gc_ptr(self);	/* because buf isn't visible to GC */
+#else
+    buf->b_mzscheme_ref = scheme_malloc_immobile_box(NULL);
+#endif
+    MZ_GC_CHECK();
+    BUFFER_REF(buf) = self;
     MZ_GC_CHECK();
-    buf->b_mzscheme_ref = self;
     self->buf = buf;
     self->so.type = mz_buffer_type;
 
     MZ_GC_UNREG();
-    return (Scheme_Object *)(self);
+    return (Scheme_Object *)self;
 }
 
 /*
@@ -2023,7 +2137,7 @@ get_buffer_line(void *data, int argc, Scheme_Object **argv)
     line = ml_get_buf(buf->buf, (linenr_T)linenr, FALSE);
 
     raise_if_error();
-    return scheme_make_string((char *)line);
+    return scheme_make_byte_string((char *)line);
 }
 
 
@@ -2066,7 +2180,7 @@ get_buffer_line_list(void *data, int argc, Scheme_Object **argv)
 
     for (i = n; i >= 0; --i)
     {
-	Scheme_Object *str = scheme_make_string(
+	Scheme_Object *str = scheme_make_byte_string(
 		       (char *)ml_get_buf(buf->buf, (linenr_T)(lo+i), FALSE));
 	raise_if_error();
 
@@ -2298,8 +2412,8 @@ set_buffer_line_list(void *data, int argc, Scheme_Object **argv)
 	    MZ_GC_VAR_IN_REG(1, rest);
 	    MZ_GC_REG();
 
-	    array = (char **)alloc(new_len * sizeof(char *));
-	    vim_memset(array, 0, new_len * sizeof(char *));
+	    array = (char **)alloc((new_len+1)* sizeof(char *));
+	    vim_memset(array, 0, (new_len+1) * sizeof(char *));
 
 	    rest = line_list;
 	    for (i = 0; i < new_len; ++i)
@@ -2481,8 +2595,8 @@ insert_buffer_line_list(void *data, int argc, Scheme_Object **argv)
 	MZ_GC_VAR_IN_REG(1, rest);
 	MZ_GC_REG();
 
-	array = (char **)alloc(size * sizeof(char *));
-	vim_memset(array, 0, size * sizeof(char *));
+	array = (char **)alloc((size+1) * sizeof(char *));
+	vim_memset(array, 0, (size+1) * sizeof(char *));
 
 	rest = list;
 	for (i = 0; i < size; ++i)
@@ -2589,7 +2703,7 @@ string_to_line(Scheme_Object *obj)
 {
     char	*scheme_str = NULL;
     char	*vim_str = NULL;
-    intptr_t	len;
+    OUTPUT_LEN_TYPE	len;
     int		i;
 
     scheme_str = scheme_display_to_string(obj, &len);
@@ -2598,10 +2712,10 @@ string_to_line(Scheme_Object *obj)
      * are replacing a single line, and we must replace it with
      * a single line.
      */
-    if (memchr(scheme_str, '\n', (size_t)len))
+    if (memchr(scheme_str, '\n', len))
 	scheme_signal_error(_("string cannot contain newlines"));
 
-    vim_str = (char *)alloc((int)(len + 1));
+    vim_str = (char *)alloc(len + 1);
 
     /* Create a copy of the string, with internal nulls replaced by
      * newline characters, as is the vim convention.
@@ -2625,13 +2739,35 @@ string_to_line(Scheme_Object *obj)
  * Convert Vim value into MzScheme, adopted from if_python.c
  */
     static Scheme_Object *
-vim_to_mzscheme(typval_T *vim_value, int depth, Scheme_Hash_Table *visited)
+vim_to_mzscheme(typval_T *vim_value)
+{
+    Scheme_Object	*result = NULL;
+    /* hash table to store visited values to avoid infinite loops */
+    Scheme_Hash_Table	*visited = NULL;
+
+    MZ_GC_DECL_REG(2);
+    MZ_GC_VAR_IN_REG(0, result);
+    MZ_GC_VAR_IN_REG(1, visited);
+    MZ_GC_REG();
+
+    visited = scheme_make_hash_table(SCHEME_hash_ptr);
+    MZ_GC_CHECK();
+
+    result = vim_to_mzscheme_impl(vim_value, 1, visited);
+
+    MZ_GC_UNREG();
+    return result;
+}
+
+    static Scheme_Object *
+vim_to_mzscheme_impl(typval_T *vim_value, int depth, Scheme_Hash_Table *visited)
 {
     Scheme_Object   *result = NULL;
     int		    new_value = TRUE;
 
-    MZ_GC_DECL_REG(1);
+    MZ_GC_DECL_REG(2);
     MZ_GC_VAR_IN_REG(0, result);
+    MZ_GC_VAR_IN_REG(1, visited);
     MZ_GC_REG();
 
     /* Avoid infinite recursion */
@@ -2650,8 +2786,7 @@ 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(vim_value->vval.v_string == NULL
-				    ? "" : (char *)vim_value->vval.v_string);
+	result = scheme_make_byte_string((char *)vim_value->vval.v_string);
 	MZ_GC_CHECK();
     }
     else if (vim_value->v_type == VAR_NUMBER)
@@ -2682,14 +2817,14 @@ vim_to_mzscheme(typval_T *vim_value, int depth, Scheme_Hash_Table *visited)
 	    MZ_GC_REG();
 
 	    curr = list->lv_last;
-	    obj = vim_to_mzscheme(&curr->li_tv, depth + 1, visited);
+	    obj = vim_to_mzscheme_impl(&curr->li_tv, depth + 1, visited);
 	    result = scheme_make_pair(obj, scheme_null);
 	    MZ_GC_CHECK();
 
 	    while (curr != list->lv_first)
 	    {
 		curr = curr->li_prev;
-		obj = vim_to_mzscheme(&curr->li_tv, depth + 1, visited);
+		obj = vim_to_mzscheme_impl(&curr->li_tv, depth + 1, visited);
 		result = scheme_make_pair(obj, result);
 		MZ_GC_CHECK();
 	    }
@@ -2722,8 +2857,8 @@ vim_to_mzscheme(typval_T *vim_value, int depth, Scheme_Hash_Table *visited)
 		    --todo;
 
 		    di = dict_lookup(hi);
-		    obj = vim_to_mzscheme(&di->di_tv, depth + 1, visited);
-		    key = scheme_make_string((char *)hi->hi_key);
+		    obj = vim_to_mzscheme_impl(&di->di_tv, depth + 1, visited);
+		    key = scheme_make_byte_string((char *)hi->hi_key);
 		    MZ_GC_CHECK();
 		    scheme_hash_set((Scheme_Hash_Table *)result, key, obj);
 		    MZ_GC_CHECK();
@@ -2732,6 +2867,22 @@ vim_to_mzscheme(typval_T *vim_value, int depth, Scheme_Hash_Table *visited)
 	}
 	MZ_GC_UNREG();
     }
+    else if (vim_value->v_type == VAR_FUNC)
+    {
+	Scheme_Object *funcname = NULL;
+
+	MZ_GC_DECL_REG(1);
+	MZ_GC_VAR_IN_REG(0, funcname);
+	MZ_GC_REG();
+
+	funcname = scheme_make_byte_string((char *)vim_value->vval.v_string);
+	MZ_GC_CHECK();
+	result = scheme_make_closed_prim_w_arity(vim_funcref, funcname,
+		(const char *)BYTE_STRING_VALUE(funcname), 0, -1);
+	MZ_GC_CHECK();
+
+	MZ_GC_UNREG();
+    }
     else
     {
 	result = scheme_void;
@@ -2747,11 +2898,42 @@ vim_to_mzscheme(typval_T *vim_value, int depth, Scheme_Hash_Table *visited)
 }
 
     static int
-mzscheme_to_vim(Scheme_Object *obj, typval_T *tv, int depth,
+mzscheme_to_vim(Scheme_Object *obj, typval_T *tv)
+{
+    int i, status;
+    Scheme_Hash_Table	*visited = NULL;
+
+    MZ_GC_DECL_REG(2);
+    MZ_GC_VAR_IN_REG(0, obj);
+    MZ_GC_VAR_IN_REG(1, visited);
+    MZ_GC_REG();
+
+    visited = scheme_make_hash_table(SCHEME_hash_ptr);
+    MZ_GC_CHECK();
+
+    status = mzscheme_to_vim_impl(obj, tv, 1, visited);
+    for (i = 0; i < visited->size; ++i)
+    {
+	/* free up remembered objects */
+	if (visited->vals[i] != NULL)
+	    free_tv((typval_T *)visited->vals[i]);
+    }
+
+    MZ_GC_UNREG();
+    return status;
+}
+    static int
+mzscheme_to_vim_impl(Scheme_Object *obj, typval_T *tv, int depth,
 	Scheme_Hash_Table *visited)
 {
     int		status = OK;
     typval_T	*found;
+
+    MZ_GC_DECL_REG(2);
+    MZ_GC_VAR_IN_REG(0, obj);
+    MZ_GC_VAR_IN_REG(1, visited);
+    MZ_GC_REG();
+
     MZ_GC_CHECK();
     if (depth > 100) /* limit the deepest recursion level */
     {
@@ -2785,11 +2967,25 @@ mzscheme_to_vim(Scheme_Object *obj, typval_T *tv, int depth,
 	tv->vval.v_float = SCHEME_DBL_VAL(obj);
     }
 # endif
-    else if (SCHEME_STRINGP(obj))
+    else if (SCHEME_BYTE_STRINGP(obj))
     {
 	tv->v_type = VAR_STRING;
-	tv->vval.v_string = vim_strsave((char_u *)SCHEME_STR_VAL(obj));
+	tv->vval.v_string = vim_strsave(BYTE_STRING_VALUE(obj));
     }
+# if MZSCHEME_VERSION_MAJOR >= 299
+    else if (SCHEME_CHAR_STRINGP(obj))
+    {
+	Scheme_Object *tmp = NULL;
+	MZ_GC_DECL_REG(1);
+	MZ_GC_VAR_IN_REG(0, tmp);
+	MZ_GC_REG();
+
+	tmp = scheme_char_string_to_byte_string(obj);
+	tv->v_type = VAR_STRING;
+	tv->vval.v_string = vim_strsave(BYTE_STRING_VALUE(tmp));
+	MZ_GC_UNREG();
+    }
+#endif
     else if (SCHEME_VECTORP(obj) || SCHEME_NULLP(obj)
 	    || SCHEME_PAIRP(obj) || SCHEME_MUTABLE_PAIRP(obj))
     {
@@ -2829,7 +3025,7 @@ mzscheme_to_vim(Scheme_Object *obj, typval_T *tv, int depth,
 		    for (i = 0; i < SCHEME_VEC_SIZE(obj); ++i)
 		    {
 			cval = SCHEME_VEC_ELS(obj)[i];
-			status = mzscheme_to_vim(cval, v, depth + 1, visited);
+			status = mzscheme_to_vim_impl(cval, v, depth + 1, visited);
 			if (status == FAIL)
 			    break;
 			status = list_append_tv(list, v);
@@ -2845,7 +3041,7 @@ mzscheme_to_vim(Scheme_Object *obj, typval_T *tv, int depth,
 			    curr = SCHEME_CDR(curr))
 		    {
 			cval = SCHEME_CAR(curr);
-			status = mzscheme_to_vim(cval, v, depth + 1, visited);
+			status = mzscheme_to_vim_impl(cval, v, depth + 1, visited);
 			if (status == FAIL)
 			    break;
 			status = list_append_tv(list, v);
@@ -2857,7 +3053,7 @@ mzscheme_to_vim(Scheme_Object *obj, typval_T *tv, int depth,
 		     * need to handle the last element */
 		    if (status == OK && !SCHEME_NULLP(curr))
 		    {
-			status = mzscheme_to_vim(cval, v, depth + 1, visited);
+			status = mzscheme_to_vim_impl(cval, v, depth + 1, visited);
 			if (status == OK)
 			{
 			    status = list_append_tv(list, v);
@@ -2905,7 +3101,7 @@ mzscheme_to_vim(Scheme_Object *obj, typval_T *tv, int depth,
 		    dictitem_T  *item = dictitem_alloc((char_u *)string_to_line(
 				((Scheme_Hash_Table *) obj)->keys[i]));
 		    /* convert Scheme val to Vim and add it to the dict */
-		    if (mzscheme_to_vim(((Scheme_Hash_Table *) obj)->vals[i],
+		    if (mzscheme_to_vim_impl(((Scheme_Hash_Table *) obj)->vals[i],
 				    &item->di_tv, depth + 1, visited) == FAIL
 			    || dict_add(dict, item) == FAIL)
 		    {
@@ -2925,19 +3121,76 @@ mzscheme_to_vim(Scheme_Object *obj, typval_T *tv, int depth,
 	tv->v_type = VAR_STRING;
 	tv->vval.v_string = (char_u *)string_to_line(obj);
     }
+    MZ_GC_UNREG();
     return status;
 }
 
+/* Scheme prim procedure wrapping Vim funcref */
+    static Scheme_Object *
+vim_funcref(void *name, int argc, Scheme_Object **argv)
+{
+    int i;
+    typval_T args;
+    int status = OK;
+    Scheme_Object *result = NULL;
+    list_T *list = list_alloc();
+
+    MZ_GC_DECL_REG(1);
+    MZ_GC_VAR_IN_REG(0, result);
+    MZ_GC_REG();
+
+    result = scheme_void;
+    if (list == NULL)
+	status = FAIL;
+    else
+    {
+	args.v_type = VAR_LIST;
+	args.vval.v_list = list;
+	++list->lv_refcount;
+	for (i = 0; status == OK && i < argc; ++i)
+	{
+	    typval_T *v = (typval_T *)alloc(sizeof(typval_T));
+	    if (v == NULL)
+		status = FAIL;
+	    else
+	    {
+		status = mzscheme_to_vim(argv[i], v);
+		if (status == OK)
+		{
+		    status = list_append_tv(list, v);
+		    clear_tv(v);
+		}
+		vim_free(v);
+	    }
+	}
+	if (status == OK)
+	{
+	    typval_T ret;
+	    ret.v_type = VAR_UNKNOWN;
+
+	    mzscheme_call_vim(BYTE_STRING_VALUE((Scheme_Object *)name), &args, &ret);
+	    MZ_GC_CHECK();
+	    result = vim_to_mzscheme(&ret);
+	    clear_tv(&ret);
+	    MZ_GC_CHECK();
+	}
+    }
+    clear_tv(&args);
+    MZ_GC_UNREG();
+    if (status != OK)
+	raise_vim_exn(_("error converting Scheme values to Vim"));
+    else
+	raise_if_error();
+    return result;
+}
+
     void
 do_mzeval(char_u *str, typval_T *rettv)
 {
-    int i;
     Scheme_Object	*ret = NULL;
-    Scheme_Hash_Table	*visited = NULL;
 
-    MZ_GC_DECL_REG(2);
+    MZ_GC_DECL_REG(1);
     MZ_GC_VAR_IN_REG(0, ret);
-    MZ_GC_VAR_IN_REG(0, visited);
     MZ_GC_REG();
 
     if (mzscheme_init())
@@ -2947,20 +3200,8 @@ do_mzeval(char_u *str, typval_T *rettv)
     }
 
     MZ_GC_CHECK();
-    visited = scheme_make_hash_table(SCHEME_hash_ptr);
-    MZ_GC_CHECK();
-
     if (eval_with_exn_handling(str, do_eval, &ret) == OK)
-	mzscheme_to_vim(ret, rettv, 1, visited);
-
-    for (i = 0; i < visited->size; ++i)
-    {
-	/* free up remembered objects */
-	if (visited->vals[i] != NULL)
-	{
-	    free_tv((typval_T *)visited->vals[i]);
-	}
-    }
+	mzscheme_to_vim(ret, rettv);
 
     MZ_GC_UNREG();
 }
@@ -3043,37 +3284,41 @@ raise_vim_exn(const char *add_info)
     char	    *fmt = _("Vim error: ~a");
     Scheme_Object   *argv[2] = {NULL, NULL};
     Scheme_Object   *exn = NULL;
+    Scheme_Object   *byte_string = NULL;
 
-    MZ_GC_DECL_REG(4);
+    MZ_GC_DECL_REG(5);
     MZ_GC_ARRAY_VAR_IN_REG(0, argv, 2);
     MZ_GC_VAR_IN_REG(3, exn);
+    MZ_GC_VAR_IN_REG(4, byte_string);
     MZ_GC_REG();
 
     if (add_info != NULL)
     {
 	char		*c_string = NULL;
-	Scheme_Object	*byte_string = NULL;
 	Scheme_Object   *info = NULL;
 
 	MZ_GC_DECL_REG(3);
 	MZ_GC_VAR_IN_REG(0, c_string);
-	MZ_GC_VAR_IN_REG(1, byte_string);
 	MZ_GC_VAR_IN_REG(2, info);
 	MZ_GC_REG();
 
-	info = scheme_make_string(add_info);
+	info = scheme_make_byte_string(add_info);
 	MZ_GC_CHECK();
-	c_string = scheme_format(fmt, STRLEN(fmt), 1, &info, NULL);
+	c_string = scheme_format_utf8(fmt, STRLEN(fmt), 1, &info, NULL);
 	MZ_GC_CHECK();
-	byte_string = scheme_make_string(c_string);
+	byte_string = scheme_make_byte_string(c_string);
 	MZ_GC_CHECK();
 	argv[0] = scheme_byte_string_to_char_string(byte_string);
-	MZ_GC_CHECK();
 	SCHEME_SET_IMMUTABLE(argv[0]);
 	MZ_GC_UNREG();
     }
     else
-	argv[0] = scheme_make_string(_("Vim error"));
+    {
+	byte_string = scheme_make_byte_string(_("Vim error"));
+	MZ_GC_CHECK();
+	argv[0] = scheme_byte_string_to_char_string(byte_string);
+	MZ_GC_CHECK();
+    }
     MZ_GC_CHECK();
 
 #if MZSCHEME_VERSION_MAJOR < 360
@@ -3264,7 +3509,7 @@ get_vim_curr_buffer(void)
     if (curbuf->b_mzscheme_ref == NULL)
 	return (vim_mz_buffer *)buffer_new(curbuf);
     else
-	return (vim_mz_buffer *)curbuf->b_mzscheme_ref;
+	return BUFFER_REF(curbuf);
 }
 
 /* return MzScheme wrapper for curwin */
@@ -3274,7 +3519,7 @@ get_vim_curr_window(void)
     if (curwin->w_mzscheme_ref == NULL)
 	return (vim_mz_window *)window_new(curwin);
     else
-	return (vim_mz_window *)curwin->w_mzscheme_ref;
+	return WINDOW_REF(curwin);
 }
 
     static void
diff --git a/src/if_mzsch.h b/src/if_mzsch.h
index 65c5de7ca0..7c1766ebbc 100644
--- a/src/if_mzsch.h
+++ b/src/if_mzsch.h
@@ -7,6 +7,7 @@
 #ifdef __MINGW32__
 /* Hack to engage Cygwin-specific settings */
 # define __CYGWIN32__
+# include <stdint.h>
 #endif
 
 /* #ifdef needed for "make depend" */
@@ -20,31 +21,24 @@
 #endif
 
 #if MZSCHEME_VERSION_MAJOR >= 299
-/* macros to be compatible with 20x versions */
-# define scheme_config scheme_current_config()
-# define scheme_make_string scheme_make_byte_string
-# define scheme_make_string_output_port scheme_make_byte_string_output_port
-# define scheme_get_sized_string_output scheme_get_sized_byte_string_output
-# define scheme_write_string scheme_write_byte_string
-# define scheme_make_sized_string scheme_make_sized_byte_string
-
 # define SCHEME_STRINGP(obj) (SCHEME_BYTE_STRINGP(obj) || SCHEME_CHAR_STRINGP(obj))
-# define SCHEME_STR_VAL(obj) SCHEME_BYTE_STR_VAL(   \
-		(SCHEME_BYTE_STRINGP(obj) ? obj : scheme_char_string_to_byte_string(obj)))
-# define GUARANTEE_STRING(fname, argnum) GUARANTEE_TYPE(fname, argnum, SCHEME_STRINGP, "string")
-
-# ifdef scheme_format
-#  undef scheme_format
-# endif
-# define scheme_format scheme_format_utf8
-
-# define SCHEME_GET_BYTE_STRING(obj) (SCHEME_BYTE_STRINGP(obj) ? obj :   \
-	scheme_char_string_to_byte_string(obj))
+# define BYTE_STRING_VALUE(obj) ((char_u *)SCHEME_BYTE_STR_VAL(obj))
 #else
-# define SCHEME_GET_BYTE_STRING(obj) (obj)
+/* macros for compatibility with older versions */
+# define scheme_current_config() scheme_config
+# define scheme_make_sized_byte_string scheme_make_sized_string
+# define scheme_format_utf8 scheme_format
+# ifndef DYNAMIC_MZSCHEME
+/* for dynamic MzScheme there will be separate definitions in if_mzsch.c */
+#  define scheme_get_sized_byte_string_output scheme_get_sized_string_output
+#  define scheme_make_byte_string scheme_make_string
+#  define scheme_make_byte_string_output_port scheme_make_string_output_port
+# endif
+
 # define SCHEME_BYTE_STRLEN_VAL SCHEME_STRLEN_VAL
-# define SCHEME_BYTE_STR_VAL SCHEME_STR_VAL
+# define BYTE_STRING_VALUE(obj) ((char_u *)SCHEME_STR_VAL(obj))
 # define scheme_byte_string_to_char_string(obj) (obj)
+# define SCHEME_BYTE_STRINGP SCHEME_STRINGP
 #endif
 
 /* Precise GC macros */
diff --git a/src/os_unix.c b/src/os_unix.c
index ae41579dc5..c82e593f32 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -278,7 +278,8 @@ static struct signalinfo
 #ifdef SIGBUS
     {SIGBUS,	    "BUS",	TRUE},
 #endif
-#ifdef SIGSEGV
+#if defined(SIGSEGV) && !defined(FEAT_MZSCHEME)
+    /* MzScheme uses SEGV in its garbage collector */
     {SIGSEGV,	    "SEGV",	TRUE},
 #endif
 #ifdef SIGSYS
@@ -3778,7 +3779,7 @@ wait4pid(child, status)
 # endif
 	if (wait_pid == 0)
 	{
-	    /* Wait for 1/100 sec before trying again. */
+	    /* Wait for 10 msec before trying again. */
 	    mch_delay(10L, TRUE);
 	    continue;
 	}
@@ -4797,7 +4798,7 @@ finished:
 	    {
 		/* LINTED avoid "bitwise operation on signed value" */
 		retval = WEXITSTATUS(status);
-		if (retval && !emsg_silent)
+		if (retval != 0 && !emsg_silent)
 		{
 		    if (retval == EXEC_FAILED)
 		    {
diff --git a/src/proto/eval.pro b/src/proto/eval.pro
index a102598559..5ad27aa5d9 100644
--- a/src/proto/eval.pro
+++ b/src/proto/eval.pro
@@ -74,6 +74,7 @@ long get_dict_number __ARGS((dict_T *d, char_u *key));
 char_u *get_function_name __ARGS((expand_T *xp, int idx));
 char_u *get_expr_name __ARGS((expand_T *xp, int idx));
 int func_call __ARGS((char_u *name, typval_T *args, dict_T *selfdict, typval_T *rettv));
+void mzscheme_call_vim __ARGS((char_u *name, typval_T *args, typval_T *rettv));
 long do_searchpair __ARGS((char_u *spat, char_u *mpat, char_u *epat, int dir, char_u *skip, int flags, pos_T *match_pos, linenr_T lnum_stop, long time_limit));
 void set_vim_var_nr __ARGS((int idx, long val));
 long get_vim_var_nr __ARGS((int idx));
diff --git a/src/testdir/test70.in b/src/testdir/test70.in
index 01f43eafb7..24c0c12b48 100644
--- a/src/testdir/test70.in
+++ b/src/testdir/test70.in
@@ -38,12 +38,23 @@ STARTTEST
 :" circular list (at the same time test lists containing lists)
 :mz (set-car! (cddr l) l)
 :let l2 = mzeval("h")["list"]
-:if l2[2] == l2
+:" bug: this returns item2, but it should be l2
+:if l2[2] == "item2"
 :let res = "OK"
 :else
-:let res = "FAILED"
+:let res = "FAILED: " . l2[2]
 :endif
 :call setline(search("^3"), "circular test " . res)
+:" funcrefs
+:mz (define vim:max (vim-eval "function('max')"))
+:mz (define m (vim:max '(1 100 8)))
+:let m = mzeval('m')
+:if m == 100
+:let fref_res = "OK"
+:else
+:let fref_res = "FAILED: " . m
+:end
+:call append(line('$'), 'funcrefs '. fref_res)
 :?^1?,$w! test.out
 :qa!
 ENDTEST
diff --git a/src/testdir/test70.ok b/src/testdir/test70.ok
index f8d2d3158c..9c82a86f2d 100644
--- a/src/testdir/test70.ok
+++ b/src/testdir/test70.ok
@@ -3,3 +3,4 @@ scalar test OK
 2 line 2
 dictionary with list OK
 circular test OK
+funcrefs OK
diff --git a/src/version.c b/src/version.c
index 78dc34db10..bad06f9145 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 */
+/**/
+    791,
 /**/
     790,
 /**/

From 26db286e2d0e9361094e424b7745d33e5e0528bf Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 14:55:42 +0100
Subject: [PATCH 075/106] Added tag v7-3-791 for changeset 16e8a09e8ab0

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

diff --git a/.hgtags b/.hgtags
index 7485da6940..6c1b331cfc 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2127,3 +2127,4 @@ e1b98967a985f4d1ad889c8e69b822d9126411ab v7-3-787
 386fc822dd002958fdade4329845013cbfaa3dab v7-3-788
 43c15135926fb95fa82b01424677a9c37f4d0e46 v7-3-789
 8819ea6dcb72dcf61fd0d20f8ea1904a7546917f v7-3-790
+16e8a09e8ab08d2226dc84b12b7e434bda6b4fa9 v7-3-791

From 4e8314c41037c08a53c78e622ec49339b5382a18 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 16:30:26 +0100
Subject: [PATCH 076/106] updated for version 7.3.792 Problem:    ":substitute"
 works differently without confirmation. Solution:   Do not change the text
 when asking for confirmation, only display 	    it.

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

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index acb4da28dd..0b68309697 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4727,6 +4727,8 @@ do_sub(eap)
 			}
 			else
 			{
+			    char_u *orig_line = NULL;
+			    int    len_change = 0;
 #ifdef FEAT_FOLDING
 			    int save_p_fen = curwin->w_p_fen;
 
@@ -4737,9 +4739,43 @@ do_sub(eap)
 			    temp = RedrawingDisabled;
 			    RedrawingDisabled = 0;
 
+			    if (new_start != NULL)
+			    {
+				/* There already was a substitution, we would
+				 * like to show this to the user.  We cannot
+				 * really update the line, it would change
+				 * what matches.  Temporarily replace the line
+				 * and change it back afterwards. */
+				orig_line = vim_strsave(ml_get(lnum));
+				if (orig_line != NULL)
+				{
+				    char_u *new_line = concat_str(new_start,
+						     sub_firstline + copycol);
+
+				    if (new_line == NULL)
+				    {
+					vim_free(orig_line);
+					orig_line = NULL;
+				    }
+				    else
+				    {
+					/* Position the cursor relative to the
+					 * end of the line, the previous
+					 * substitute may have inserted or
+					 * deleted characters before the
+					 * cursor. */
+					len_change = STRLEN(new_line)
+							  - STRLEN(orig_line);
+					curwin->w_cursor.col += len_change;
+					ml_replace(lnum, new_line, FALSE);
+				    }
+				}
+			    }
+
 			    search_match_lines = regmatch.endpos[0].lnum
 						  - regmatch.startpos[0].lnum;
-			    search_match_endcol = regmatch.endpos[0].col;
+			    search_match_endcol = regmatch.endpos[0].col
+								 + len_change;
 			    highlight_match = TRUE;
 
 			    update_topline();
@@ -4781,6 +4817,10 @@ do_sub(eap)
 			    msg_didout = FALSE;	/* don't scroll up */
 			    msg_col = 0;
 			    gotocmdline(TRUE);
+
+			    /* restore the line */
+			    if (orig_line != NULL)
+				ml_replace(lnum, orig_line, FALSE);
 			}
 
 			need_wait_return = FALSE; /* no hit-return prompt */
@@ -5045,14 +5085,10 @@ skip:
 		 * The check for nmatch_tl is needed for when multi-line
 		 * matching must replace the lines before trying to do another
 		 * match, otherwise "\@<=" won't work.
-		 * When asking the user we like to show the already replaced
-		 * text, but don't do it when "\<@=" or "\<@!" is used, it
-		 * changes what matches.
 		 * When the match starts below where we start searching also
 		 * need to replace the line first (using \zs after \n).
 		 */
 		if (lastone
-			|| (do_ask && !re_lookbehind(regmatch.regprog))
 			|| nmatch_tl > 0
 			|| (nmatch = vim_regexec_multi(&regmatch, curwin,
 							curbuf, sub_firstlnum,
diff --git a/src/version.c b/src/version.c
index bad06f9145..c432491a43 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 */
+/**/
+    792,
 /**/
     791,
 /**/

From 5f1acbd825ea2fac483edcbef55984b967aa057a Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 16:30:26 +0100
Subject: [PATCH 077/106] Added tag v7-3-792 for changeset 7061704c2014

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

diff --git a/.hgtags b/.hgtags
index 6c1b331cfc..33b390f345 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2128,3 +2128,4 @@ e1b98967a985f4d1ad889c8e69b822d9126411ab v7-3-787
 43c15135926fb95fa82b01424677a9c37f4d0e46 v7-3-789
 8819ea6dcb72dcf61fd0d20f8ea1904a7546917f v7-3-790
 16e8a09e8ab08d2226dc84b12b7e434bda6b4fa9 v7-3-791
+7061704c2014e4563efa032672264a47b4b7b0d9 v7-3-792

From 2d1d68577098a8a4f667c031902897cb99a6a23d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 17:03:30 +0100
Subject: [PATCH 078/106] updated for version 7.3.793 Problem:    New
 interactive :substutite behavior is not tested. Solution:   Add tests.
 (Christian Brabandt)

---
 src/testdir/test80.in | 15 +++++++++++++++
 src/testdir/test80.ok |  6 ++++++
 src/version.c         |  2 ++
 3 files changed, 23 insertions(+)

diff --git a/src/testdir/test80.in b/src/testdir/test80.in
index b49650040d..2decb4dbcf 100644
--- a/src/testdir/test80.in
+++ b/src/testdir/test80.in
@@ -143,6 +143,21 @@ ENDTEST
 
 TEST_8:
 
+STARTTEST
+:set magic&
+:set cpo&
+:$put =\"\n\nTEST_8:\"
+:$put =',,X'
+:s/\(^\|,\)\ze\(,\|X\)/\1N/g
+:$put =',,Y'
+:s/\(^\|,\)\ze\(,\|Y\)/\1N/gc
+a:$put =',,Z'
+:s/\(^\|,\)\ze\(,\|Z\)/\1N/gc
+yy/^TEST_9
+ENDTEST
+
+TEST_9:
+
 STARTTEST
 :/^Results/,$wq! test.out
 ENDTEST
diff --git a/src/testdir/test80.ok b/src/testdir/test80.ok
index fd5b5e778d..775d985312 100644
--- a/src/testdir/test80.ok
+++ b/src/testdir/test80.ok
@@ -99,3 +99,9 @@ TEST_7:
 A
A
 B
 B
+
+
+TEST_8:
+N,,NX
+N,,NY
+N,,NZ
diff --git a/src/version.c b/src/version.c
index c432491a43..5cd929535b 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 */
+/**/
+    793,
 /**/
     792,
 /**/

From 556e7e54f6484fa25736afa62aa3dc52f1060c2d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 17:03:30 +0100
Subject: [PATCH 079/106] Added tag v7-3-793 for changeset fdbded463fdc

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

diff --git a/.hgtags b/.hgtags
index 33b390f345..5f2bda23e6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2129,3 +2129,4 @@ e1b98967a985f4d1ad889c8e69b822d9126411ab v7-3-787
 8819ea6dcb72dcf61fd0d20f8ea1904a7546917f v7-3-790
 16e8a09e8ab08d2226dc84b12b7e434bda6b4fa9 v7-3-791
 7061704c2014e4563efa032672264a47b4b7b0d9 v7-3-792
+fdbded463fdcc861630b3ea61b9654374847231a v7-3-793

From f9b82f9951686d057f8eb545ce6b41a93ed83b82 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 17:30:17 +0100
Subject: [PATCH 080/106] updated for version 7.3.794 Problem:    Tiny build
 fails. (Tony Mechelynck) Solution:   Adjust #ifdefs.

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

diff --git a/src/charset.c b/src/charset.c
index 6f39cf6d07..b5dcfac1ba 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -939,19 +939,17 @@ vim_iswordp(p)
     return GET_CHARTAB(curbuf, *p) != 0;
 }
 
-#if defined(FEAT_SYN_HL) || defined(PROTO)
     int
 vim_iswordp_buf(p, buf)
     char_u	*p;
     buf_T	*buf;
 {
-# ifdef FEAT_MBYTE
+#ifdef FEAT_MBYTE
     if (has_mbyte && MB_BYTE2LEN(*p) > 1)
 	return mb_get_class(p) >= 2;
-# endif
+#endif
     return (GET_CHARTAB(buf, *p) != 0);
 }
-#endif
 
 /*
  * return TRUE if 'c' is a valid file-name character
diff --git a/src/version.c b/src/version.c
index 5cd929535b..1f42e3e068 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 */
+/**/
+    794,
 /**/
     793,
 /**/

From 50401eabd9c3cd9a742799fa409d02604802081d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 17:30:18 +0100
Subject: [PATCH 081/106] Added tag v7-3-794 for changeset 9867f92c9b9f

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

diff --git a/.hgtags b/.hgtags
index 5f2bda23e6..ed6b15e4f4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2130,3 +2130,4 @@ e1b98967a985f4d1ad889c8e69b822d9126411ab v7-3-787
 16e8a09e8ab08d2226dc84b12b7e434bda6b4fa9 v7-3-791
 7061704c2014e4563efa032672264a47b4b7b0d9 v7-3-792
 fdbded463fdcc861630b3ea61b9654374847231a v7-3-793
+9867f92c9b9fb082ee6daca816f859b53ed8e58b v7-3-794

From 4a5f6f8ec872ec26e544a13d24433bc15feb3c40 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 17:41:50 +0100
Subject: [PATCH 082/106] updated for version 7.3.795 Problem:    MzScheme does
 not build with tiny features. Solution:   Add #ifdefs.  Also add UNUSED to
 avoid warnings.  And change 	    library ordering.

---
 src/Makefile   |  4 +++-
 src/if_mzsch.c | 24 ++++++++++++++++--------
 src/version.c  |  2 ++
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index cb531a2047..6de37aa4b6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1345,6 +1345,8 @@ LINT_EXTRA = -DUSE_SNIFF -DHANGUL_INPUT -D"__attribute__(x)="
 
 DEPEND_CFLAGS = -DPROTO -DDEPEND -DFEAT_GUI $(LINT_CFLAGS)
 
+# Note: MZSCHEME_LIBS must come before LIBS, because LIBS adds -lm which is
+# needed by racket.
 ALL_LIB_DIRS = $(GUI_LIBS_DIR) $(X_LIBS_DIR)
 ALL_LIBS = \
 	   $(GUI_LIBS1) \
@@ -1353,10 +1355,10 @@ ALL_LIBS = \
 	   $(X_PRE_LIBS) \
 	   $(X_LIBS) \
 	   $(X_EXTRA_LIBS) \
+	   $(MZSCHEME_LIBS) \
 	   $(LIBS) \
 	   $(EXTRA_LIBS) \
 	   $(LUA_LIBS) \
-	   $(MZSCHEME_LIBS) \
 	   $(PERL_LIBS) \
 	   $(PYTHON_LIBS) \
 	   $(PYTHON3_LIBS) \
diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index 8b8c8016f0..f9bcd5d91c 100644
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -1483,7 +1483,7 @@ vim_command(void *data, int argc, Scheme_Object **argv)
 
 /* (eval {expr-string}) */
     static Scheme_Object *
-vim_eval(void *data, int argc, Scheme_Object **argv)
+vim_eval(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
 {
 #ifdef FEAT_EVAL
     Vim_Prim		*prim = (Vim_Prim *)data;
@@ -1686,10 +1686,12 @@ get_curr_win(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
     static Scheme_Object *
 get_window_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
 {
-    win_T   *w;
     int	    n = 0;
+#ifdef FEAT_WINDOWS
+    win_T   *w;
 
     for (w = firstwin; w != NULL; w = w->w_next)
+#endif
 	++n;
     return scheme_make_integer(n);
 }
@@ -1701,12 +1703,14 @@ get_window_list(void *data, int argc, Scheme_Object **argv)
     Vim_Prim	    *prim = (Vim_Prim *)data;
     vim_mz_buffer   *buf;
     Scheme_Object   *list;
-    win_T	    *w;
+    win_T	    *w = firstwin;
 
     buf = get_buffer_arg(prim->name, 0, argc, argv);
     list = scheme_null;
 
-    for (w = firstwin; w != NULL; w = w->w_next)
+#ifdef FEAT_WINDOWS
+    for ( ; w != NULL; w = w->w_next)
+#endif
 	if (w->w_buffer == buf->buf)
 	{
 	    list = scheme_make_pair(window_new(w), list);
@@ -1755,14 +1759,16 @@ window_new(win_T *win)
 
 /* (get-win-num [window]) */
     static Scheme_Object *
-get_window_num(void *data, int argc, Scheme_Object **argv)
+get_window_num(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
 {
+    int		nr = 1;
+#ifdef FEAT_WINDOWS
     Vim_Prim	*prim = (Vim_Prim *)data;
     win_T	*win = get_window_arg(prim->name, 0, argc, argv)->win;
-    int		nr = 1;
     win_T	*wp;
 
     for (wp = firstwin; wp != win; wp = wp->w_next)
+#endif
 	++nr;
 
     return scheme_make_integer(nr);
@@ -1773,14 +1779,16 @@ get_window_num(void *data, int argc, Scheme_Object **argv)
 get_window_by_num(void *data, int argc, Scheme_Object **argv)
 {
     Vim_Prim	*prim = (Vim_Prim *)data;
-    win_T	*win;
+    win_T	*win = firstwin;
     int		fnum;
 
     fnum = SCHEME_INT_VAL(GUARANTEE_INTEGER(prim->name, 0));
     if (fnum < 1)
 	scheme_signal_error(_("window index is out of range"));
 
-    for (win = firstwin; win != NULL; win = win->w_next, --fnum)
+#ifdef FEAT_WINDOWS
+    for ( ; win != NULL; win = win->w_next, --fnum)
+#endif
 	if (fnum == 1)	    /* to be 1-based */
 	    return window_new(win);
 
diff --git a/src/version.c b/src/version.c
index 1f42e3e068..e729a617fe 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 */
+/**/
+    795,
 /**/
     794,
 /**/

From 9858827a346f2ad7bb8249ed654ecd6c677ede5f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 17:41:50 +0100
Subject: [PATCH 083/106] Added tag v7-3-795 for changeset 17a312ba38a0

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

diff --git a/.hgtags b/.hgtags
index ed6b15e4f4..4fe6f77731 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2131,3 +2131,4 @@ e1b98967a985f4d1ad889c8e69b822d9126411ab v7-3-787
 7061704c2014e4563efa032672264a47b4b7b0d9 v7-3-792
 fdbded463fdcc861630b3ea61b9654374847231a v7-3-793
 9867f92c9b9fb082ee6daca816f859b53ed8e58b v7-3-794
+17a312ba38a0b606cfd64d82ed2ebc844828085f v7-3-795

From 128bc2497796964939a7b9cfc770f21ab09a3f76 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 18:21:51 +0100
Subject: [PATCH 084/106] updated for version 7.3.796 Problem:    "/[^\n]" does
 match at a line break. Solution:   Make it do the same as "/.". (Christian
 Brabandt)

---
 src/regexp.c          |  11 +++++++----
 src/testdir/test79.in | Bin 2531 -> 2575 bytes
 src/testdir/test79.ok | Bin 397 -> 401 bytes
 src/version.c         |   2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/regexp.c b/src/regexp.c
index b6506a03a6..d85ded8af0 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -2397,13 +2397,15 @@ collection:
 			    /* '\n' in range: also match NL */
 			    if (ret != JUST_CALC_SIZE)
 			    {
-				if (*ret == ANYBUT)
-				    *ret = ANYBUT + ADD_NL;
-				else if (*ret == ANYOF)
+				/* Using \n inside [^] does not change what
+				 * matches. "[^\n]" is the same as ".". */
+				if (*ret == ANYOF)
+				{
 				    *ret = ANYOF + ADD_NL;
+				    *flagp |= HASNL;
+				}
 				/* else: must have had a \n already */
 			    }
-			    *flagp |= HASNL;
 			    regparse++;
 			    startc = -1;
 			}
@@ -4344,6 +4346,7 @@ regmatch(scan)
 	    break; /* Matched with EOW */
 
 	  case ANY:
+	    /* ANY does not match new lines. */
 	    if (c == NUL)
 		status = RA_NOMATCH;
 	    else
diff --git a/src/testdir/test79.in b/src/testdir/test79.in
index 8fa11d9ad79cd389169051166babb22d8e1f4041..f83b6b6e2265fe6f2581e015e3e0e94c01ed3fa6 100644
GIT binary patch
delta 58
zcmaDX+%K}Bo>NUfE>MNbs#rfTIxZ$JHc&stwzxDYH?br+L&HE*Pbn=wKPj<DX>u*6
NG;<(V;N<C?J^(9L5>EgC

delta 36
pcmeAdc`Ur4o>Rir&n3h)IE0G}M8=z2aXIojayc<LO+L)&0|3S(3HJa1

diff --git a/src/testdir/test79.ok b/src/testdir/test79.ok
index 6685b44f9ad2366519b66ddc20078429269f7e43..31ad3a41e46912727705358d815ae596c8a19a7a 100644
GIT binary patch
delta 13
UcmeBWp2)nRhmkdqE0Bu|02?*~CjbBd

delta 9
QcmbQp+{?V7hmnyB01nmyZ2$lO

diff --git a/src/version.c b/src/version.c
index e729a617fe..f289e437e1 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 */
+/**/
+    796,
 /**/
     795,
 /**/

From 9928f9f32fd8072ee64b69c43e4bc7518ebc42d3 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 18:21:52 +0100
Subject: [PATCH 085/106] Added tag v7-3-796 for changeset 2c12c4e2fae8

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

diff --git a/.hgtags b/.hgtags
index 4fe6f77731..aa3a78f7c5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2132,3 +2132,4 @@ e1b98967a985f4d1ad889c8e69b822d9126411ab v7-3-787
 fdbded463fdcc861630b3ea61b9654374847231a v7-3-793
 9867f92c9b9fb082ee6daca816f859b53ed8e58b v7-3-794
 17a312ba38a0b606cfd64d82ed2ebc844828085f v7-3-795
+2c12c4e2fae8db60fbdf58b34c8b73eacdc32665 v7-3-796

From e75d2ae58d87fa27a60c3af66247a7fba948bdf3 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 21:56:21 +0100
Subject: [PATCH 086/106] updated for version 7.3.797 Problem:    Compiler
 warning for size_t to int conversion. (Skeept) Solution:   Add type casts.

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

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 0b68309697..3c865e7849 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4764,8 +4764,8 @@ do_sub(eap)
 					 * substitute may have inserted or
 					 * deleted characters before the
 					 * cursor. */
-					len_change = STRLEN(new_line)
-							  - STRLEN(orig_line);
+					len_change = (int)STRLEN(new_line)
+						     - (int)STRLEN(orig_line);
 					curwin->w_cursor.col += len_change;
 					ml_replace(lnum, new_line, FALSE);
 				    }
diff --git a/src/version.c b/src/version.c
index f289e437e1..8cd0432d02 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 */
+/**/
+    797,
 /**/
     796,
 /**/

From fa078aa58cd731090cf50d18743f94e628d89863 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 30 Jan 2013 21:56:21 +0100
Subject: [PATCH 087/106] Added tag v7-3-797 for changeset 0cbea05f19c7

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

diff --git a/.hgtags b/.hgtags
index aa3a78f7c5..350d200720 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2133,3 +2133,4 @@ fdbded463fdcc861630b3ea61b9654374847231a v7-3-793
 9867f92c9b9fb082ee6daca816f859b53ed8e58b v7-3-794
 17a312ba38a0b606cfd64d82ed2ebc844828085f v7-3-795
 2c12c4e2fae8db60fbdf58b34c8b73eacdc32665 v7-3-796
+0cbea05f19c73c01dbd0f04378a65ab7de6719e7 v7-3-797

From cf55acd97ae50f16b50c2db70897b112ce0ec7fc Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 31 Jan 2013 21:09:15 +0100
Subject: [PATCH 088/106] updated for version 7.3.798 Problem:    MzScheme:
 circular list does not work correctly. Solution:   Separate Mac-specific code
 from generic code. (Sergey Khorev)

---
 src/if_mzsch.c        | 31 +++++++++++++++++++++++++++++++
 src/testdir/test70.in |  3 +--
 src/version.c         |  2 ++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index f9bcd5d91c..2384464095 100644
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -965,6 +965,7 @@ startup_mzscheme(void)
 #ifdef MZSCHEME_COLLECTS
     /* setup 'current-library-collection-paths' parameter */
 # if MZSCHEME_VERSION_MAJOR >= 299
+#  ifdef MACOS
     {
 	Scheme_Object	*coll_byte_string = NULL;
 	Scheme_Object	*coll_char_string = NULL;
@@ -985,6 +986,36 @@ startup_mzscheme(void)
 	MZ_GC_CHECK();
 	MZ_GC_UNREG();
     }
+#  else
+   {
+	Scheme_Object	*coll_byte_string = NULL;
+	Scheme_Object	*coll_char_string = NULL;
+	Scheme_Object	*coll_path = NULL;
+	Scheme_Object	*coll_pair = NULL;
+	Scheme_Config	*config = NULL;
+
+	MZ_GC_DECL_REG(5);
+	MZ_GC_VAR_IN_REG(0, coll_byte_string);
+	MZ_GC_VAR_IN_REG(1, coll_char_string);
+	MZ_GC_VAR_IN_REG(2, coll_path);
+	MZ_GC_VAR_IN_REG(3, coll_pair);
+	MZ_GC_VAR_IN_REG(4, config);
+	MZ_GC_REG();
+	coll_byte_string = scheme_make_byte_string(MZSCHEME_COLLECTS);
+	MZ_GC_CHECK();
+	coll_char_string = scheme_byte_string_to_char_string(coll_byte_string);
+	MZ_GC_CHECK();
+	coll_path = scheme_char_string_to_path(coll_char_string);
+	MZ_GC_CHECK();
+	coll_pair = scheme_make_pair(coll_path, scheme_null);
+	MZ_GC_CHECK();
+	config = scheme_current_config();
+	MZ_GC_CHECK();
+	scheme_set_param(config, MZCONFIG_COLLECTION_PATHS, coll_pair);
+	MZ_GC_CHECK();
+	MZ_GC_UNREG();
+    }
+#  endif
 # else
     {
 	Scheme_Object	*coll_string = NULL;
diff --git a/src/testdir/test70.in b/src/testdir/test70.in
index 24c0c12b48..9fbe818b3d 100644
--- a/src/testdir/test70.in
+++ b/src/testdir/test70.in
@@ -38,8 +38,7 @@ STARTTEST
 :" circular list (at the same time test lists containing lists)
 :mz (set-car! (cddr l) l)
 :let l2 = mzeval("h")["list"]
-:" bug: this returns item2, but it should be l2
-:if l2[2] == "item2"
+:if l2[2] == l2
 :let res = "OK"
 :else
 :let res = "FAILED: " . l2[2]
diff --git a/src/version.c b/src/version.c
index 8cd0432d02..2f17d2c4ed 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 */
+/**/
+    798,
 /**/
     797,
 /**/

From 11b1af3ea3c7635efdbfc4c5dd5c5e08b9e295da Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Thu, 31 Jan 2013 21:09:15 +0100
Subject: [PATCH 089/106] Added tag v7-3-798 for changeset cdaa688e3ddd

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

diff --git a/.hgtags b/.hgtags
index 350d200720..09343b100d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2134,3 +2134,4 @@ fdbded463fdcc861630b3ea61b9654374847231a v7-3-793
 17a312ba38a0b606cfd64d82ed2ebc844828085f v7-3-795
 2c12c4e2fae8db60fbdf58b34c8b73eacdc32665 v7-3-796
 0cbea05f19c73c01dbd0f04378a65ab7de6719e7 v7-3-797
+cdaa688e3dddc442c1d39780b6ac0b5ac98c253e v7-3-798

From 2d745a1f90f96d8c9755d6a9d1fd4a27015d349d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 12:14:48 +0100
Subject: [PATCH 090/106] updated for version 7.3.799 Problem:    The color
 column is not correct when entering a buffer. (Ben 	    Fritz) Solution:  
 Call check_colorcolumn() if 'textwidth' changed. (Christian 	    Brabandt)

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

diff --git a/src/buffer.c b/src/buffer.c
index 7f0c106e13..f4713a1f79 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1441,6 +1441,8 @@ set_curbuf(buf, action)
 enter_buffer(buf)
     buf_T	*buf;
 {
+    long old_tw = curbuf->b_p_tw;
+
     /* Copy buffer and window local option values.  Not for a help buffer. */
     buf_copy_options(buf, BCO_ENTER | BCO_NOHELP);
     if (!buf->b_help)
@@ -1464,6 +1466,8 @@ enter_buffer(buf)
 
 #ifdef FEAT_SYN_HL
     curwin->w_s = &(buf->b_s);
+    if (old_tw != buf->b_p_tw)
+	check_colorcolumn(curwin);
 #endif
 
     /* Cursor on first line by default. */
diff --git a/src/version.c b/src/version.c
index 2f17d2c4ed..7689b56013 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 */
+/**/
+    799,
 /**/
     798,
 /**/

From e61b2625e028a657316540305ffb8942c8d91860 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 12:14:48 +0100
Subject: [PATCH 091/106] Added tag v7-3-799 for changeset 5e9730de25e9

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

diff --git a/.hgtags b/.hgtags
index 09343b100d..e92dbe4ceb 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2135,3 +2135,4 @@ fdbded463fdcc861630b3ea61b9654374847231a v7-3-793
 2c12c4e2fae8db60fbdf58b34c8b73eacdc32665 v7-3-796
 0cbea05f19c73c01dbd0f04378a65ab7de6719e7 v7-3-797
 cdaa688e3dddc442c1d39780b6ac0b5ac98c253e v7-3-798
+5e9730de25e9b4fc2abe14b8d6b0968a9e59983a v7-3-799

From 263e6614927b2a446983bdc5a4525bcad8199ded Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 12:33:21 +0100
Subject: [PATCH 092/106] updated for version 7.3.800 Problem:    The " mark is
 not adjusted when inserting lines. (Roland Eggner) Solution:   Adjust the
 line number. (Christian Brabandt)

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

diff --git a/src/mark.c b/src/mark.c
index 540f70b97b..f31f53b527 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -1047,6 +1047,7 @@ mark_adjust(line1, line2, amount, amount_after)
 #ifdef FEAT_WINDOWS
     tabpage_T	*tab;
 #endif
+    static pos_T initpos = INIT_POS_T(1, 0, 0);
 
     if (line2 < line1 && amount_after == 0L)	    /* nothing to do */
 	return;
@@ -1072,6 +1073,11 @@ mark_adjust(line1, line2, amount, amount_after)
 	/* last change position */
 	one_adjust(&(curbuf->b_last_change.lnum));
 
+	/* last cursor position, if it was set */
+	if (!equalpos(curbuf->b_last_cursor, initpos))
+	    one_adjust(&(curbuf->b_last_cursor.lnum));
+
+
 #ifdef FEAT_JUMPLIST
 	/* list of change positions */
 	for (i = 0; i < curbuf->b_changelistlen; ++i)
diff --git a/src/version.c b/src/version.c
index 7689b56013..af8210a9df 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 */
+/**/
+    800,
 /**/
     799,
 /**/

From 91d651f5eabd277954172191487fdd4a9c279b67 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 12:33:21 +0100
Subject: [PATCH 093/106] Added tag v7-3-800 for changeset c0cc0e0620dd

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

diff --git a/.hgtags b/.hgtags
index e92dbe4ceb..085aeb3abe 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2136,3 +2136,4 @@ fdbded463fdcc861630b3ea61b9654374847231a v7-3-793
 0cbea05f19c73c01dbd0f04378a65ab7de6719e7 v7-3-797
 cdaa688e3dddc442c1d39780b6ac0b5ac98c253e v7-3-798
 5e9730de25e9b4fc2abe14b8d6b0968a9e59983a v7-3-799
+c0cc0e0620dd935956a472e5b23369d1d78f5fb9 v7-3-800

From 873caf099962ef74e37cdfe80229f7267be6186b Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 13:38:02 +0100
Subject: [PATCH 094/106] updated for version 7.3.801 Problem:    ":window set
 nu?" displays the cursor line. (Nazri Ramliy) Solution:   Do not update the
 cursor line when conceallevel is zero or the 	    screen has scrolled.
 (partly by Christian Brabandt)

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

diff --git a/src/version.c b/src/version.c
index af8210a9df..69184b05ad 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 */
+/**/
+    801,
 /**/
     800,
 /**/
diff --git a/src/window.c b/src/window.c
index b5d4afd2b4..1a09c9145c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3991,9 +3991,10 @@ win_goto(wp)
 
 #ifdef FEAT_CONCEAL
     /* Conceal cursor line in previous window, unconceal in current window. */
-    if (win_valid(owp))
+    if (win_valid(owp) && owp->w_p_cole > 0 && !msg_scrolled)
 	update_single_line(owp, owp->w_cursor.lnum);
-    update_single_line(curwin, curwin->w_cursor.lnum);
+    if (curwin->w_p_cole > 0 && !msg_scrolled)
+	need_cursor_line_redraw = TRUE;
 #endif
 }
 

From 02e310429833b8f9ebeae067c938e2fb0f6000e6 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 13:38:02 +0100
Subject: [PATCH 095/106] Added tag v7-3-801 for changeset 48b54c590dc8

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

diff --git a/.hgtags b/.hgtags
index 085aeb3abe..de8fcb0e7a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2137,3 +2137,4 @@ fdbded463fdcc861630b3ea61b9654374847231a v7-3-793
 cdaa688e3dddc442c1d39780b6ac0b5ac98c253e v7-3-798
 5e9730de25e9b4fc2abe14b8d6b0968a9e59983a v7-3-799
 c0cc0e0620dd935956a472e5b23369d1d78f5fb9 v7-3-800
+48b54c590dc83b705f2e19f9aea1e9a69fe09720 v7-3-801

From e7e32244f8a6cfe0a6980a2bbc7b6b4ffefee5e1 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 16:26:26 +0100
Subject: [PATCH 096/106] updated for version 7.3.802 Problem:    After setting
 'isk' to a value ending in a comma appending to the 	    option fails.
 Solution:   Disallow a trailing comma for 'isk' and similar options.

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

diff --git a/src/charset.c b/src/charset.c
index b5dcfac1ba..fd4b500be5 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -284,7 +284,12 @@ buf_init_chartab(buf, global)
 		}
 		++c;
 	    }
+
+	    c = *p;
 	    p = skip_to_option_part(p);
+	    if (c == ',' && *p == NUL)
+		/* Trailing comma is not allowed. */
+		return FAIL;
 	}
     }
     chartab_initialized = TRUE;
diff --git a/src/version.c b/src/version.c
index 69184b05ad..90ac7247e9 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 */
+/**/
+    802,
 /**/
     801,
 /**/

From fe6de61962dbd6b2f9a4768c33693980e6465c55 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 16:26:26 +0100
Subject: [PATCH 097/106] Added tag v7-3-802 for changeset cd5145d2408b

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

diff --git a/.hgtags b/.hgtags
index de8fcb0e7a..33df97414a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2138,3 +2138,4 @@ cdaa688e3dddc442c1d39780b6ac0b5ac98c253e v7-3-798
 5e9730de25e9b4fc2abe14b8d6b0968a9e59983a v7-3-799
 c0cc0e0620dd935956a472e5b23369d1d78f5fb9 v7-3-800
 48b54c590dc83b705f2e19f9aea1e9a69fe09720 v7-3-801
+cd5145d2408bb52217417af654f5664af269e19e v7-3-802

From a4335d2a12a490caf70425260ab97e67a14d140c Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 17:34:04 +0100
Subject: [PATCH 098/106] Updated runtime files.

---
 runtime/autoload/clojurecomplete.vim |  20 ++
 runtime/doc/diff.txt                 |   2 +-
 runtime/doc/gui_w16.txt              |   2 +-
 runtime/doc/gui_w32.txt              |   2 +-
 runtime/doc/if_mzsch.txt             |   2 +-
 runtime/doc/if_pyth.txt              |   4 +-
 runtime/doc/indent.txt               | 100 +++++++
 runtime/doc/index.txt                |  20 +-
 runtime/doc/tags                     |  10 +
 runtime/doc/todo.txt                 |  43 ++-
 runtime/doc/usr_toc.txt              |   2 +-
 runtime/filetype.vim                 |   6 +-
 runtime/ftplugin/clojure.vim         |  79 ++++++
 runtime/indent/clojure.vim           | 398 +++++++++++++++++++++++++++
 runtime/syntax/cl.vim                |   4 +-
 runtime/syntax/clojure.vim           | 134 +++++++++
 runtime/syntax/help.vim              |   9 +-
 17 files changed, 802 insertions(+), 35 deletions(-)
 create mode 100644 runtime/autoload/clojurecomplete.vim
 create mode 100644 runtime/ftplugin/clojure.vim
 create mode 100644 runtime/indent/clojure.vim
 create mode 100644 runtime/syntax/clojure.vim

diff --git a/runtime/autoload/clojurecomplete.vim b/runtime/autoload/clojurecomplete.vim
new file mode 100644
index 0000000000..704ea074cd
--- /dev/null
+++ b/runtime/autoload/clojurecomplete.vim
@@ -0,0 +1,20 @@
+" Vim completion script
+" Language:     Clojure
+" Maintainer:   Sung Pae <self@sungpae.com>
+" URL:          https://github.com/guns/vim-clojure-static
+" License:      Same as Vim
+" Last Change:  05 February 2013
+
+" Special forms and public vars in clojure.core
+" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-002/vim_clojure_static.clj
+" Clojure 1.5.0-RC6
+let s:words = ["*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-readably*","*read-eval*","*read-whitelist*","*source-path*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","accessor","aclone","add-classpath","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc!","assoc","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","booleans","bound-fn","bound-fn*","bound?","butlast","byte","byte-array","bytes","case","cast","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","concat","cond","cond->","cond->>","condp","conj!","conj","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj!","disj","dissoc!","dissoc","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","doubles","drop","drop-last","drop-while","empty","empty?","ensure","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-data","ex-info","extend","extend-protocol","extend-type","extenders","extends?","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","hash","hash-combine","hash-map","hash-set","identical?","identity","if","if-let","if-not","ifn?","import","in-ns","inc","inc'","init-proxy","instance?","int","int-array","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let","letfn","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","neg?","new","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop!","pop","pop-thread-bindings","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","quot","quote","rand","rand-int","rand-nth","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read-line","read-string","realized?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-watch","repeat","repeatedly","replace","replicate","require","reset!","reset-meta!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seque","sequence","sequential?","set!","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","slurp","some","some->","some->>","some-fn","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","symbol","symbol?","sync","take","take-last","take-nth","take-while","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transient","tree-seq","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","update-in","update-proxy","use","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","when","when-first","when-let","when-not","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
+
+" Simple word completion omnifunc
+function! clojurecomplete#Complete(findstart, base)
+    if a:findstart
+        return searchpos('\<', 'bnW', line('.'))[1] - 1
+    else
+        return { 'words': filter(copy(s:words), 'v:val =~ "\\V\\^' . a:base . '"') }
+    endif
+endfunction
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 036dc5e136..a51138ab94 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -220,7 +220,7 @@ The diffs are highlighted with these groups:
 				that parts in the middle that are still the
 				same are highlighted anyway.  Only "iwhite" of
 				'diffopt' is used here.
-|hl-DiffDelete| DiffDelete	Deleted lines.  Also called filler lines,
+|hl-DiffDelete|	DiffDelete	Deleted lines.  Also called filler lines,
 				because they don't really exist in this
 				buffer.
 
diff --git a/runtime/doc/gui_w16.txt b/runtime/doc/gui_w16.txt
index a98f0d039f..5b1ca64ab5 100644
--- a/runtime/doc/gui_w16.txt
+++ b/runtime/doc/gui_w16.txt
@@ -16,7 +16,7 @@ Vim's Graphical User Interface				*gui-w16* *win16-gui*
 
 Other relevant documentation:
 |gui.txt|	For generic items of the GUI.
-|os_msdos.txt|  For items common to DOS and Windows.
+|os_msdos.txt|	For items common to DOS and Windows.
 |gui_w32.txt|	Some items here are also applicable to the Win16 version.
 
 {Vi does not have a Windows GUI}
diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt
index 2958282d07..ee8049cbd5 100644
--- a/runtime/doc/gui_w32.txt
+++ b/runtime/doc/gui_w32.txt
@@ -17,7 +17,7 @@ Vim's Win32 Graphical User Interface			*gui-w32* *win32-gui*
 
 Other relevant documentation:
 |gui.txt|	For generic items of the GUI.
-|os_win32.txt|  For Win32 specific items.
+|os_win32.txt| 	For Win32 specific items.
 
 {Vi does not have a Windows GUI}
 
diff --git a/runtime/doc/if_mzsch.txt b/runtime/doc/if_mzsch.txt
index f9b87f7fbf..b7a35c2674 100644
--- a/runtime/doc/if_mzsch.txt
+++ b/runtime/doc/if_mzsch.txt
@@ -1,4 +1,4 @@
-*if_mzsch.txt*  For Vim version 7.3.  Last change: 2010 Feb 11
+*if_mzsch.txt*  For Vim version 7.3.  Last change: 2012 Dec 17
 
 
 		  VIM REFERENCE MANUAL    by Sergey Khorev
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 23b6b38abf..575002319a 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: 2013 Jan 30
+*if_pyth.txt*   For Vim version 7.3.  Last change: 2013 Feb 03
 
 
 		  VIM REFERENCE MANUAL    by Paul Moore
@@ -385,7 +385,7 @@ sure edit "gvim.exe" and search for "python\d*.dll\c".
 
 							*:py3* *:python3*
 The |:py3| and |:python3| commands work similar to |:python|.  A simple check
-if the `:py3` command is wrong: >
+if the `:py3` command is working: >
 	:py3 print("Hello")
 <							*:py3file*
 The |:py3file| command works similar to |:pyfile|.
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 6a43896c00..022e212522 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -577,6 +577,106 @@ $VIMRUNTIME/indent directory for examples.
 REMARKS ABOUT SPECIFIC INDENT FILES ~
 
 
+CLOJURE					*ft-clojure-indent* *clojure-indent*
+
+Clojure indentation differs somewhat from traditional Lisps, due in part to
+the use of square and curly brackets, and otherwise by community convention.
+These conventions are not always universally followed, so the Clojure indent
+script offers a few configurable options, listed below.
+
+If the current vim does not include searchpairpos(), the indent script falls
+back to normal 'lisp' indenting, and the following options are ignored.
+
+							*g:clojure_maxlines*
+
+Set maximum scan distance of searchpairpos(). Larger values trade performance
+for correctness when dealing with very long forms. A value of 0 will scan
+without limits.
+>
+	" Default
+	let g:clojure_maxlines = 100
+<
+
+						*g:clojure_fuzzy_indent*
+					*g:clojure_fuzzy_indent_patterns*
+					*g:clojure_fuzzy_indent_blacklist*
+
+The 'lispwords' option is a list of comma-separated words that mark special
+forms whose subforms must be indented with two spaces.
+
+For example:
+>
+	(defn bad []
+	      "Incorrect indentation")
+
+	(defn good []
+	  "Correct indentation")
+<
+If you would like to specify 'lispwords' with a |pattern| instead, you can use
+the fuzzy indent feature:
+>
+	" Default
+	let g:clojure_fuzzy_indent = 1
+	let g:clojure_fuzzy_indent_patterns = ['^with', '^def', '^let']
+	let g:clojure_fuzzy_indent_blacklist =
+		\ ['-fn$', '\v^with-%(meta|out-str|loading-context)$']
+
+	" Legacy comma-delimited string version; the list format above is
+	" recommended. Note that patterns are implicitly anchored with ^ and $
+	let g:clojure_fuzzy_indent_patterns = 'with.*,def.*,let.*'
+<
+|g:clojure_fuzzy_indent_patterns| and |g:clojure_fuzzy_indent_blacklist| are
+|Lists| of patterns that will be matched against the unquoted, unqualified
+symbol at the head of a list. This means that a pattern like "^foo" will match
+all these candidates: "foobar", "my.ns/foobar", and "#'foobar".
+
+Each candidate word is tested for special treatment in this order:
+
+	1. Return true if word is literally in 'lispwords'
+	2. Return false if word matches a pattern in
+	   |g:clojure_fuzzy_indent_blacklist|
+	3. Return true if word matches a pattern in
+	   |g:clojure_fuzzy_indent_patterns|
+	4. Return false and indent normally otherwise
+
+					*g:clojure_special_indent_words*
+
+Some forms in Clojure are indented so that every subform is indented only two
+spaces, regardless of 'lispwords'. If you have a custom construct that should
+be indented in this idiosyncratic fashion, you can add your symbols to the
+default list below.
+>
+	" Default
+	let g:clojure_special_indent_words =
+	   \ 'deftype,defrecord,reify,proxy,extend-type,extend-protocol,letfn'
+<
+
+					*g:clojure_align_multiline_strings*
+
+Align subsequent lines in multiline strings to the column after the opening
+quote, instead of the same column.
+
+For example:
+>
+	(def default
+	  "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
+	  eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+	  enim ad minim veniam, quis nostrud exercitation ullamco laboris
+	  nisi ut aliquip ex ea commodo consequat.")
+
+	(def aligned
+	  "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
+	   eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
+	   enim ad minim veniam, quis nostrud exercitation ullamco laboris
+	   nisi ut aliquip ex ea commodo consequat.")
+<
+This option is off by default.
+>
+	" Default
+	let g:clojure_align_multiline_strings = 0
+<
+
+
 FORTRAN							*ft-fortran-indent*
 
 Block if, select case, where, and forall constructs are indented.  So are
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 423e7b9acb..57ca2fd790 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -94,8 +94,8 @@ tag		char		action in Insert mode	~
 |i_CTRL-Z|	CTRL-Z		when 'insertmode' set: suspend Vim
 |i_<Esc>|	<Esc>		end insert mode (unless 'insertmode' set)
 |i_CTRL-[|	CTRL-[		same as <Esc>
-|i_CTRL-\_CTRL-N| CTRL-\ CTRL-N	 go to Normal mode
-|i_CTRL-\_CTRL-G| CTRL-\ CTRL-G	 go to mode specified with 'insertmode'
+|i_CTRL-\_CTRL-N| CTRL-\ CTRL-N	go to Normal mode
+|i_CTRL-\_CTRL-G| CTRL-\ CTRL-G	go to mode specified with 'insertmode'
 		CTRL-\ a - z	reserved for extensions
 		CTRL-\ others	not used
 |i_CTRL-]|	CTRL-]		trigger abbreviation
@@ -141,7 +141,7 @@ tag		char		action in Insert mode	~
 |i_<ScrollWheelUp>|	<ScrollWheelUp>		move window three lines up
 |i_<S-ScrollWheelUp>|	<S-ScrollWheelUp>	move window one page up
 |i_<ScrollWheelLeft>|	<ScrollWheelLeft>	move window six columns left
-|i_<S-ScrollWheelLeft>| <S-ScrollWheelLeft>	move window one page left
+|i_<S-ScrollWheelLeft>|	<S-ScrollWheelLeft>	move window one page left
 |i_<ScrollWheelRight>|	<ScrollWheelRight>	move window six columns right
 |i_<S-ScrollWheelRight>| <S-ScrollWheelRight>	move window one page right
 
@@ -212,8 +212,8 @@ tag		char	      note action in Normal mode	~
 |CTRL-Y|	CTRL-Y		   scroll N lines downwards
 |CTRL-Z|	CTRL-Z		   suspend program (or start new shell)
 		CTRL-[ <Esc>	   not used
-|CTRL-\_CTRL-N| CTRL-\ CTRL-N	   go to Normal mode (no-op)
-|CTRL-\_CTRL-G| CTRL-\ CTRL-G	   go to mode specified with 'insertmode'
+|CTRL-\_CTRL-N|	CTRL-\ CTRL-N	   go to Normal mode (no-op)
+|CTRL-\_CTRL-G|	CTRL-\ CTRL-G	   go to mode specified with 'insertmode'
 		CTRL-\ a - z	   reserved for extensions
 		CTRL-\ others      not used
 |CTRL-]|	CTRL-]		   :ta to ident under cursor
@@ -431,7 +431,7 @@ tag		char	      note action in Normal mode	~
 |<Insert>|	<Insert>	2  same as "i"
 |<Left>|	<Left>		1  same as "h"
 |<LeftMouse>|	<LeftMouse>	1  move cursor to the mouse click position
-|<MiddleMouse>| <MiddleMouse>	2  same as "gP" at the mouse click position
+|<MiddleMouse>|	<MiddleMouse>	2  same as "gP" at the mouse click position
 |<PageDown>|	<PageDown>	   same as CTRL-F
 |<PageUp>|	<PageUp>	   same as CTRL-B
 |<Right>|	<Right>		1  same as "l"
@@ -640,7 +640,7 @@ tag		char	      note action in Normal mode	~
 |[s|		[s		1  move to the previous misspelled word
 |[z|		[z		1  move to start of open fold
 |[{|		[{		1  cursor N times back to unmatched '{'
-|[<MiddleMouse> [<MiddleMouse>	2  same as "[p"
+|[<MiddleMouse>| [<MiddleMouse>	2  same as "[p"
 
 |]_CTRL-D|	] CTRL-D	   jump to first #define found in current and
 				   included files matching the word under the
@@ -680,7 +680,7 @@ tag		char	      note action in Normal mode	~
 |]s|		]s		1  move to next misspelled word
 |]z|		]z		1  move to end of open fold
 |]}|		]}		1  cursor N times forward to unmatched '}'
-|]<MiddleMouse> ]<MiddleMouse>	2  same as "]p"
+|]<MiddleMouse>| ]<MiddleMouse>	2  same as "]p"
 
 ==============================================================================
 2.4 Commands starting with 'g'						*g*
@@ -1011,8 +1011,8 @@ tag		command	      action in Command-line editing mode	~
 		CTRL-Z		not used (reserved for suspend)
 |c_<Esc>|	<Esc>		abandon command-line without executing it
 |c_<Esc>|	CTRL-[		same as <Esc>
-|c_CTRL-\_CTRL-N| CTRL-\ CTRL-N	 go to Normal mode, abandon command-line
-|c_CTRL-\_CTRL-G| CTRL-\ CTRL-G	 go to mode specified with 'insertmode',
+|c_CTRL-\_CTRL-N| CTRL-\ CTRL-N	go to Normal mode, abandon command-line
+|c_CTRL-\_CTRL-G| CTRL-\ CTRL-G	go to mode specified with 'insertmode',
 				abandon command-line
 		CTRL-\ a - d	reserved for extensions
 |c_CTRL-\_e|	CTRL-\ e {expr} replace the command line with the result of
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 5af1e18a06..da079b286a 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5032,6 +5032,7 @@ clipboard-exclude	options.txt	/*clipboard-exclude*
 clipboard-html	options.txt	/*clipboard-html*
 clipboard-unnamed	options.txt	/*clipboard-unnamed*
 clipboard-unnamedplus	options.txt	/*clipboard-unnamedplus*
+clojure-indent	indent.txt	/*clojure-indent*
 cmdarg-variable	eval.txt	/*cmdarg-variable*
 cmdbang-variable	eval.txt	/*cmdbang-variable*
 cmdline-arguments	vi_diff.txt	/*cmdline-arguments*
@@ -5653,6 +5654,7 @@ ft-ch-syntax	syntax.txt	/*ft-ch-syntax*
 ft-changelog-plugin	filetype.txt	/*ft-changelog-plugin*
 ft-changelog-syntax	syntax.txt	/*ft-changelog-syntax*
 ft-chill-syntax	syntax.txt	/*ft-chill-syntax*
+ft-clojure-indent	indent.txt	/*ft-clojure-indent*
 ft-cobol-syntax	syntax.txt	/*ft-cobol-syntax*
 ft-coldfusion-syntax	syntax.txt	/*ft-coldfusion-syntax*
 ft-csh-syntax	syntax.txt	/*ft-csh-syntax*
@@ -5817,6 +5819,12 @@ g:ada_space_errors	ft_ada.txt	/*g:ada_space_errors*
 g:ada_standard_types	ft_ada.txt	/*g:ada_standard_types*
 g:ada_with_gnat_project_files	ft_ada.txt	/*g:ada_with_gnat_project_files*
 g:ada_withuse_ordinary	ft_ada.txt	/*g:ada_withuse_ordinary*
+g:clojure_align_multiline_strings	indent.txt	/*g:clojure_align_multiline_strings*
+g:clojure_fuzzy_indent	indent.txt	/*g:clojure_fuzzy_indent*
+g:clojure_fuzzy_indent_blacklist	indent.txt	/*g:clojure_fuzzy_indent_blacklist*
+g:clojure_fuzzy_indent_patterns	indent.txt	/*g:clojure_fuzzy_indent_patterns*
+g:clojure_maxlines	indent.txt	/*g:clojure_maxlines*
+g:clojure_special_indent_words	indent.txt	/*g:clojure_special_indent_words*
 g:colors_name	options.txt	/*g:colors_name*
 g:decada	ft_ada.txt	/*g:decada*
 g:decada.Error_Format	ft_ada.txt	/*g:decada.Error_Format*
@@ -6150,6 +6158,7 @@ gui_w16.txt	gui_w16.txt	/*gui_w16.txt*
 gui_w32.txt	gui_w32.txt	/*gui_w32.txt*
 gui_x11.txt	gui_x11.txt	/*gui_x11.txt*
 guifontwide_gtk2	options.txt	/*guifontwide_gtk2*
+guifontwide_win_mbyte	options.txt	/*guifontwide_win_mbyte*
 guioptions_a	options.txt	/*guioptions_a*
 guu	change.txt	/*guu*
 gv	visual.txt	/*gv*
@@ -6796,6 +6805,7 @@ mzscheme-buffer	if_mzsch.txt	/*mzscheme-buffer*
 mzscheme-commands	if_mzsch.txt	/*mzscheme-commands*
 mzscheme-dynamic	if_mzsch.txt	/*mzscheme-dynamic*
 mzscheme-examples	if_mzsch.txt	/*mzscheme-examples*
+mzscheme-funcref	if_mzsch.txt	/*mzscheme-funcref*
 mzscheme-mzeval	if_mzsch.txt	/*mzscheme-mzeval*
 mzscheme-sandbox	if_mzsch.txt	/*mzscheme-sandbox*
 mzscheme-threads	if_mzsch.txt	/*mzscheme-threads*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index a4737ac964..50c011178e 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.3.  Last change: 2013 Jan 30
+*todo.txt*      For Vim version 7.3.  Last change: 2013 Feb 06
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -34,6 +34,12 @@ not be repeated below, unless there is extra information.
 							*known-bugs*
 -------------------- Known bugs and current work -----------------------
 
+Substitute with confirmation and then "q" does not replace anything.
+(John McGowan)
+
+Download counter for scripts no longer incremented?
+Looks like it.
+
 Several syntax file match "^\s*" which may get underlined if that's in the
 highlight group.  Add a "\zs" after it?
 
@@ -43,25 +49,34 @@ Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
 
 Checking runtime scripts: Thilo Six, 2012 Jun 6.
 
+Patch for doc indenting. (Ken Takata, Feb 4)
+
 GTK: problem with 'L' in 'guioptions' changing the window width.
 (Aaron Cornelius, 2012 Feb 6)
 
+Configure change to detect Lua 5.2. (lilydjwg, 2013 Jan 31)
+
 Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
 
+Patch to avoid warnings in Perl code. (Christian Brabandt, 2013 Jan 30)
+
+The " mark is not updated for lines inserted above it. (Roland Eggner, 2013
+Feb 5)
+
+Look into patch to add 'linenumber' option. (Nazri Ramliy, 2013 Feb 4)
+
+Another patch for Python threads, 2 and 3. (Ken Takata, 2013 Jan 31)
+Does this really work?
+
+Patch for 'relativenumber' being reset unexpectedly. (Christian Brabandt, 2013
+Feb 1)  Tests Feb 2.
+
+Patch to avoid useless compare. (Hayaki Saito, 2013 Feb 2)
+
 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.
 
-Patch for mzscheme.  (Sergey Khorev, 2012 Nov 19)
-Updated patch 2013 Jan 28.
-
-Patch to fix :s command with confirm and typing "a". (Christian Brabandt, 2012
-Oct 28)
-
-/[^\n] does match at a line break.  Expected to do the same as /.
-Patch by Christian Brabandt, 2012 Dec 1.
-Test files in archive in another message.
-
 Patch to make multibyte input work on Win32 console when codepage differs from
 'encoding'. (Ken Takata, 2012 Sep 29)
 
@@ -74,6 +89,8 @@ It's possible to define an input() function that overrides the built-in one.
 (ZyX, 2012 Sep 28)
 
 Patch to add sha256() function. (Tyru, 2013 Jan 8)
+Test by Higashi, 2013 Feb 2.
+All together (tyru, 2013 Feb 5)
 
 Patch to make pyeval() print error messages. (ZyX, 2013 Jan 12)
 
@@ -90,7 +107,8 @@ Patch for Win32 clipboard under Cygwin. (Frodak Baksik, Feb 15)
 Problem parsing expression with function(). (Andy Wokula, 2012 Nov 22)
 Patch by Christian Brabandt, Nov 22.  Tests in another patch, Nov 23.
 
-Patch to add default value to getbufvar() et al. (Hirohito Higashi, 2013 Jan 1)
+Patch to add default value to getbufvar() et al. (Shougo Matsushita, Hirohito
+Higashi, 2013 Jan 1)
 
 Problem caused by patch 7.3.638: window->open does not update window
 correctly. Issue 91.
@@ -406,6 +424,7 @@ When a buffer-local mapping is used, but a global mapping starts with the same
 characters, Vim currently waits for the next typed character to find out if
 the global mapping matches.  It is probably better to let the local mapping
 win and not wait. (discussion with Andy Wokula, 2013 Jan 30)
+Patch by Michael Henry, 2013 Jan 30.
 
 When doing "redir => s:foo" in a script and then "redir END" somewhere else
 (e.g. in a function) it can't find s:foo.
diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt
index 5d360d511e..f0bb24ef60 100644
--- a/runtime/doc/usr_toc.txt
+++ b/runtime/doc/usr_toc.txt
@@ -248,7 +248,7 @@ Subjects that can be read independently.
 		|28.7|	Folding by syntax
 		|28.8|	Folding by expression
 		|28.9|	Folding unchanged lines
-		|28.10| Which fold method to use?
+		|28.10|	Which fold method to use?
 
 |usr_29.txt|  Moving through programs
 		|29.1|	Using tags
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 221c0cafc6..08270f1702 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 Nov 28
+" Last Change:	2013 Jan 31
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -489,6 +489,9 @@ au BufNewFile,BufRead *.prg
 	\   setf clipper |
 	\ endif
 
+" Clojure
+au BufNewFile,BufRead *.clj,*.cljs		setf clojure
+
 " Cmake
 au BufNewFile,BufRead CMakeLists.txt,*.cmake,*.cmake.in		setf cmake
 
@@ -744,6 +747,7 @@ au BufNewFile,BufRead *.ged,lltxxxxx.txt	setf gedcom
 
 " Git
 au BufNewFile,BufRead *.git/COMMIT_EDITMSG 	setf gitcommit
+au BufNewFile,BufRead *.git/MERGE_MSG 		setf gitcommit
 au BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig
 au BufNewFile,BufRead *.git/modules/**/COMMIT_EDITMSG setf gitcommit
 au BufNewFile,BufRead *.git/modules/**/config 	setf gitconfig
diff --git a/runtime/ftplugin/clojure.vim b/runtime/ftplugin/clojure.vim
new file mode 100644
index 0000000000..91aba80f10
--- /dev/null
+++ b/runtime/ftplugin/clojure.vim
@@ -0,0 +1,79 @@
+" Vim filetype plugin file
+" Language:     Clojure
+" Author:       Meikel Brandmeyer <mb@kotka.de>
+"
+" Maintainer:   Sung Pae <self@sungpae.com>
+" URL:          https://github.com/guns/vim-clojure-static
+" License:      Same as Vim
+" Last Change:  30 January 2013
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+    finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = 'setlocal define< formatoptions< comments< commentstring<'
+
+" There will be false positives, but this is better than missing the whole set
+" of user-defined def* definitions.
+setlocal define=\\v[(/]def(ault)@!\\S*
+
+" Remove 't' from 'formatoptions' to avoid auto-wrapping code. The '+=croql'
+" is standard ftplugin boilerplate, although it is arguably intrusive.
+setlocal formatoptions-=t formatoptions+=croql
+
+" Lisp comments are routinely nested (e.g. ;;; SECTION HEADING)
+setlocal comments=n:;
+setlocal commentstring=;\ %s
+
+" Provide insert mode completions for special forms and clojure.core. As
+" 'omnifunc' is set by popular Clojure REPL client plugins, we also set
+" 'completefunc' so that the user has some form of completion available when
+" 'omnifunc' is set and no REPL connection exists.
+for s:setting in ['omnifunc', 'completefunc']
+    if exists('&' . s:setting) && empty(eval('&' . s:setting))
+        execute 'setlocal ' . s:setting . '=clojurecomplete#Complete'
+        let b:undo_ftplugin .= ' | setlocal ' . s:setting . '<'
+    endif
+endfor
+
+" Take all directories of the CLOJURE_SOURCE_DIRS environment variable
+" and add them to the path option.
+"
+" This is a legacy option for VimClojure users.
+if exists('$CLOJURE_SOURCE_DIRS')
+    for s:dir in split($CLOJURE_SOURCE_DIRS, (has("win32") || has("win64")) ? ';' : ':')
+        let s:dir = fnameescape(s:dir)
+        " Whitespace escaping for Windows
+        let s:dir = substitute(s:dir, '\', '\\\\', 'g')
+        let s:dir = substitute(s:dir, '\ ', '\\ ', 'g')
+        execute "setlocal path+=" . s:dir . "/**"
+    endfor
+    let b:undo_ftplugin .= ' | setlocal path<'
+endif
+
+" Skip brackets in ignored syntax regions when using the % command
+if exists('loaded_matchit')
+    let b:match_words = &matchpairs
+    let b:match_skip = 's:comment\|string\|regex\|character'
+    let b:undo_ftplugin .= ' | unlet! b:match_words b:match_skip'
+endif
+
+" Win32 can filter files in the browse dialog
+if has("gui_win32") && !exists("b:browsefilter")
+    let b:browsefilter = "Clojure Source Files (*.clj)\t*.clj\n" .
+                       \ "ClojureScript Source Files (*.cljs)\t*.cljs\n" .
+                       \ "Java Source Files (*.java)\t*.java\n" .
+                       \ "All Files (*.*)\t*.*\n"
+    let b:undo_ftplugin .= ' | unlet! b:browsefilter'
+endif
+
+let &cpo = s:cpo_save
+
+unlet! s:cpo_save s:setting s:dir
+
+" vim:sts=4 sw=4 et:
diff --git a/runtime/indent/clojure.vim b/runtime/indent/clojure.vim
new file mode 100644
index 0000000000..9a00fb3253
--- /dev/null
+++ b/runtime/indent/clojure.vim
@@ -0,0 +1,398 @@
+" Vim indent file
+" Language:     Clojure
+" Author:       Meikel Brandmeyer <mb@kotka.de>
+" URL:          http://kotka.de/projects/clojure/vimclojure.html
+"
+" Maintainer:   Sung Pae <self@sungpae.com>
+" URL:          https://github.com/guns/vim-clojure-static
+" License:      Same as Vim
+" Last Change:  30 January 2013
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+let b:undo_indent = 'setlocal autoindent< smartindent< lispwords< expandtab< softtabstop< shiftwidth< indentexpr< indentkeys<'
+
+setlocal noautoindent nosmartindent
+setlocal softtabstop=2 shiftwidth=2 expandtab
+setlocal indentkeys=!,o,O
+
+if exists("*searchpairpos")
+
+    if !exists('g:clojure_maxlines')
+        let g:clojure_maxlines = 100
+    endif
+
+    if !exists('g:clojure_fuzzy_indent')
+        let g:clojure_fuzzy_indent = 1
+    endif
+
+    if !exists('g:clojure_fuzzy_indent_patterns')
+        let g:clojure_fuzzy_indent_patterns = ['^with', '^def', '^let']
+    endif
+
+    if !exists('g:clojure_fuzzy_indent_blacklist')
+        let g:clojure_fuzzy_indent_blacklist = ['-fn$', '\v^with-%(meta|out-str|loading-context)$']
+    endif
+
+    if !exists('g:clojure_special_indent_words')
+        let g:clojure_special_indent_words = 'deftype,defrecord,reify,proxy,extend-type,extend-protocol,letfn'
+    endif
+
+    if !exists('g:clojure_align_multiline_strings')
+        let g:clojure_align_multiline_strings = 0
+    endif
+
+    function! s:SynIdName()
+        return synIDattr(synID(line("."), col("."), 0), "name")
+    endfunction
+
+    function! s:CurrentChar()
+        return getline('.')[col('.')-1]
+    endfunction
+
+    function! s:CurrentWord()
+        return getline('.')[col('.')-1 : searchpos('\v>', 'n', line('.'))[1]-2]
+    endfunction
+
+    function! s:IsParen()
+        return s:CurrentChar() =~ '\v[\(\)\[\]\{\}]' &&
+             \ s:SynIdName() !~? '\vstring|comment'
+    endfunction
+
+    " Returns 1 if string matches a pattern in 'patterns', which may be a
+    " list of patterns, or a comma-delimited string of implicitly anchored
+    " patterns.
+    function! s:MatchesOne(patterns, string)
+        let list = type(a:patterns) == type([])
+                   \ ? a:patterns
+                   \ : map(split(a:patterns, ','), '"^" . v:val . "$"')
+        for pat in list
+            if a:string =~ pat | return 1 | endif
+        endfor
+    endfunction
+
+    function! s:SavePosition()
+        let [ _b, l, c, _o ] = getpos(".")
+        let b = bufnr("%")
+        return [b, l, c]
+    endfunction
+
+    function! s:RestorePosition(value)
+        let [b, l, c] = a:value
+        if bufnr("%") != b
+            execute b "buffer!"
+        endif
+        call setpos(".", [0, l, c, 0])
+    endfunction
+
+    function! s:MatchPairs(open, close, stopat)
+        " Stop only on vector and map [ resp. {. Ignore the ones in strings and
+        " comments.
+        if a:stopat == 0
+            let stopat = max([line(".") - g:clojure_maxlines, 0])
+        else
+            let stopat = a:stopat
+        endif
+
+        let pos = searchpairpos(a:open, '', a:close, 'bWn', "!s:IsParen()", stopat)
+        return [pos[0], virtcol(pos)]
+    endfunction
+
+    function! s:ClojureCheckForStringWorker()
+        " Check whether there is the last character of the previous line is
+        " highlighted as a string. If so, we check whether it's a ". In this
+        " case we have to check also the previous character. The " might be the
+        " closing one. In case the we are still in the string, we search for the
+        " opening ". If this is not found we take the indent of the line.
+        let nb = prevnonblank(v:lnum - 1)
+
+        if nb == 0
+            return -1
+        endif
+
+        call cursor(nb, 0)
+        call cursor(0, col("$") - 1)
+        if s:SynIdName() !~? "string"
+            return -1
+        endif
+
+        " This will not work for a " in the first column...
+        if s:CurrentChar() == '"'
+            call cursor(0, col("$") - 2)
+            if s:SynIdName() !~? "string"
+                return -1
+            endif
+            if s:CurrentChar() != '\\'
+                return -1
+            endif
+            call cursor(0, col("$") - 1)
+        endif
+
+        let p = searchpos('\(^\|[^\\]\)\zs"', 'bW')
+
+        if p != [0, 0]
+            return p[1] - 1
+        endif
+
+        return indent(".")
+    endfunction
+
+    function! s:CheckForString()
+        let pos = s:SavePosition()
+        try
+            let val = s:ClojureCheckForStringWorker()
+        finally
+            call s:RestorePosition(pos)
+        endtry
+        return val
+    endfunction
+
+    function! s:ClojureIsMethodSpecialCaseWorker(position)
+        " Find the next enclosing form.
+        call search('\S', 'Wb')
+
+        " Special case: we are at a '(('.
+        if s:CurrentChar() == '('
+            return 0
+        endif
+        call cursor(a:position)
+
+        let nextParen = s:MatchPairs('(', ')', 0)
+
+        " Special case: we are now at toplevel.
+        if nextParen == [0, 0]
+            return 0
+        endif
+        call cursor(nextParen)
+
+        call search('\S', 'W')
+        if g:clojure_special_indent_words =~ '\<' . s:CurrentWord() . '\>'
+            return 1
+        endif
+
+        return 0
+    endfunction
+
+    function! s:IsMethodSpecialCase(position)
+        let pos = s:SavePosition()
+        try
+            let val = s:ClojureIsMethodSpecialCaseWorker(a:position)
+        finally
+            call s:RestorePosition(pos)
+        endtry
+        return val
+    endfunction
+
+    function! GetClojureIndent()
+        " Get rid of special case.
+        if line(".") == 1
+            return 0
+        endif
+
+        " We have to apply some heuristics here to figure out, whether to use
+        " normal lisp indenting or not.
+        let i = s:CheckForString()
+        if i > -1
+            return i + !!g:clojure_align_multiline_strings
+        endif
+
+        call cursor(0, 1)
+
+        " Find the next enclosing [ or {. We can limit the second search
+        " to the line, where the [ was found. If no [ was there this is
+        " zero and we search for an enclosing {.
+        let paren = s:MatchPairs('(', ')', 0)
+        let bracket = s:MatchPairs('\[', '\]', paren[0])
+        let curly = s:MatchPairs('{', '}', bracket[0])
+
+        " In case the curly brace is on a line later then the [ or - in
+        " case they are on the same line - in a higher column, we take the
+        " curly indent.
+        if curly[0] > bracket[0] || curly[1] > bracket[1]
+            if curly[0] > paren[0] || curly[1] > paren[1]
+                return curly[1]
+            endif
+        endif
+
+        " If the curly was not chosen, we take the bracket indent - if
+        " there was one.
+        if bracket[0] > paren[0] || bracket[1] > paren[1]
+            return bracket[1]
+        endif
+
+        " There are neither { nor [ nor (, ie. we are at the toplevel.
+        if paren == [0, 0]
+            return 0
+        endif
+
+        " Now we have to reimplement lispindent. This is surprisingly easy, as
+        " soon as one has access to syntax items.
+        "
+        " - Check whether we are in a special position after a word in
+        "   g:clojure_special_indent_words. These are special cases.
+        " - Get the next keyword after the (.
+        " - If its first character is also a (, we have another sexp and align
+        "   one column to the right of the unmatched (.
+        " - In case it is in lispwords, we indent the next line to the column of
+        "   the ( + sw.
+        " - If not, we check whether it is last word in the line. In that case
+        "   we again use ( + sw for indent.
+        " - In any other case we use the column of the end of the word + 2.
+        call cursor(paren)
+
+        if s:IsMethodSpecialCase(paren)
+            return paren[1] + &shiftwidth - 1
+        endif
+
+        " In case we are at the last character, we use the paren position.
+        if col("$") - 1 == paren[1]
+            return paren[1]
+        endif
+
+        " In case after the paren is a whitespace, we search for the next word.
+        normal! l
+        if s:CurrentChar() == ' '
+            normal! w
+        endif
+
+        " If we moved to another line, there is no word after the (. We
+        " use the ( position for indent.
+        if line(".") > paren[0]
+            return paren[1]
+        endif
+
+        " We still have to check, whether the keyword starts with a (, [ or {.
+        " In that case we use the ( position for indent.
+        let w = s:CurrentWord()
+        if stridx('([{', w[0]) > -1
+            return paren[1]
+        endif
+
+        " Test words without namespace qualifiers and leading reader macro
+        " metacharacters.
+        "
+        " e.g. clojure.core/defn and #'defn should both indent like defn.
+        let ww = substitute(w, "\\v%(.*/|[#'`~@^,]*)(.*)", '\1', '')
+
+        if &lispwords =~ '\V\<' . ww . '\>'
+            return paren[1] + &shiftwidth - 1
+        endif
+
+        if g:clojure_fuzzy_indent
+            \ && !s:MatchesOne(g:clojure_fuzzy_indent_blacklist, ww)
+            \ && s:MatchesOne(g:clojure_fuzzy_indent_patterns, ww)
+            return paren[1] + &shiftwidth - 1
+        endif
+
+        normal! W
+        if paren[0] < line(".")
+            return paren[1] + &shiftwidth - 1
+        endif
+
+        normal! ge
+        return virtcol(".") + 1
+    endfunction
+
+    setlocal indentexpr=GetClojureIndent()
+
+else
+
+    " In case we have searchpairpos not available we fall back to
+    " normal lisp indenting.
+    setlocal indentexpr=
+    setlocal lisp
+    let b:undo_indent .= '| setlocal lisp<'
+
+endif
+
+" Specially indented symbols from clojure.core and clojure.test.
+"
+" Clojure symbols are indented in the defn style when they:
+"
+"   * Define vars and anonymous functions
+"   * Create new lexical scopes or scopes with altered environments
+"   * Create conditional branches from a predicate function or value
+"
+" The arglists for these functions are generally in the form of [x & body];
+" Functions that accept a flat list of forms do not treat the first argument
+" specially and hence are not indented specially.
+
+" Definitions
+setlocal lispwords=
+setlocal lispwords+=bound-fn
+setlocal lispwords+=def
+setlocal lispwords+=definline
+setlocal lispwords+=definterface
+setlocal lispwords+=defmacro
+setlocal lispwords+=defmethod
+setlocal lispwords+=defmulti
+setlocal lispwords+=defn
+setlocal lispwords+=defn-
+setlocal lispwords+=defonce
+setlocal lispwords+=defprotocol
+setlocal lispwords+=defrecord
+setlocal lispwords+=defstruct
+setlocal lispwords+=deftest " clojure.test
+setlocal lispwords+=deftest- " clojure.test
+setlocal lispwords+=deftype
+setlocal lispwords+=extend
+setlocal lispwords+=extend-protocol
+setlocal lispwords+=extend-type
+setlocal lispwords+=fn
+setlocal lispwords+=ns
+setlocal lispwords+=proxy
+setlocal lispwords+=reify
+setlocal lispwords+=set-test " clojure.test
+
+" Binding forms
+setlocal lispwords+=as->
+setlocal lispwords+=binding
+setlocal lispwords+=doall
+setlocal lispwords+=dorun
+setlocal lispwords+=doseq
+setlocal lispwords+=dotimes
+setlocal lispwords+=doto
+setlocal lispwords+=for
+setlocal lispwords+=if-let
+setlocal lispwords+=let
+setlocal lispwords+=letfn
+setlocal lispwords+=locking
+setlocal lispwords+=loop
+setlocal lispwords+=testing " clojure.test
+setlocal lispwords+=when-first
+setlocal lispwords+=when-let
+setlocal lispwords+=with-bindings
+setlocal lispwords+=with-in-str
+setlocal lispwords+=with-local-vars
+setlocal lispwords+=with-open
+setlocal lispwords+=with-precision
+setlocal lispwords+=with-redefs
+setlocal lispwords+=with-redefs-fn
+setlocal lispwords+=with-test " clojure.test
+
+" Conditional branching
+setlocal lispwords+=case
+setlocal lispwords+=cond->
+setlocal lispwords+=cond->>
+setlocal lispwords+=condp
+setlocal lispwords+=if
+setlocal lispwords+=if-not
+setlocal lispwords+=when
+setlocal lispwords+=when-not
+setlocal lispwords+=while
+
+" Exception handling
+setlocal lispwords+=catch
+setlocal lispwords+=try " For aesthetics when enclosing single line
+
+let &cpo = s:save_cpo
+unlet! s:save_cpo
+
+" vim:sts=4 sw=4 et:
diff --git a/runtime/syntax/cl.vim b/runtime/syntax/cl.vim
index ccea2ee5ce..82660db74b 100644
--- a/runtime/syntax/cl.vim
+++ b/runtime/syntax/cl.vim
@@ -17,9 +17,9 @@ elseif exists("b:current_syntax")
 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
diff --git a/runtime/syntax/clojure.vim b/runtime/syntax/clojure.vim
new file mode 100644
index 0000000000..3108148ff6
--- /dev/null
+++ b/runtime/syntax/clojure.vim
@@ -0,0 +1,134 @@
+" Vim syntax file
+" Language:     Clojure
+" Authors:      Toralf Wittner <toralf.wittner@gmail.com>
+"               modified by Meikel Brandmeyer <mb@kotka.de>
+" URL:          http://kotka.de/projects/clojure/vimclojure.html
+"
+" Maintainer:   Sung Pae <self@sungpae.com>
+" URL:          https://github.com/guns/vim-clojure-static
+" License:      Same as Vim
+" Last Change:  05 February 2013
+
+if version < 600
+    syntax clear
+elseif exists("b:current_syntax")
+    finish
+endif
+
+setlocal iskeyword+=?,-,*,!,+,/,=,<,>,.,:,$
+
+" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-002/vim_clojure_static.clj
+" Clojure 1.5.0-RC6
+syntax keyword clojureConstant nil
+syntax keyword clojureBoolean false true
+syntax keyword clojureSpecial . catch clojure.core/fn clojure.core/let clojure.core/loop def do finally fn if let loop monitor-enter monitor-exit new quote recur set! throw try var
+syntax keyword clojureException catch finally throw try
+syntax keyword clojureCond case clojure.core/case clojure.core/cond clojure.core/cond-> clojure.core/cond->> clojure.core/condp clojure.core/if-let clojure.core/if-not clojure.core/when clojure.core/when-first clojure.core/when-let clojure.core/when-not cond cond-> cond->> condp if-let if-not when when-first when-let when-not
+syntax keyword clojureRepeat clojure.core/doall clojure.core/dorun clojure.core/doseq clojure.core/dotimes clojure.core/while doall dorun doseq dotimes while
+syntax keyword clojureDefine clojure.core/definline clojure.core/definterface clojure.core/defmacro clojure.core/defmethod clojure.core/defmulti clojure.core/defn clojure.core/defn- clojure.core/defonce clojure.core/defprotocol clojure.core/defrecord clojure.core/defstruct clojure.core/deftype definline definterface defmacro defmethod defmulti defn defn- defonce defprotocol defrecord defstruct deftype
+syntax keyword clojureMacro -> ->> .. amap and areduce as-> assert binding bound-fn clojure.core/-> clojure.core/->> clojure.core/.. clojure.core/amap clojure.core/and clojure.core/areduce clojure.core/as-> clojure.core/assert clojure.core/binding clojure.core/bound-fn clojure.core/comment clojure.core/declare clojure.core/delay clojure.core/dosync clojure.core/doto clojure.core/extend-protocol clojure.core/extend-type clojure.core/for clojure.core/future clojure.core/gen-class clojure.core/gen-interface clojure.core/import clojure.core/io! clojure.core/lazy-cat clojure.core/lazy-seq clojure.core/letfn clojure.core/locking clojure.core/memfn clojure.core/ns clojure.core/or clojure.core/proxy clojure.core/proxy-super clojure.core/pvalues clojure.core/refer-clojure clojure.core/reify clojure.core/some-> clojure.core/some->> clojure.core/sync clojure.core/time clojure.core/with-bindings clojure.core/with-in-str clojure.core/with-loading-context clojure.core/with-local-vars clojure.core/with-open clojure.core/with-out-str clojure.core/with-precision clojure.core/with-redefs comment declare delay dosync doto extend-protocol extend-type for future gen-class gen-interface import io! lazy-cat lazy-seq letfn locking memfn ns or proxy proxy-super pvalues refer-clojure reify some-> some->> sync time with-bindings with-in-str with-loading-context with-local-vars with-open with-out-str with-precision with-redefs
+syntax keyword clojureFunc * *' + +' - -' ->ArrayChunk ->Vec ->VecNode ->VecSeq -cache-protocol-fn -reset-methods / < <= = == > >= accessor aclone add-classpath add-watch agent agent-error agent-errors aget alength alias all-ns alter alter-meta! alter-var-root ancestors apply array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint biginteger bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn* bound? butlast byte byte-array bytes cast char char-array char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version clojure.core/* clojure.core/*' clojure.core/+ clojure.core/+' clojure.core/- clojure.core/-' clojure.core/->ArrayChunk clojure.core/->Vec clojure.core/->VecNode clojure.core/->VecSeq clojure.core/-cache-protocol-fn clojure.core/-reset-methods clojure.core// clojure.core/< clojure.core/<= clojure.core/= clojure.core/== clojure.core/> clojure.core/>= clojure.core/accessor clojure.core/aclone clojure.core/add-classpath clojure.core/add-watch clojure.core/agent clojure.core/agent-error clojure.core/agent-errors clojure.core/aget clojure.core/alength clojure.core/alias clojure.core/all-ns clojure.core/alter clojure.core/alter-meta! clojure.core/alter-var-root clojure.core/ancestors clojure.core/apply clojure.core/array-map clojure.core/aset clojure.core/aset-boolean clojure.core/aset-byte clojure.core/aset-char clojure.core/aset-double clojure.core/aset-float clojure.core/aset-int clojure.core/aset-long clojure.core/aset-short clojure.core/assoc clojure.core/assoc! clojure.core/assoc-in clojure.core/associative? clojure.core/atom clojure.core/await clojure.core/await-for clojure.core/await1 clojure.core/bases clojure.core/bean clojure.core/bigdec clojure.core/bigint clojure.core/biginteger clojure.core/bit-and clojure.core/bit-and-not clojure.core/bit-clear clojure.core/bit-flip clojure.core/bit-not clojure.core/bit-or clojure.core/bit-set clojure.core/bit-shift-left clojure.core/bit-shift-right clojure.core/bit-test clojure.core/bit-xor clojure.core/boolean clojure.core/boolean-array clojure.core/booleans clojure.core/bound-fn* clojure.core/bound? clojure.core/butlast clojure.core/byte clojure.core/byte-array clojure.core/bytes clojure.core/cast clojure.core/char clojure.core/char-array clojure.core/char? clojure.core/chars clojure.core/chunk clojure.core/chunk-append clojure.core/chunk-buffer clojure.core/chunk-cons clojure.core/chunk-first clojure.core/chunk-next clojure.core/chunk-rest clojure.core/chunked-seq? clojure.core/class clojure.core/class? clojure.core/clear-agent-errors clojure.core/clojure-version clojure.core/coll? clojure.core/commute clojure.core/comp clojure.core/comparator clojure.core/compare clojure.core/compare-and-set! clojure.core/compile clojure.core/complement clojure.core/concat clojure.core/conj clojure.core/conj! clojure.core/cons clojure.core/constantly clojure.core/construct-proxy clojure.core/contains? clojure.core/count clojure.core/counted? clojure.core/create-ns clojure.core/create-struct clojure.core/cycle clojure.core/dec clojure.core/dec' clojure.core/decimal? clojure.core/delay? clojure.core/deliver clojure.core/denominator clojure.core/deref clojure.core/derive clojure.core/descendants clojure.core/destructure clojure.core/disj clojure.core/disj! clojure.core/dissoc clojure.core/dissoc! clojure.core/distinct clojure.core/distinct? clojure.core/double clojure.core/double-array clojure.core/doubles clojure.core/drop clojure.core/drop-last clojure.core/drop-while clojure.core/empty clojure.core/empty? clojure.core/ensure clojure.core/enumeration-seq clojure.core/error-handler clojure.core/error-mode clojure.core/eval clojure.core/even? clojure.core/every-pred clojure.core/every? clojure.core/ex-data clojure.core/ex-info clojure.core/extend clojure.core/extenders clojure.core/extends? clojure.core/false? clojure.core/ffirst clojure.core/file-seq clojure.core/filter clojure.core/filterv clojure.core/find clojure.core/find-keyword clojure.core/find-ns clojure.core/find-protocol-impl clojure.core/find-protocol-method clojure.core/find-var clojure.core/first clojure.core/flatten clojure.core/float clojure.core/float-array clojure.core/float? clojure.core/floats clojure.core/flush clojure.core/fn? clojure.core/fnext clojure.core/fnil clojure.core/force clojure.core/format clojure.core/frequencies clojure.core/future-call clojure.core/future-cancel clojure.core/future-cancelled? clojure.core/future-done? clojure.core/future? clojure.core/gensym clojure.core/get clojure.core/get-in clojure.core/get-method clojure.core/get-proxy-class clojure.core/get-thread-bindings clojure.core/get-validator clojure.core/group-by clojure.core/hash clojure.core/hash-combine clojure.core/hash-map clojure.core/hash-set clojure.core/identical? clojure.core/identity clojure.core/ifn? clojure.core/in-ns clojure.core/inc clojure.core/inc' clojure.core/init-proxy clojure.core/instance? clojure.core/int clojure.core/int-array clojure.core/integer? clojure.core/interleave clojure.core/intern clojure.core/interpose clojure.core/into clojure.core/into-array clojure.core/ints clojure.core/isa? clojure.core/iterate clojure.core/iterator-seq clojure.core/juxt clojure.core/keep clojure.core/keep-indexed clojure.core/key clojure.core/keys clojure.core/keyword clojure.core/keyword? clojure.core/last clojure.core/line-seq clojure.core/list clojure.core/list* clojure.core/list? clojure.core/load clojure.core/load-file clojure.core/load-reader clojure.core/load-string clojure.core/loaded-libs clojure.core/long clojure.core/long-array clojure.core/longs clojure.core/macroexpand clojure.core/macroexpand-1 clojure.core/make-array clojure.core/make-hierarchy clojure.core/map clojure.core/map-indexed clojure.core/map? clojure.core/mapcat clojure.core/mapv clojure.core/max clojure.core/max-key clojure.core/memoize clojure.core/merge clojure.core/merge-with clojure.core/meta clojure.core/method-sig clojure.core/methods clojure.core/min clojure.core/min-key clojure.core/mod clojure.core/munge clojure.core/name clojure.core/namespace clojure.core/namespace-munge clojure.core/neg? clojure.core/newline clojure.core/next clojure.core/nfirst clojure.core/nil? clojure.core/nnext clojure.core/not clojure.core/not-any? clojure.core/not-empty clojure.core/not-every? clojure.core/not= clojure.core/ns-aliases clojure.core/ns-imports clojure.core/ns-interns clojure.core/ns-map clojure.core/ns-name clojure.core/ns-publics clojure.core/ns-refers clojure.core/ns-resolve clojure.core/ns-unalias clojure.core/ns-unmap clojure.core/nth clojure.core/nthnext clojure.core/nthrest clojure.core/num clojure.core/number? clojure.core/numerator clojure.core/object-array clojure.core/odd? clojure.core/parents clojure.core/partial clojure.core/partition clojure.core/partition-all clojure.core/partition-by clojure.core/pcalls clojure.core/peek clojure.core/persistent! clojure.core/pmap clojure.core/pop clojure.core/pop! clojure.core/pop-thread-bindings clojure.core/pos? clojure.core/pr clojure.core/pr-str clojure.core/prefer-method clojure.core/prefers clojure.core/print clojure.core/print-ctor clojure.core/print-simple clojure.core/print-str clojure.core/printf clojure.core/println clojure.core/println-str clojure.core/prn clojure.core/prn-str clojure.core/promise clojure.core/proxy-call-with-super clojure.core/proxy-mappings clojure.core/proxy-name clojure.core/push-thread-bindings clojure.core/quot clojure.core/rand clojure.core/rand-int clojure.core/rand-nth clojure.core/range clojure.core/ratio? clojure.core/rational? clojure.core/rationalize clojure.core/re-find clojure.core/re-groups clojure.core/re-matcher clojure.core/re-matches clojure.core/re-pattern clojure.core/re-seq clojure.core/read clojure.core/read-line clojure.core/read-string clojure.core/realized? clojure.core/reduce clojure.core/reduce-kv clojure.core/reduced clojure.core/reduced? clojure.core/reductions clojure.core/ref clojure.core/ref-history-count clojure.core/ref-max-history clojure.core/ref-min-history clojure.core/ref-set clojure.core/refer clojure.core/release-pending-sends clojure.core/rem clojure.core/remove clojure.core/remove-all-methods clojure.core/remove-method clojure.core/remove-ns clojure.core/remove-watch clojure.core/repeat clojure.core/repeatedly clojure.core/replace clojure.core/replicate clojure.core/require clojure.core/reset! clojure.core/reset-meta! clojure.core/resolve clojure.core/rest clojure.core/restart-agent clojure.core/resultset-seq clojure.core/reverse clojure.core/reversible? clojure.core/rseq clojure.core/rsubseq clojure.core/satisfies? clojure.core/second clojure.core/select-keys clojure.core/send clojure.core/send-off clojure.core/send-via clojure.core/seq clojure.core/seq? clojure.core/seque clojure.core/sequence clojure.core/sequential? clojure.core/set clojure.core/set-agent-send-executor! clojure.core/set-agent-send-off-executor! clojure.core/set-error-handler! clojure.core/set-error-mode! clojure.core/set-validator! clojure.core/set? clojure.core/short clojure.core/short-array clojure.core/shorts clojure.core/shuffle clojure.core/shutdown-agents clojure.core/slurp clojure.core/some clojure.core/some-fn clojure.core/sort clojure.core/sort-by clojure.core/sorted-map clojure.core/sorted-map-by clojure.core/sorted-set clojure.core/sorted-set-by clojure.core/sorted? clojure.core/special-symbol? clojure.core/spit clojure.core/split-at clojure.core/split-with clojure.core/str clojure.core/string? clojure.core/struct clojure.core/struct-map clojure.core/subs clojure.core/subseq clojure.core/subvec clojure.core/supers clojure.core/swap! clojure.core/symbol clojure.core/symbol? clojure.core/take clojure.core/take-last clojure.core/take-nth clojure.core/take-while clojure.core/test clojure.core/the-ns clojure.core/thread-bound? clojure.core/to-array clojure.core/to-array-2d clojure.core/trampoline clojure.core/transient clojure.core/tree-seq clojure.core/true? clojure.core/type clojure.core/unchecked-add clojure.core/unchecked-add-int clojure.core/unchecked-byte clojure.core/unchecked-char clojure.core/unchecked-dec clojure.core/unchecked-dec-int clojure.core/unchecked-divide-int clojure.core/unchecked-double clojure.core/unchecked-float clojure.core/unchecked-inc clojure.core/unchecked-inc-int clojure.core/unchecked-int clojure.core/unchecked-long clojure.core/unchecked-multiply clojure.core/unchecked-multiply-int clojure.core/unchecked-negate clojure.core/unchecked-negate-int clojure.core/unchecked-remainder-int clojure.core/unchecked-short clojure.core/unchecked-subtract clojure.core/unchecked-subtract-int clojure.core/underive clojure.core/update-in clojure.core/update-proxy clojure.core/use clojure.core/val clojure.core/vals clojure.core/var-get clojure.core/var-set clojure.core/var? clojure.core/vary-meta clojure.core/vec clojure.core/vector clojure.core/vector-of clojure.core/vector? clojure.core/with-bindings* clojure.core/with-meta clojure.core/with-redefs-fn clojure.core/xml-seq clojure.core/zero? clojure.core/zipmap coll? commute comp comparator compare compare-and-set! compile complement concat conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec dec' decimal? delay? deliver denominator deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? double double-array doubles drop drop-last drop-while empty empty? ensure enumeration-seq error-handler error-mode eval even? every-pred every? ex-data ex-info extend extenders extends? false? ffirst file-seq filter filterv find find-keyword find-ns find-protocol-impl find-protocol-method find-var first flatten float float-array float? floats flush fn? fnext fnil force format frequencies future-call future-cancel future-cancelled? future-done? future? gensym get get-in get-method get-proxy-class get-thread-bindings get-validator group-by hash hash-combine hash-map hash-set identical? identity ifn? in-ns inc inc' init-proxy instance? int int-array integer? interleave intern interpose into into-array ints isa? iterate iterator-seq juxt keep keep-indexed key keys keyword keyword? last line-seq list list* list? load load-file load-reader load-string loaded-libs long long-array longs macroexpand macroexpand-1 make-array make-hierarchy map map-indexed map? mapcat mapv max max-key memoize merge merge-with meta method-sig methods min min-key mod munge name namespace namespace-munge neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext nthrest num number? numerator object-array odd? parents partial partition partition-all partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers print print-ctor print-simple print-str printf println println-str prn prn-str promise proxy-call-with-super proxy-mappings proxy-name push-thread-bindings quot rand rand-int rand-nth range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string realized? reduce reduce-kv reduced reduced? reductions ref ref-history-count ref-max-history ref-min-history ref-set refer release-pending-sends rem remove remove-all-methods remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest restart-agent resultset-seq reverse reversible? rseq rsubseq satisfies? second select-keys send send-off send-via seq seq? seque sequence sequential? set set-agent-send-executor! set-agent-send-off-executor! set-error-handler! set-error-mode! set-validator! set? short short-array shorts shuffle shutdown-agents slurp some some-fn sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-symbol? spit split-at split-with str string? struct struct-map subs subseq subvec supers swap! symbol symbol? take take-last take-nth take-while test the-ns thread-bound? to-array to-array-2d trampoline transient tree-seq true? type unchecked-add unchecked-add-int unchecked-byte unchecked-char unchecked-dec unchecked-dec-int unchecked-divide-int unchecked-double unchecked-float unchecked-inc unchecked-inc-int unchecked-int unchecked-long unchecked-multiply unchecked-multiply-int unchecked-negate unchecked-negate-int unchecked-remainder-int unchecked-short unchecked-subtract unchecked-subtract-int underive update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector-of vector? with-bindings* with-meta with-redefs-fn xml-seq zero? zipmap
+syntax keyword clojureVariable *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* *compile-path* *compiler-options* *data-readers* *default-data-reader-fn* *e *err* *file* *flush-on-newline* *fn-loader* *in* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *read-whitelist* *source-path* *unchecked-math* *use-context-classloader* *verbose-defrecords* *warn-on-reflection* EMPTY-NODE char-escape-string char-name-string clojure.core/*1 clojure.core/*2 clojure.core/*3 clojure.core/*agent* clojure.core/*allow-unresolved-vars* clojure.core/*assert* clojure.core/*clojure-version* clojure.core/*command-line-args* clojure.core/*compile-files* clojure.core/*compile-path* clojure.core/*compiler-options* clojure.core/*data-readers* clojure.core/*default-data-reader-fn* clojure.core/*e clojure.core/*err* clojure.core/*file* clojure.core/*flush-on-newline* clojure.core/*fn-loader* clojure.core/*in* clojure.core/*math-context* clojure.core/*ns* clojure.core/*out* clojure.core/*print-dup* clojure.core/*print-length* clojure.core/*print-level* clojure.core/*print-meta* clojure.core/*print-readably* clojure.core/*read-eval* clojure.core/*read-whitelist* clojure.core/*source-path* clojure.core/*unchecked-math* clojure.core/*use-context-classloader* clojure.core/*verbose-defrecords* clojure.core/*warn-on-reflection* clojure.core/EMPTY-NODE clojure.core/char-escape-string clojure.core/char-name-string clojure.core/default-data-readers clojure.core/primitives-classnames clojure.core/print-dup clojure.core/print-method clojure.core/unquote clojure.core/unquote-splicing default-data-readers primitives-classnames print-dup print-method unquote unquote-splicing
+
+" Keywords are symbols:
+"   static Pattern symbolPat = Pattern.compile("[:]?([\\D&&[^/]].*/)?([\\D&&[^/]][^/]*)");
+" But they:
+"   * Must not end in a : or /
+"   * Must not have two adjacent colons except at the beginning
+"   * Must not contain any reader metacharacters except for ' and #
+syntax match clojureKeyword "\v:{1,2}%([^ \n\r\t()\[\]{}";@^`~\\%/]+/)*[^ \n\r\t()\[\]{}";@^`~\\%/]+:@<!"
+
+syntax region clojureString start=/L\="/ skip=/\\\\\|\\"/ end=/"/
+
+syntax match clojureCharacter "\\."
+syntax match clojureCharacter "\\o[0-7]\{3\}"
+syntax match clojureCharacter "\\u[0-9]\{4\}"
+syntax match clojureCharacter "\\space"
+syntax match clojureCharacter "\\tab"
+syntax match clojureCharacter "\\newline"
+syntax match clojureCharacter "\\return"
+syntax match clojureCharacter "\\backspace"
+syntax match clojureCharacter "\\formfeed"
+
+let s:radixChars = "0123456789abcdefghijklmnopqrstuvwxyz"
+for s:radix in range(2, 36)
+    execute 'syntax match clojureNumber "\c\<-\?' . s:radix . 'r[' . strpart(s:radixChars, 0, s:radix) . ']\+\>"'
+endfor
+unlet! s:radixChars s:radix
+
+syntax match clojureNumber "\<-\=[0-9]\+\(\.[0-9]*\)\=\(M\|\([eE][-+]\?[0-9]\+\)\)\?\>"
+syntax match clojureNumber "\<-\=[0-9]\+N\?\>"
+syntax match clojureNumber "\<-\=0x[0-9a-fA-F]\+\>"
+syntax match clojureNumber "\<-\=[0-9]\+/[0-9]\+\>"
+
+syntax match clojureVarArg "&"
+
+syntax match clojureQuote "'"
+syntax match clojureQuote "`"
+syntax match clojureUnquote "\~"
+syntax match clojureUnquote "\~@"
+syntax match clojureMeta "\^"
+syntax match clojureDeref "@"
+syntax match clojureAnonArg "%\(\d\|&\)\?"
+syntax match clojureDispatch "\v#[\^\'\=\<]?"
+
+syntax region clojureRegexp start=/L\=\#"/ skip=/\\\\\|\\"/ end=/"/
+
+syntax match clojureComment ";.*$" contains=clojureTodo,@Spell
+syntax match clojureComment "#!.*$"
+syntax match clojureComment "#_"
+
+syntax keyword clojureTodo contained FIXME XXX TODO FIXME: XXX: TODO:
+
+syntax region clojureSexp   matchgroup=clojureParen start="("  matchgroup=clojureParen end=")"  contains=TOP,@Spell
+syntax region clojureVector matchgroup=clojureParen start="\[" matchgroup=clojureParen end="\]" contains=TOP,@Spell
+syntax region clojureMap    matchgroup=clojureParen start="{"  matchgroup=clojureParen end="}"  contains=TOP,@Spell
+
+" Highlight superfluous closing parens, brackets and braces.
+syntax match clojureError "]\|}\|)"
+
+syntax sync fromstart
+
+if version >= 600
+    command -nargs=+ HiLink highlight default link <args>
+else
+    command -nargs=+ HiLink highlight link <args>
+endif
+
+HiLink clojureConstant  Constant
+HiLink clojureBoolean   Boolean
+HiLink clojureCharacter Character
+HiLink clojureKeyword   Keyword
+HiLink clojureNumber    Number
+HiLink clojureString    String
+HiLink clojureRegexp    Constant
+
+HiLink clojureVariable  Identifier
+HiLink clojureCond      Conditional
+HiLink clojureDefine    Define
+HiLink clojureException Exception
+HiLink clojureFunc      Function
+HiLink clojureMacro     Macro
+HiLink clojureRepeat    Repeat
+
+HiLink clojureSpecial   Special
+HiLink clojureVarArg    Special
+HiLink clojureQuote     SpecialChar
+HiLink clojureUnquote   SpecialChar
+HiLink clojureMeta      SpecialChar
+HiLink clojureDeref     SpecialChar
+HiLink clojureAnonArg   SpecialChar
+HiLink clojureDispatch  SpecialChar
+
+HiLink clojureComment   Comment
+HiLink clojureTodo      Todo
+
+HiLink clojureError     Error
+
+HiLink clojureParen     Delimiter
+
+delcommand HiLink
+
+let b:current_syntax = "clojure"
+
+" vim:sts=4 sw=4 et:
diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim
index af97543c33..adbd2a7a53 100644
--- a/runtime/syntax/help.vim
+++ b/runtime/syntax/help.vim
@@ -25,10 +25,12 @@ else
   syn match helpHyperTextEntry	"\*[#-)!+-~]\+\*$" contains=helpStar
 endif
 if has("conceal")
-  syn match helpBar		contained "[|`]" conceal
+  syn match helpBar		contained "|" conceal
+  syn match helpBacktick	contained "`" conceal
   syn match helpStar		contained "\*" conceal
 else
-  syn match helpBar		contained "[|`]"
+  syn match helpBar		contained "|"
+  syn match helpBacktick	contained "`"
   syn match helpStar		contained "\*"
 endif
 syn match helpNormal		"|.*====*|"
@@ -38,7 +40,7 @@ syn match helpVim		"Vim version [0-9.a-z]\+"
 syn match helpVim		"VIM REFERENCE.*"
 syn match helpOption		"'[a-z]\{2,\}'"
 syn match helpOption		"'t_..'"
-syn match helpCommand		"`[^` ]*`"hs=s+1,he=e-1 contains=helpBar
+syn match helpCommand		"`[^` ]*`"hs=s+1,he=e-1 contains=helpBacktick
 syn match helpHeader		"\s*\zs.\{-}\ze\s\=\~$" nextgroup=helpIgnore
 syn match helpGraphic		".* \ze`$" nextgroup=helpIgnore
 if has("conceal")
@@ -150,6 +152,7 @@ syn sync minlines=40
 hi def link helpIgnore		Ignore
 hi def link helpHyperTextJump	Subtitle
 hi def link helpBar		Ignore
+hi def link helpBacktick	Ignore
 hi def link helpStar		Ignore
 hi def link helpHyperTextEntry	String
 hi def link helpHeadline	Statement

From 8eafb3535449400ced4240070abc14032e987603 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 18:24:02 +0100
Subject: [PATCH 099/106] updated for version 7.3.803 Problem:    Substitute
 with confirmation and then "q" does not replace 	    anything.  (John
 McGowan) Solution:   Do not break the loop, skip to the end.

---
 src/ex_cmds.c         |  2 +-
 src/testdir/test80.in | 13 ++++++++++++-
 src/testdir/test80.ok |  4 ++++
 src/version.c         |  2 ++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 3c865e7849..656b1f49d1 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -4878,7 +4878,7 @@ do_sub(eap)
 			goto skip;
 		    }
 		    if (got_quit)
-			break;
+			goto skip;
 		}
 
 		/* Move the cursor to the start of the match, so that we can
diff --git a/src/testdir/test80.in b/src/testdir/test80.in
index 2decb4dbcf..df4afbb1d2 100644
--- a/src/testdir/test80.in
+++ b/src/testdir/test80.in
@@ -153,11 +153,22 @@ STARTTEST
 :s/\(^\|,\)\ze\(,\|Y\)/\1N/gc
 a:$put =',,Z'
 :s/\(^\|,\)\ze\(,\|Z\)/\1N/gc
-yy/^TEST_9
+yy/^TEST_9:
 ENDTEST
 
 TEST_9:
 
+STARTTEST
+:set magic&
+:set cpo&
+:$put =\"\n\nTEST_9:\"
+:$put ='xxx'
+:s/x/X/gc
+yyq/^TEST_10:
+ENDTEST
+
+TEST_10:
+
 STARTTEST
 :/^Results/,$wq! test.out
 ENDTEST
diff --git a/src/testdir/test80.ok b/src/testdir/test80.ok
index 775d985312..b08d3036f3 100644
--- a/src/testdir/test80.ok
+++ b/src/testdir/test80.ok
@@ -105,3 +105,7 @@ TEST_8:
 N,,NX
 N,,NY
 N,,NZ
+
+
+TEST_9:
+XXx
diff --git a/src/version.c b/src/version.c
index 90ac7247e9..6f3020cae2 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 */
+/**/
+    803,
 /**/
     802,
 /**/

From 4e06a2e442d1b3d38d2f95340ff4d9214ad8a7b4 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 18:24:02 +0100
Subject: [PATCH 100/106] Added tag v7-3-803 for changeset 77fa4dee43fc

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

diff --git a/.hgtags b/.hgtags
index 33df97414a..6b24406778 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2139,3 +2139,4 @@ cdaa688e3dddc442c1d39780b6ac0b5ac98c253e v7-3-798
 c0cc0e0620dd935956a472e5b23369d1d78f5fb9 v7-3-800
 48b54c590dc83b705f2e19f9aea1e9a69fe09720 v7-3-801
 cd5145d2408bb52217417af654f5664af269e19e v7-3-802
+77fa4dee43fcd1c0bacad9dc85b3deb39e0ba487 v7-3-803

From 8d9716012c7d2a92a8054b933b8b126a83a842f4 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 18:45:01 +0100
Subject: [PATCH 101/106] updated for version 7.3.804 Problem:    Compiler
 warning for tiny build. (Tony Mechelynck) Solution:   Add #ifdefs around
 variable.

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

diff --git a/src/buffer.c b/src/buffer.c
index f4713a1f79..cfe408093c 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1441,7 +1441,9 @@ set_curbuf(buf, action)
 enter_buffer(buf)
     buf_T	*buf;
 {
+#ifdef FEAT_SYN_HL
     long old_tw = curbuf->b_p_tw;
+#endif
 
     /* Copy buffer and window local option values.  Not for a help buffer. */
     buf_copy_options(buf, BCO_ENTER | BCO_NOHELP);
diff --git a/src/version.c b/src/version.c
index 6f3020cae2..261a032cb0 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 */
+/**/
+    804,
 /**/
     803,
 /**/

From 3d98255a45eb4fd2ddd2558e5a8fc14c909f8d69 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 18:45:01 +0100
Subject: [PATCH 102/106] Added tag v7-3-804 for changeset 2eb4b9ed2d42

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

diff --git a/.hgtags b/.hgtags
index 6b24406778..534f4bcbad 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2140,3 +2140,4 @@ c0cc0e0620dd935956a472e5b23369d1d78f5fb9 v7-3-800
 48b54c590dc83b705f2e19f9aea1e9a69fe09720 v7-3-801
 cd5145d2408bb52217417af654f5664af269e19e v7-3-802
 77fa4dee43fcd1c0bacad9dc85b3deb39e0ba487 v7-3-803
+2eb4b9ed2d42312eff32e845336aab748f7fe311 v7-3-804

From 205f9201d8821d7b694f925458bcb22bf1480c06 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 19:49:43 +0100
Subject: [PATCH 103/106] updated for version 7.3.805 Problem:    Lua version
 5.2 is not detected properly on Arch Linux. Solution:   Adjust autoconf.
 (lilydjwg)

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

diff --git a/src/auto/configure b/src/auto/configure
index 3ef90c87ff..5244a2eb46 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4737,13 +4737,15 @@ $as_echo "no" >&6; }
       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
+			for LUA_SOVER in "${vi_cv_version_lua}.so" ".so.${vi_cv_version_lua}"; do
+	  for i in 0 1 2 3 4 5 6 7 8 9; do
+	    if test -f "${vi_cv_path_lua_pfx}/lib/liblua${LUA_SOVER}.$i"; then
+	      LUA_SONAME=".$i"
+	      break
+	    fi
+	  done
+	  vi_cv_dll_name_lua="liblua${LUA_SOVER}$LUA_SONAME"
 	done
-	vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME"
       fi
       $as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
 
diff --git a/src/configure.in b/src/configure.in
index 431bc2cbdf..d0fa6ffc06 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -496,13 +496,15 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
       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
+	for LUA_SOVER in "${vi_cv_version_lua}.so" ".so.${vi_cv_version_lua}"; do
+	  for i in 0 1 2 3 4 5 6 7 8 9; do
+	    if test -f "${vi_cv_path_lua_pfx}/lib/liblua${LUA_SOVER}.$i"; then
+	      LUA_SONAME=".$i"
+	      break
+	    fi
+	  done
+	  vi_cv_dll_name_lua="liblua${LUA_SOVER}$LUA_SONAME"
 	done
-	vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME"
       fi
       AC_DEFINE(DYNAMIC_LUA)
       LUA_LIBS=""
diff --git a/src/version.c b/src/version.c
index 261a032cb0..6981f9180c 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 */
+/**/
+    805,
 /**/
     804,
 /**/

From 5e15217b8cb848ab7de93a6ed8cb0979d86b6d56 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 19:49:44 +0100
Subject: [PATCH 104/106] Added tag v7-3-805 for changeset dc30c01f9956

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

diff --git a/.hgtags b/.hgtags
index 534f4bcbad..702b00732a 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2141,3 +2141,4 @@ c0cc0e0620dd935956a472e5b23369d1d78f5fb9 v7-3-800
 cd5145d2408bb52217417af654f5664af269e19e v7-3-802
 77fa4dee43fcd1c0bacad9dc85b3deb39e0ba487 v7-3-803
 2eb4b9ed2d42312eff32e845336aab748f7fe311 v7-3-804
+dc30c01f995623e65ee6651a46b12ff062df8860 v7-3-805

From bd41f83f128ef393260393fdbd8f53df2d42e041 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 19:58:43 +0100
Subject: [PATCH 105/106] updated for version 7.3.806 Problem:    Compiler
 warnings in Perl code when building with Visual studio 	    2012.
 (skeept) Solution:   Add type casts. (Christian Brabandt, 2013 Jan 30)

---
 src/if_perl.xs | 20 ++++++++++----------
 src/version.c  |  2 ++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/if_perl.xs b/src/if_perl.xs
index f0baabff63..cdfac905cf 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -1048,7 +1048,7 @@ Buffers(...)
 	{
 	    SV *sv = ST(i);
 	    if (SvIOK(sv))
-		b = SvIV(ST(i));
+		b = (int) SvIV(ST(i));
 	    else
 	    {
 		char_u *pat;
@@ -1091,7 +1091,7 @@ Windows(...)
     {
 	for (i = 0; i < items; i++)
 	{
-	    w = SvIV(ST(i));
+	    w = (int) SvIV(ST(i));
 	    vimwin = win_find_nr(w);
 	    if (vimwin)
 		XPUSHs(newWINrv(newSV(0), vimwin));
@@ -1154,8 +1154,8 @@ Cursor(win, ...)
 
       if (!win_valid(win))
 	  win = curwin;
-      lnum = SvIV(ST(1));
-      col = SvIV(ST(2));
+      lnum = (int) SvIV(ST(1));
+      col = (int) SvIV(ST(2));
       win->w_cursor.lnum = lnum;
       win->w_cursor.col = col;
       check_cursor();		    /* put cursor on an existing line */
@@ -1216,7 +1216,7 @@ Get(vimbuf, ...)
     {
 	for (i = 1; i < items; i++)
 	{
-	    lnum = SvIV(ST(i));
+	    lnum = (long) SvIV(ST(i));
 	    if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
 	    {
 		line = ml_get_buf(vimbuf, lnum, FALSE);
@@ -1239,7 +1239,7 @@ Set(vimbuf, ...)
 	if (items < 3)
 	    croak("Usage: VIBUF::Set(vimbuf, lnum, @lines)");
 
-	lnum = SvIV(ST(1));
+	lnum = (long) SvIV(ST(1));
 	for(i = 2; i < items; i++, lnum++)
 	{
 	    line = SvPV(ST(i),PL_na);
@@ -1274,13 +1274,13 @@ Delete(vimbuf, ...)
     {
 	if (items == 2)
 	{
-	    lnum = SvIV(ST(1));
+	    lnum = (long) SvIV(ST(1));
 	    count = 1;
 	}
 	else if (items == 3)
 	{
-	    lnum = SvIV(ST(1));
-	    count = 1 + SvIV(ST(2)) - lnum;
+	    lnum = (long) SvIV(ST(1));
+	    count = (long) 1 + SvIV(ST(2)) - lnum;
 	    if (count == 0)
 		count = 1;
 	    if (count < 0)
@@ -1331,7 +1331,7 @@ Append(vimbuf, ...)
 	if (items < 3)
 	    croak("Usage: VIBUF::Append(vimbuf, lnum, @lines)");
 
-	lnum = SvIV(ST(1));
+	lnum = (long) SvIV(ST(1));
 	for (i = 2; i < items; i++, lnum++)
 	{
 	    line = SvPV(ST(i),PL_na);
diff --git a/src/version.c b/src/version.c
index 6981f9180c..83cdd98ce8 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 */
+/**/
+    806,
 /**/
     805,
 /**/

From 8039d354d3e5eb90e9d1f55da005a689aa30dec1 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <bram@vim.org>
Date: Wed, 6 Feb 2013 19:58:43 +0100
Subject: [PATCH 106/106] Added tag v7-3-806 for changeset f7e3f87ac992

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

diff --git a/.hgtags b/.hgtags
index 702b00732a..2fcfcf9258 100644
--- a/.hgtags
+++ b/.hgtags
@@ -2142,3 +2142,4 @@ cd5145d2408bb52217417af654f5664af269e19e v7-3-802
 77fa4dee43fcd1c0bacad9dc85b3deb39e0ba487 v7-3-803
 2eb4b9ed2d42312eff32e845336aab748f7fe311 v7-3-804
 dc30c01f995623e65ee6651a46b12ff062df8860 v7-3-805
+f7e3f87ac9928df0079741258a3c6034ecc48806 v7-3-806