Changeset 52b4b72

Timestamp:

Jul 23, 2014, 12:36:25 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, master, systemd

Children:

7703780

Parents:

1393767 (diff), d923363 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of git.cross-lfs.org:cross-lfs

Files:

• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/packages.ent (modified) (1 diff)
• BOOK/patches.ent (modified) (2 diffs)
• patches/mpfr-3.1.2-fixes-4.patch (moved) (moved from patches/mpfr-3.1.2-fixes-3.patch ) (2 diffs)
• patches/patch-3.14.12.xz (deleted)
• patches/patch-3.14.13.xz (added)
• patches/vim-7.4-branch_update-5.patch (moved) (moved from patches/vim-7.4-branch_update-4.patch ) (1223 diffs)

BOOK/introduction/common/changelog.xml

@@ -38 +38 @@
 
     <listitem>
+      <para>21 July 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Update MPFR 3.1.2 fixes patch for patch
+          level 10 update.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update VIM 7.4 Branch Update patch to
+          patch level 373.</para>
+        </listitem>
+        <listitem>
+          <para>[William Harrington] - Update Linux to 3.14.13.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>18 July 2014</para>
       <itemizedlist>

BOOK/packages.ent

@@ -329 +329 @@
 
 <!ENTITY linux-version "3.14">
-<!ENTITY linux-version2 "&linux-version;.12">
+<!ENTITY linux-version2 "&linux-version;.13">
 <!ENTITY linux-size "78,399 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.xz">

BOOK/patches.ent

@@ -42 +42 @@
 
 <!ENTITY linux-sublevel-patch "patch-&linux-version2;.xz">
-<!ENTITY linux-sublevel-patch-md5 "89a5af1f3609d0c27e63fea298dd80ed">
-<!ENTITY linux-sublevel-patch-size "324 KB">
+<!ENTITY linux-sublevel-patch-md5 "132470897fc5d57f5ac7d658100cc430">
+<!ENTITY linux-sublevel-patch-size "338 KB">
 
-<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-fixes-3.patch">
-<!ENTITY mpfr-fixes-patch-md5 "34cec761c2e53658aad1214d77b7f184">
-<!ENTITY mpfr-fixes-patch-size "45 KB">
+<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-fixes-4.patch">
+<!ENTITY mpfr-fixes-patch-md5 "b6c1c0dcbf7661298037eeb346a8669c">
+<!ENTITY mpfr-fixes-patch-size "55 KB">
 
 <!ENTITY ncurses-bashfix-patch "ncurses-&ncurses-version;-bash_fix-1.patch">
@@ -75 +75 @@
 <!-- Vim branch update patch area -->
 
-<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-4.patch">
-<!ENTITY vim-branch_update-patch-md5 "242c96838a05da13b47d25fb62bf8418">
-<!ENTITY vim-branch_update-patch-size "2,846 KB">
+<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-5.patch">
+<!ENTITY vim-branch_update-patch-md5 "ef591881ff7aa8baac8aecc201e20f12">
+<!ENTITY vim-branch_update-patch-size "3,139 KB">
 
 <!-- Start of multilib patches -->

patches/mpfr-3.1.2-fixes-4.patch

@@ -1 +1 @@
 Submitted By: William Harrington (kb0iic at cross-lfs dot org)
-Date: 2014-05-09
+Date: 2014-07-21
 Initial Package Version: 3.1.2
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches of mpfr current to patch level 8.
+Description: Contains all upstream patches of mpfr current to patch level 10.
 
 diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
@@ -1279 +1279 @@
 +  return "3.1.2-p8";
  }
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES        2014-06-30 15:15:25.533266905 +0000
++++ mpfr-3.1.2-b/PATCHES        2014-06-30 15:15:25.617269178 +0000
+@@ -0,0 +1 @@
++div-overflow
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION        2014-06-30 15:15:25.529266797 +0000
++++ mpfr-3.1.2-b/VERSION        2014-06-30 15:15:25.617269178 +0000
+@@ -1 +1 @@
+-3.1.2-p8
++3.1.2-p9
+diff -Naurd mpfr-3.1.2-a/src/div.c mpfr-3.1.2-b/src/div.c
+--- mpfr-3.1.2-a/src/div.c      2013-03-13 15:37:33.000000000 +0000
++++ mpfr-3.1.2-b/src/div.c      2014-06-30 15:15:25.585268312 +0000
+@@ -750,7 +750,9 @@
+  truncate_check_qh:
+   if (qh)
+     {
+-      qexp ++;
++      if (MPFR_LIKELY (qexp < MPFR_EXP_MAX))
++        qexp ++;
++      /* else qexp is now incorrect, but one will still get an overflow */
+       q0p[q0size - 1] = MPFR_LIMB_HIGHBIT;
+     }
+   goto truncate;
+@@ -765,7 +767,9 @@
+   inex = 1; /* always here */
+   if (mpn_add_1 (q0p, q0p, q0size, MPFR_LIMB_ONE << sh))
+     {
+-      qexp ++;
++      if (MPFR_LIKELY (qexp < MPFR_EXP_MAX))
++        qexp ++;
++      /* else qexp is now incorrect, but one will still get an overflow */
+       q0p[q0size - 1] = MPFR_LIMB_HIGHBIT;
+     }
+ 
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h     2014-06-30 15:15:25.533266905 +0000
++++ mpfr-3.1.2-b/src/mpfr.h     2014-06-30 15:15:25.613269070 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2-p8"
++#define MPFR_VERSION_STRING "3.1.2-p9"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c  2014-06-30 15:15:25.533266905 +0000
++++ mpfr-3.1.2-b/src/version.c  2014-06-30 15:15:25.613269070 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.2-p8";
++  return "3.1.2-p9";
+ }
+diff -Naurd mpfr-3.1.2-a/tests/tdiv.c mpfr-3.1.2-b/tests/tdiv.c
+--- mpfr-3.1.2-a/tests/tdiv.c   2013-03-13 15:37:44.000000000 +0000
++++ mpfr-3.1.2-b/tests/tdiv.c   2014-06-30 15:15:25.585268312 +0000
+@@ -1104,6 +1104,96 @@
+ #define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), randlimb () % 100, RANDS)
+ #include "tgeneric.c"
+ 
++static void
++test_extreme (void)
++{
++  mpfr_t x, y, z;
++  mpfr_exp_t emin, emax;
++  mpfr_prec_t p[4] = { 8, 32, 64, 256 };
++  int xi, yi, zi, j, r;
++  unsigned int flags, ex_flags;
++
++  emin = mpfr_get_emin ();
++  emax = mpfr_get_emax ();
++
++  mpfr_set_emin (MPFR_EMIN_MIN);
++  mpfr_set_emax (MPFR_EMAX_MAX);
++
++  for (xi = 0; xi < 4; xi++)
++    {
++      mpfr_init2 (x, p[xi]);
++      mpfr_setmax (x, MPFR_EMAX_MAX);
++      MPFR_ASSERTN (mpfr_check (x));
++      for (yi = 0; yi < 4; yi++)
++        {
++          mpfr_init2 (y, p[yi]);
++          mpfr_setmin (y, MPFR_EMIN_MIN);
++          for (j = 0; j < 2; j++)
++            {
++              MPFR_ASSERTN (mpfr_check (y));
++              for (zi = 0; zi < 4; zi++)
++                {
++                  mpfr_init2 (z, p[zi]);
++                  RND_LOOP (r)
++                    {
++                      mpfr_clear_flags ();
++                      mpfr_div (z, x, y, (mpfr_rnd_t) r);
++                      flags = __gmpfr_flags;
++                      MPFR_ASSERTN (mpfr_check (z));
++                      ex_flags = MPFR_FLAGS_OVERFLOW | MPFR_FLAGS_INEXACT;
++                      if (flags != ex_flags)
++                        {
++                          printf ("Bad flags in test_extreme on z = a/b"
++                                  " with %s and\n",
++                                  mpfr_print_rnd_mode ((mpfr_rnd_t) r));
++                          printf ("a = ");
++                          mpfr_dump (x);
++                          printf ("b = ");
++                          mpfr_dump (y);
++                          printf ("Expected flags:");
++                          flags_out (ex_flags);
++                          printf ("Got flags:     ");
++                          flags_out (flags);
++                          printf ("z = ");
++                          mpfr_dump (z);
++                          exit (1);
++                        }
++                      mpfr_clear_flags ();
++                      mpfr_div (z, y, x, (mpfr_rnd_t) r);
++                      flags = __gmpfr_flags;
++                      MPFR_ASSERTN (mpfr_check (z));
++                      ex_flags = MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT;
++                      if (flags != ex_flags)
++                        {
++                          printf ("Bad flags in test_extreme on z = a/b"
++                                  " with %s and\n",
++                                  mpfr_print_rnd_mode ((mpfr_rnd_t) r));
++                          printf ("a = ");
++                          mpfr_dump (y);
++                          printf ("b = ");
++                          mpfr_dump (x);
++                          printf ("Expected flags:");
++                          flags_out (ex_flags);
++                          printf ("Got flags:     ");
++                          flags_out (flags);
++                          printf ("z = ");
++                          mpfr_dump (z);
++                          exit (1);
++                        }
++                    }
++                  mpfr_clear (z);
++                }  /* zi */
++              mpfr_nextabove (y);
++            }  /* j */
++          mpfr_clear (y);
++        }  /* yi */
++      mpfr_clear (x);
++    }  /* xi */
++
++  set_emin (emin);
++  set_emax (emax);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -1130,6 +1220,7 @@
+   test_20070603 ();
+   test_20070628 ();
+   test_generic (2, 800, 50);
++  test_extreme ();
+ 
+   tests_end_mpfr ();
+   return 0;
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES        2014-06-30 15:17:53.337268149 +0000
++++ mpfr-3.1.2-b/PATCHES        2014-06-30 15:17:53.417270314 +0000
+@@ -0,0 +1 @@
++vasprintf
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION        2014-06-30 15:17:53.337268149 +0000
++++ mpfr-3.1.2-b/VERSION        2014-06-30 15:17:53.413270206 +0000
+@@ -1 +1 @@
+-3.1.2-p9
++3.1.2-p10
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h     2014-06-30 15:17:53.337268149 +0000
++++ mpfr-3.1.2-b/src/mpfr.h     2014-06-30 15:17:53.413270206 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2-p9"
++#define MPFR_VERSION_STRING "3.1.2-p10"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.2-a/src/vasprintf.c mpfr-3.1.2-b/src/vasprintf.c
+--- mpfr-3.1.2-a/src/vasprintf.c        2013-11-15 00:51:49.267334408 +0000
++++ mpfr-3.1.2-b/src/vasprintf.c        2014-06-30 15:17:53.377269231 +0000
+@@ -884,14 +884,18 @@
+            first digit, we want the exponent for radix two and the decimal
+            point AFTER the first digit. */
+         {
+-          MPFR_ASSERTN (exp > MPFR_EMIN_MIN /4); /* possible overflow */
++          /* An integer overflow is normally not possible since MPFR_EXP_MIN
++             is twice as large as MPFR_EMIN_MIN. */
++          MPFR_ASSERTN (exp > (MPFR_EXP_MIN + 3) / 4);
+           exp = (exp - 1) * 4;
+         }
+       else
+         /* EXP is the exponent for decimal point BEFORE the first digit, we
+            want the exponent for decimal point AFTER the first digit. */
+         {
+-          MPFR_ASSERTN (exp > MPFR_EMIN_MIN); /* possible overflow */
++          /* An integer overflow is normally not possible since MPFR_EXP_MIN
++             is twice as large as MPFR_EMIN_MIN. */
++          MPFR_ASSERTN (exp > MPFR_EXP_MIN);
+           --exp;
+         }
+     }
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c  2014-06-30 15:17:53.337268149 +0000
++++ mpfr-3.1.2-b/src/version.c  2014-06-30 15:17:53.413270206 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.2-p9";
++  return "3.1.2-p10";
+ }
+diff -Naurd mpfr-3.1.2-a/tests/tsprintf.c mpfr-3.1.2-b/tests/tsprintf.c
+--- mpfr-3.1.2-a/tests/tsprintf.c       2013-11-15 00:51:49.267334408 +0000
++++ mpfr-3.1.2-b/tests/tsprintf.c       2014-06-30 15:17:53.377269231 +0000
+@@ -1184,6 +1184,69 @@
+   check_emax_aux (MPFR_EMAX_MAX);
+ }
+ 
++static void
++check_emin_aux (mpfr_exp_t e)
++{
++  mpfr_t x;
++  char *s1, s2[256];
++  int i;
++  mpfr_exp_t emin;
++  mpz_t ee;
++
++  MPFR_ASSERTN (e >= LONG_MIN);
++  emin = mpfr_get_emin ();
++  set_emin (e);
++
++  mpfr_init2 (x, 16);
++  mpz_init (ee);
++
++  mpfr_setmin (x, e);
++  mpz_set_si (ee, e);
++  mpz_sub_ui (ee, ee, 1);
++
++  i = mpfr_asprintf (&s1, "%Ra", x);
++  MPFR_ASSERTN (i > 0);
++
++  gmp_snprintf (s2, 256, "0x1p%Zd", ee);
++
++  if (strcmp (s1, s2) != 0)
++    {
++      printf ("Error in check_emin_aux for emin = %ld\n", (long) e);
++      printf ("Expected %s\n", s2);
++      printf ("Got      %s\n", s1);
++      exit (1);
++    }
++
++  mpfr_free_str (s1);
++
++  i = mpfr_asprintf (&s1, "%Rb", x);
++  MPFR_ASSERTN (i > 0);
++
++  gmp_snprintf (s2, 256, "1p%Zd", ee);
++
++  if (strcmp (s1, s2) != 0)
++    {
++      printf ("Error in check_emin_aux for emin = %ld\n", (long) e);
++      printf ("Expected %s\n", s2);
++      printf ("Got      %s\n", s1);
++      exit (1);
++    }
++
++  mpfr_free_str (s1);
++
++  mpfr_clear (x);
++  mpz_clear (ee);
++  set_emin (emin);
++}
++
++static void
++check_emin (void)
++{
++  check_emin_aux (-15);
++  check_emin_aux (mpfr_get_emin ());
++  check_emin_aux (MPFR_EMIN_MIN);
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -1203,6 +1266,7 @@
+   decimal ();
+   mixed ();
+   check_emax ();
++  check_emin ();
+ 
+ #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
+   locale_da_DK ();

patches/vim-7.4-branch_update-5.patch

@@ -1 +1 @@
 Submitted By: William Harrington (kb0iic at cross-lfs dot org)
-Date: 2014-05-31
+Date: 2014-07-21
 Initial Package Version: 7.4
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 7.4.316.
+Description: Contains all upstream patches up to 7.4.373.
 
 diff -Naur vim74.orig/.hg_archival.txt vim74/.hg_archival.txt
 --- vim74.orig/.hg_archival.txt 1970-01-01 00:00:00.000000000 +0000
-+++ vim74/.hg_archival.txt      2014-06-01 00:42:48.067546692 +0000
++++ vim74/.hg_archival.txt      2014-07-21 23:33:10.410210199 +0000
 @@ -0,0 +1,5 @@
 +repo: 770908d1cb47c04be0aef5c173b17ab8be6b6476
-+node: bed71c37618c11240596390f277d4f5e60d35ebc
++node: 32a77cc160d922036ee28363f1a183f8e37f77ed
 +branch: default
-+latesttag: v7-4-316
-+latesttagdistance: 1
++latesttag: v7-4-373
++latesttagdistance: 2
 diff -Naur vim74.orig/.hgignore vim74/.hgignore
 --- vim74.orig/.hgignore        1970-01-01 00:00:00.000000000 +0000
-+++ vim74/.hgignore     2014-06-01 00:42:48.107546590 +0000
-@@ -0,0 +1,74 @@
++++ vim74/.hgignore     2014-07-21 23:33:10.436876796 +0000
+@@ -0,0 +1,75 @@
 +syntax: glob
 +
@@ -85 +85 @@
 +
 +# Generated by "make test"
-+src/po/*.ck 
-+src/testdir/mbyte.vim 
-+src/testdir/mzscheme.vim 
-+src/testdir/lua.vim 
-+src/testdir/small.vim 
-+src/testdir/tiny.vim 
++src/po/*.ck
++src/testdir/mbyte.vim
++src/testdir/mzscheme.vim
++src/testdir/lua.vim
++src/testdir/small.vim
++src/testdir/tiny.vim
 +src/testdir/test*.out
 +src/testdir/test.log
++src/memfile_test
 diff -Naur vim74.orig/.hgtags vim74/.hgtags
 --- vim74.orig/.hgtags  1970-01-01 00:00:00.000000000 +0000
-+++ vim74/.hgtags       2014-06-01 00:42:48.127546539 +0000
-@@ -0,0 +1,3041 @@
++++ vim74/.hgtags       2014-07-21 23:33:10.453543419 +0000
+@@ -0,0 +1,3098 @@
 +004eb98eb3c30714cb6a24ec3e810275080a8413 v7-1-117
 +006e9c8a6a8ad354a5cb6adcce6ebfceddeb20ee v7-0079
@@ -3138 +3139 @@
 +646616b6ff4defcc7bef0b198b540f6d965a8126 v7-4-315
 +0fc665889e8f0af532cb4e3be2f0ff0421bf2fbc v7-4-316
++8ffcb546d782121dfc9d88c7edc6f62421efce89 v7-4-317
++5c47dacf397c1c65d2dfc237b3ff395c66ec3d4d v7-4-318
++a076237d1c3849535681e82946a9041ed5525d7f v7-4-319
++f7bc601823e5c81e2ca412506a42eff9fd790ace v7-4-320
++c052937aae8ca5082f308b8ff0712c7eccdd30c8 v7-4-321
++fd96c55d683d76ece4ba01490d9796c13c988cdc v7-4-322
++238f5027830cad22e17a970483af9b160869cdf3 v7-4-323
++c476e0ac8b406693c3877baffa0e97ff25e59b06 v7-4-324
++1f288d2475488c3f44c7248e99019e2612580716 v7-4-325
++1dbcb23ae7a8b68ddbc28b4feb794c4c1db12395 v7-4-326
++99d8f2d72dcd4b850de81998cc9b1120c8165762 v7-4-327
++01d9ffdd6e6ffb39faf946e13ec63bd7dc31e162 v7-4-328
++018df65085f8990c1407442f8c783d4cee72a479 v7-4-329
++f9fa2e506b9f07549cd91074835c5c553db7b3a7 v7-4-330
++6d984caa0409fd284722c44cb09a0a2b5360bd4f v7-4-331
++8fed02d53b45848b0fff60de13d06858963cfb17 v7-4-332
++8ae50e3ef8bf733c0869c01b5132d02feffc0955 v7-4-333
++03d260a8ea0c0c67f424c387dbe2af5754e5e589 v7-4-334
++8ad2ecd116021ad5c945426e8bb80d741392b780 v7-4-335
++a42ba1e5099290a86cac1a9ac490c49e82e4c2cf v7-4-336
++0206ac84ff5fdce6d893c470e0909d2aed547a24 v7-4-337
++ef83b423ebf7de11c1063c795dd2186a9b59b90f v7-4-338
++fd7110d0c3bf4fea3cfa3d16da6c2a945d327c27 v7-4-339
++03f95f5e311b84653df70fb3c08a9d92cf21b8f0 v7-4-340
++adc4a84f72eb44dae657af713922a6e2c1f64ae3 v7-4-341
++8dcc6f142460b2d5eee119a174d441d46d95cd99 v7-4-342
++539ce56d8f35fe2deb5c4f57335e1adf97ae4e74 v7-4-343
++ce284c205558d103326a4c3f22f181774690b3eb v7-4-344
++ea2c5dfee1b04d216ebf992c5f46ecbdfee2854a v7-4-345
++3248c6e40aee01a7254d111dd846c6ec7889a804 v7-4-346
++a162d41f10e1c3c8673d86d8b0c58fdaf1bddeaf v7-4-347
++0b7586868f6da0372af7510650240e22dc1e6e64 v7-4-348
++79950dae1d7de8fc2cb0f8ddd087d403e2b9ce8e v7-4-349
++ad005d0114c1d2d83490787ef7ea2a3c6e5e7b9e v7-4-350
++f9ec944e4474c649faad642797ffd798a7102549 v7-4-351
++b4962cf3a1c06a1f60f1d750df8fcf7035b00b99 v7-4-352
++d42a1d3b74d40f580359dbd139d2d0dfa7235252 v7-4-353
++5deaa4e9812d4b4ae59d8a3e70bf19983e07e6da v7-4-354
++9a4efda75b5ef0f496d6a29c0a4dfcc7c03412f9 v7-4-355
++34465a179ce21c827cab4c65a75e6b490600a96f v7-4-356
++4eedfc4911a1db9c4874689f6c652be0094838f2 v7-4-357
++771b97ba3b4768c77f2070423a93152d6977f012 v7-4-358
++182c7b987283a567121e9c43d831779d1c88645f v7-4-359
++761687c6808f4c9c80d33a919a6bb506dfe9f674 v7-4-360
++a97e5b9dbc26800830e46cf3c1aa6efbfe258097 v7-4-361
++7fa2bed947fde3514a700c96861a537d816d6fd4 v7-4-362
++ff3816167b73fde35017d364b1a820014cd42e76 v7-4-363
++7b324826757595b21b0410a7b6f00227d73c655f v7-4-364
++4625fa27ba6f5b06294675b7f0d1bf8ae8f249fb v7-4-365
++ad775b58706587b6acfb0bb2c732e184efe4f778 v7-4-366
++bdbe2037066df6a463346be1768a56d98001fb36 v7-4-367
++021e16be3c026c9f883b2aba0b48469ecbae5d88 v7-4-368
++72ee0db83788638c36bbcb076cabc2ba6c8cd4e7 v7-4-369
++50575818a97fa4777e52272f5ffc769179d76a8d v7-4-370
++d44f298c43c74555f4ea21b710d377133f948d61 v7-4-371
++a122efb555c4f08405051369310451a627ed524b v7-4-372
++353330c512a9488cf5c1a3f8b8a57fa8cdd83a7a v7-4-373
 diff -Naur vim74.orig/Filelist vim74/Filelist
 --- vim74.orig/Filelist 2013-07-13 13:23:38.000000000 +0000
-+++ vim74/Filelist      2014-06-01 00:42:48.197546361 +0000
++++ vim74/Filelist      2014-07-21 23:33:10.503543288 +0000
 @@ -3,6 +3,7 @@
  
@@ -3167 +3225 @@
 diff -Naur vim74.orig/runtime/autoload/clojurecomplete.vim vim74/runtime/autoload/clojurecomplete.vim
 --- vim74.orig/runtime/autoload/clojurecomplete.vim     2013-02-06 14:35:23.000000000 +0000
-+++ vim74/runtime/autoload/clojurecomplete.vim  2014-06-01 00:42:49.274210286 +0000
++++ vim74/runtime/autoload/clojurecomplete.vim  2014-07-21 23:33:11.583540470 +0000
 @@ -1,20 +1,22 @@
  " Vim completion script
@@ -3208 +3266 @@
 diff -Naur vim74.orig/runtime/autoload/getscript.vim vim74/runtime/autoload/getscript.vim
 --- vim74.orig/runtime/autoload/getscript.vim   2013-04-17 13:40:44.000000000 +0000
-+++ vim74/runtime/autoload/getscript.vim        2014-06-01 00:42:49.320876834 +0000
++++ vim74/runtime/autoload/getscript.vim        2014-07-21 23:33:11.626873690 +0000
 @@ -1,8 +1,8 @@
  " ---------------------------------------------------------------------
@@ -3240 +3298 @@
  
    " this loop updates the GetLatestVimScripts.dat file
+diff -Naur vim74.orig/runtime/autoload/htmlcomplete.vim vim74/runtime/autoload/htmlcomplete.vim
+--- vim74.orig/runtime/autoload/htmlcomplete.vim        2011-04-28 11:13:20.000000000 +0000
++++ vim74/runtime/autoload/htmlcomplete.vim     2014-07-21 23:33:11.673540235 +0000
+@@ -1,7 +1,49 @@
+ " Vim completion script
+ " Language:    HTML and XHTML
+ " Maintainer:  Mikolaj Machowski ( mikmach AT wp DOT pl )
+-" Last Change: 2011 Apr 28
++" Last Change: 2014 Jun 20
++
++" Distinguish between HTML versions.
++" To use with other HTML versions add another "elseif" condition to match
++" proper DOCTYPE.
++function! htmlcomplete#DetectOmniFlavor()
++  if &filetype == 'xhtml'
++    let b:html_omni_flavor = 'xhtml10s'
++  else
++    let b:html_omni_flavor = 'html401t'
++  endif
++  let i = 1
++  let line = ""
++  while i < 10 && i < line("$")
++    let line = getline(i)
++    if line =~ '<!DOCTYPE.*\<DTD '
++      break
++    endif
++    let i += 1
++  endwhile
++  if line =~ '<!DOCTYPE.*\<DTD '  " doctype line found above
++    if line =~ ' HTML 3\.2'
++      let b:html_omni_flavor = 'html32'
++    elseif line =~ ' XHTML 1\.1'
++      let b:html_omni_flavor = 'xhtml11'
++    else    " two-step detection with strict/frameset/transitional
++      if line =~ ' XHTML 1\.0'
++       let b:html_omni_flavor = 'xhtml10'
++      elseif line =~ ' HTML 4\.01'
++       let b:html_omni_flavor = 'html401'
++      elseif line =~ ' HTML 4.0\>'
++       let b:html_omni_flavor = 'html40'
++      endif
++      if line =~ '\<Transitional\>'
++       let b:html_omni_flavor .= 't'
++      elseif line =~ '\<Frameset\>'
++       let b:html_omni_flavor .= 'f'
++      else
++       let b:html_omni_flavor .= 's'
++      endif
++    endif
++  endif
++endfunction
+ 
+ function! htmlcomplete#CompleteTags(findstart, base)
+   if a:findstart
 diff -Naur vim74.orig/runtime/autoload/netrw.vim vim74/runtime/autoload/netrw.vim
 --- vim74.orig/runtime/autoload/netrw.vim       2013-05-19 03:28:33.000000000 +0000
-+++ vim74/runtime/autoload/netrw.vim    2014-06-01 00:42:49.417543255 +0000
++++ vim74/runtime/autoload/netrw.vim    2014-07-21 23:33:11.806873220 +0000
 @@ -1,10 +1,10 @@
  " netrw.vim: Handles file transfer and remote directory listing across
@@ -10754 +10866 @@
 diff -Naur vim74.orig/runtime/autoload/netrwSettings.vim vim74/runtime/autoload/netrwSettings.vim
 --- vim74.orig/runtime/autoload/netrwSettings.vim       2013-05-03 19:53:43.000000000 +0000
-+++ vim74/runtime/autoload/netrwSettings.vim    2014-06-01 00:42:49.474209777 +0000
++++ vim74/runtime/autoload/netrwSettings.vim    2014-07-21 23:33:11.856873090 +0000
 @@ -1,7 +1,7 @@
  " netrwSettings.vim: makes netrw settings simpler
@@ -10788 +10900 @@
 diff -Naur vim74.orig/runtime/autoload/netrw_gitignore.vim vim74/runtime/autoload/netrw_gitignore.vim
 --- vim74.orig/runtime/autoload/netrw_gitignore.vim     1970-01-01 00:00:00.000000000 +0000
-+++ vim74/runtime/autoload/netrw_gitignore.vim  2014-06-01 00:42:49.487543077 +0000
++++ vim74/runtime/autoload/netrw_gitignore.vim  2014-07-21 23:33:12.126872385 +0000
 @@ -0,0 +1,71 @@
 +" netrw_gitignore#Hide: gitignore-based hiding
@@ -10863 +10975 @@
 diff -Naur vim74.orig/runtime/autoload/phpcomplete.vim vim74/runtime/autoload/phpcomplete.vim
 --- vim74.orig/runtime/autoload/phpcomplete.vim 2011-12-08 15:38:25.000000000 +0000
-+++ vim74/runtime/autoload/phpcomplete.vim      2014-06-01 00:42:49.544209599 +0000
++++ vim74/runtime/autoload/phpcomplete.vim      2014-07-21 23:33:12.173538930 +0000
 @@ -1,27 +1,101 @@
  " Vim completion script
@@ -10872 +10984 @@
 +" Previous Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
 +" URL: https://github.com/shawncplus/phpcomplete.vim
-+" Last Change:  2014 May 08
++" Last Change:  2014 May 30
  "
 -"   TODO:
@@ -10980 +11092 @@
  
                 if phpbegin == [0,0] && phpend == [0,0]
-@@ -37,5116 +111,2449 @@
+@@ -35,5118 +109,2464 @@
+                        " locate the start of the word
+                        let line = getline('.')
                         let start = col('.') - 1
-                        let curline = line('.')
+-                       let curline = line('.')
                         let compl_begin = col('.') - 2
 -                       while start >= 0 && line[start - 1] =~ '[a-zA-Z_0-9\x7f-\xff$]'
@@ -10991 +11105 @@
 -                       return start
 +                       let b:phpbegin = phpbegin
-+                       let b:compl_context = phpcomplete#GetCurrentInstruction(line('.'), col('.') - 2, phpbegin)
++                       let b:compl_context = phpcomplete#GetCurrentInstruction(line('.'), max([0, col('.') - 2]), phpbegin)
  
 +                       return start
@@ -11194 +11308 @@
 +               let builtin_classnames = filter(keys(copy(g:php_builtin_classnames)), 'v:val =~? "^'.classname_match_pattern.'"')
 +               for classname in builtin_classnames
-+                       call add(res, {'word': classname, 'kind': 'c'})
++                       call add(res, {'word': g:php_builtin_classes[tolower(classname)].name, 'kind': 'c'})
                 endfor
 +               let builtin_interfacenames = filter(keys(copy(g:php_builtin_interfacenames)), 'v:val =~? "^'.classname_match_pattern.'"')
 +               for interfacename in builtin_interfacenames
-+                       call add(res, {'word': interfacename, 'kind': 'i'})
++                       call add(res, {'word': g:php_builtin_interfaces[tolower(interfacename)].name, 'kind': 'i'})
 +               endfor
 +       endif
@@ -11506 +11620 @@
 +               for [classname, info] in items(g:php_builtin_classnames)
 +                       if classname =~? '^'.base
-+                               let builtin_classnames[leading_slash.classname] = info
++                               let builtin_classnames[leading_slash.g:php_builtin_classes[tolower(classname)].name] = info
                         endif
                 endfor
@@ -16638 +16752 @@
 -                       \ 'include(': 'string filename | resource',
 -                       \ 'include_once(': 'string filename | resource',
+-                       \ 'require(': 'string filename | resource',
 +       for line in file
 +               let c_name = matchstr(line, '\c\(class\|interface\)\s*\zs[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*')
@@ -16698 +16813 @@
 +                                       let menu = g:php_builtin_classes[tolower(classname)]['methods']['__construct']['signature']
 +                               endif
-+                               call add(res, {'word': leading_slash.classname, 'kind': 'c', 'menu': menu})
++                               call add(res, {'word': leading_slash.g:php_builtin_classes[tolower(classname)].name, 'kind': 'c', 'menu': menu})
 +                       endfor
 +               endif
@@ -16792 +16907 @@
 +               let f_args = matchstr(i,
 +                                       \ 'function\s*&\?[a-zA-Z_\x7f-\xff][a-zA-Z_0-9\x7f-\xff]*\s*(\zs.\{-}\ze)\_s*\({\|\_$\)')
-+               if f_name != ''
++               if f_name != '' && stridx(f_name, '__') != 0
 +                       let c_functions[f_name.'('] = f_args
 +                       if g:phpcomplete_parse_docblock_comments
-+                               let c_doc[f_name.'('] = phpcomplete#GetDocBlock(a:sccontent, 'function\s*\<'.f_name.'\>')
++                               let c_doc[f_name.'('] = phpcomplete#GetDocBlock(a:sccontent, 'function\s*&\?\<'.f_name.'\>')
 +                       endif
 +               endif
@@ -16915 +17030 @@
 +               " methods
 +               for [method_name, method_info] in items(class_info.methods)
-+                       if a:base == '' || method_name =~? '^'.a:base
++                       if stridx(method_name, '__') != 0 && (a:base == '' || method_name =~? '^'.a:base)
 +                               call add(res, {'word':method_name.'(', 'kind': 'f', 'menu': method_info.signature, 'info': method_info.signature })
 +                       endif
@@ -17183 +17298 @@
 +                       return unknown_result
 +
-+               elseif filereadable(classlocation)
++               elseif classlocation != '' && filereadable(classlocation)
 +                       " Read the next method from the stack and extract only the name
 +
@@ -17191 +17306 @@
 +                       " try to find the method's return type in docblock comment
 +                       for classstructure in classcontents
-+                               let doclock_target_pattern = 'function\s\+'.method.'\|\(public\|private\|protected\|var\).\+\$'.method
++                               let doclock_target_pattern = 'function\s\+&\?'.method.'\|\(public\|private\|protected\|var\).\+\$'.method
 +                               let doc_str = phpcomplete#GetDocBlock(split(classstructure.content, '\n'), doclock_target_pattern)
 +                               if doc_str != ''
@@ -17223 +17338 @@
 +                                                       let fullnamespace = class_candidate_namespace
 +                                               endif
-+                                               let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(returnclass, fullnamespace, a:imports)
++                                               " make @return self, static, $this the same way
++                                               " (not exactly what php means by these)
++                                               if returnclass == 'self' || returnclass == 'static' || returnclass == '$this'
++                                                       let classname_candidate = a:classname_candidate
++                                                       let class_candidate_namespace = a:class_candidate_namespace
++                                               else
++                                                       let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(returnclass, fullnamespace, a:imports)
++                                               endif
 +                                       endif
 +
@@ -17362 +17484 @@
 +                       let classname_candidate = return_type
 +                       let class_candidate_namespace = '\'
-+               else
++               elseif function_file != '' && filereadable(function_file)
 +                       let file_lines = readfile(function_file)
-+                       let docblock_str = phpcomplete#GetDocBlock(file_lines, 'function\s*\<'.function_name.'\>')
++                       let docblock_str = phpcomplete#GetDocBlock(file_lines, 'function\s*&\?\<'.function_name.'\>')
 +                       let docblock = phpcomplete#ParseDocBlock(docblock_str)
 +                       if has_key(docblock.return, 'type')
@@ -17380 +17502 @@
 +               endif
 +       else
++               " extract the variable name from the context
++               let object = methodstack[0]
++               let object_is_array = (object =~ '\v^[^[]+\[' ? 1 : 0)
++               let object = matchstr(object, variable_name_pattern)
++
 +               " check Constant lookup
 +               let constant_object = matchstr(a:context, '\zs'.class_name_pattern.'\ze::')
@@ -17386 +17513 @@
 +               endif
 +
-+               " extract the variable name from the context
-+               let object = methodstack[0]
-+               let object_is_array = (object =~ '\v^[^[]+\[' ? 1 : 0)
-+               let object = matchstr(object, variable_name_pattern)
-+
-+               " scan the file backwards from current line for explicit type declaration (@var $variable Classname)
-+               let i = 1 " start from the current line - 1
-+               while i < a:start_line
-+                       let line = getline(a:start_line - i)
-+                       " in file lookup for /* @var $foo Class */
-+                       if line =~# '@var\s\+'.object.'\s\+'.class_name_pattern
-+                               let classname_candidate = matchstr(line, '@var\s\+'.object.'\s\+\zs'.class_name_pattern.'\(\[\]\)\?')
-+                               break
-+                       elseif line !~ '^\s*$'
-+                               " type indicator comments should be next to the variable
-+                               " non empty lines break the search
-+                               break
-+                       endif
-+                       let i += 1
-+               endwhile
++               if classname_candidate == ''
++                       " scan the file backwards from current line for explicit type declaration (@var $variable Classname)
++                       let i = 1 " start from the current line - 1
++                       while i < a:start_line
++                               let line = getline(a:start_line - i)
++                               " in file lookup for /* @var $foo Class */
++                               if line =~# '@var\s\+'.object.'\s\+'.class_name_pattern
++                                       let classname_candidate = matchstr(line, '@var\s\+'.object.'\s\+\zs'.class_name_pattern.'\(\[\]\)\?')
++                                       let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(classname_candidate, a:current_namespace, a:imports)
++                                       break
++                               elseif line !~ '^\s*$'
++                                       " type indicator comments should be next to the variable
++                                       " non empty lines break the search
++                                       break
++                               endif
++                               let i += 1
++                       endwhile
++               endif
 +
 +               if classname_candidate != ''
@@ -17415 +17540 @@
 +               " scan the file backwards from the current line
 +               let i = 1
-+               while i < a:start_line
++               while i < a:start_line " {{{
 +                       let line = getline(a:start_line - i)
 +
@@ -17527 +17652 @@
 +                                       let class_candidate_namespace = '\'
 +                                       break
-+                               else
++                               elseif function_file != '' && filereadable(function_file)
 +                                       let file_lines = readfile(function_file)
-+                                       let docblock_str = phpcomplete#GetDocBlock(file_lines, 'function\s*\<'.function_name.'\>')
++                                       let docblock_str = phpcomplete#GetDocBlock(file_lines, 'function\s*&\?\<'.function_name.'\>')
 +                                       let docblock = phpcomplete#ParseDocBlock(docblock_str)
 +                                       if has_key(docblock.return, 'type')
@@ -17579 +17704 @@
 +
 +                       let i += 1
-+               endwhile
++               endwhile " }}}
 +
 +               if classname_candidate != ''
@@ -17650 +17775 @@
 +       endif
 +
++       return ''
 +endfunction
 +" }}}
@@ -17660 +17786 @@
 +       endif
 +
++
 +       " do in-file lookup for function definition
 +       let i = 1
 +       let buffer_lines = getline(1, line('$'))
 +       for line in buffer_lines
-+               if line =~? '^\s*function\s\+'.a:function_name.'\s*('
++               if line =~? '^\s*function\s\+&\?'.a:function_name.'\s*('
 +                       return expand('%:p')
 +               endif
@@ -17692 +17819 @@
 +               return no_namespace_candidate
 +       endif
++
++       return ''
 +endfunction
 +" }}}
@@ -17782 +17911 @@
 +       silent! below 1new
 +       silent! 0put =cfile
-+       call search('\(class\|interface\)\s\+'.a:class_name.'\(\>\|$\)')
++       call search('\(class\|interface\)\_s\+'.a:class_name.'\(\>\|$\)')
 +       let cfline = line('.')
 +       call search('{')
@@ -17815 +17944 @@
 +               endif
 +               let classlocation = phpcomplete#GetClassLocation(extends_class, namespace)
-+               if filereadable(classlocation)
++               if classlocation != '' && filereadable(classlocation)
 +                       let full_file_path = fnamemodify(classlocation, ':p')
 +                       let result += phpcomplete#GetClassContentsStructure(full_file_path, readfile(full_file_path), extends_class)
@@ -18132 +18261 @@
 +                                               let import['kind'] = 'c'
 +                                               let import['builtin'] = 1
-+                                       elseif has_key(g:php_builtin_interfaces, import.name)
++                                       elseif has_key(g:php_builtin_interfacenames, tolower(import.name))
 +                                               let import['kind'] = 'i'
 +                                               let import['builtin'] = 1
@@ -18360 +18489 @@
 +       endfor
 +
-+       let g:php_builtin_classnames[class_info.name] = ''
++       let g:php_builtin_classnames[classname] = ''
 +       for [method_name, method_info] in items(class_info.methods)
 +               let g:php_builtin_object_functions[classname.'::'.method_name.'('] = method_info.signature
@@ -18379 +18508 @@
 +       let g:php_builtin_interfacenames[interfacename] = ''
 +       for [method_name, method_info] in items(class_info.methods)
-+               let g:php_builtin_object_functions[classname.'::'.method_name.'('] = method_info.signature
++               let g:php_builtin_object_functions[interfacename.'::'.method_name.'('] = method_info.signature
 +       endfor
 +       for [method_name, method_info] in items(class_info.static_methods)
-+               let g:php_builtin_object_functions[classname.'::'.method_name.'('] = method_info.signature
++               let g:php_builtin_object_functions[interfacename.'::'.method_name.'('] = method_info.signature
 +       endfor
 +endfor
@@ -18391 +18520 @@
 +                       \ 'include(': 'string filename | resource',
 +                       \ 'include_once(': 'string filename | resource',
-                        \ 'require(': 'string filename | resource',
++                       \ 'require(': 'string filename | resource',
                         \ 'require_once(': 'string filename | resource',
                         \ }
@@ -18426 +18555 @@
 diff -Naur vim74.orig/runtime/colors/README.txt vim74/runtime/colors/README.txt
 --- vim74.orig/runtime/colors/README.txt        2010-05-15 11:03:31.000000000 +0000
-+++ vim74/runtime/colors/README.txt     2014-06-01 00:42:49.970875179 +0000
++++ vim74/runtime/colors/README.txt     2014-07-21 23:33:12.600204483 +0000
 @@ -36,6 +36,14 @@
  removed in your color scheme.  Use something like "gui=NONE" to remove the
@@ -18444 +18573 @@
 diff -Naur vim74.orig/runtime/colors/delek.vim vim74/runtime/colors/delek.vim
 --- vim74.orig/runtime/colors/delek.vim 2010-05-15 11:03:31.000000000 +0000
-+++ vim74/runtime/colors/delek.vim      2014-06-01 00:42:50.027541702 +0000
++++ vim74/runtime/colors/delek.vim      2014-07-21 23:33:12.646871028 +0000
 @@ -1,10 +1,10 @@
  " Vim color file
@@ -18474 +18603 @@
 diff -Naur vim74.orig/runtime/colors/industry.vim vim74/runtime/colors/industry.vim
 --- vim74.orig/runtime/colors/industry.vim      1970-01-01 00:00:00.000000000 +0000
-+++ vim74/runtime/colors/industry.vim   2014-06-01 00:42:50.067541600 +0000
++++ vim74/runtime/colors/industry.vim   2014-07-21 23:33:12.710204196 +0000
 @@ -0,0 +1,40 @@
 +" Vim color file
@@ -18518 +18647 @@
 diff -Naur vim74.orig/runtime/compiler/gcc.vim vim74/runtime/compiler/gcc.vim
 --- vim74.orig/runtime/compiler/gcc.vim 2011-12-15 20:20:22.000000000 +0000
-+++ vim74/runtime/compiler/gcc.vim      2014-06-01 00:42:50.447540632 +0000
++++ vim74/runtime/compiler/gcc.vim      2014-07-21 23:33:13.026870036 +0000
 @@ -25,10 +25,10 @@
        \%f:%l:\ %tarning:\ %m,
@@ -18536 +18665 @@
 diff -Naur vim74.orig/runtime/doc/autocmd.txt vim74/runtime/doc/autocmd.txt
 --- vim74.orig/runtime/doc/autocmd.txt  2013-08-10 11:24:52.000000000 +0000
-+++ vim74/runtime/doc/autocmd.txt       2014-06-01 00:42:51.010872531 +0000
++++ vim74/runtime/doc/autocmd.txt       2014-07-21 23:33:13.573535276 +0000
 @@ -1,4 +1,4 @@
 -*autocmd.txt*   For Vim version 7.4.  Last change: 2013 Aug 04
@@ -18594 +18723 @@
 diff -Naur vim74.orig/runtime/doc/change.txt vim74/runtime/doc/change.txt
 --- vim74.orig/runtime/doc/change.txt   2013-08-10 11:24:52.000000000 +0000
-+++ vim74/runtime/doc/change.txt        2014-06-01 00:42:51.047539105 +0000
++++ vim74/runtime/doc/change.txt        2014-07-21 23:33:13.596868549 +0000
 @@ -1,4 +1,4 @@
 -*change.txt*    For Vim version 7.4.  Last change: 2013 Jul 17
-+*change.txt*    For Vim version 7.4.  Last change: 2014 Feb 11
++*change.txt*    For Vim version 7.4.  Last change: 2014 Jun 26
  
  
@@ -18661 +18790 @@
                                                         *:sor* *:sort*
  :[range]sor[t][!] [i][u][r][n][x][o] [/{pattern}/]
+@@ -1707,8 +1717,8 @@
+ quite useless.
+ 
+ The details about sorting depend on the library function used.  There is no
+-guarantee that sorting is "stable" or obeys the current locale.  You will have
+-to try it out.
++guarantee that sorting obeys the current locale.  You will have to try it out.
++Vim does do a "stable" sort.
+ 
+ The sorting can be interrupted, but if you interrupt it too late in the
+ process you may end up with duplicated lines.  This also depends on the system
 diff -Naur vim74.orig/runtime/doc/cmdline.txt vim74/runtime/doc/cmdline.txt
 --- vim74.orig/runtime/doc/cmdline.txt  2013-08-10 11:24:52.000000000 +0000
-+++ vim74/runtime/doc/cmdline.txt       2014-06-01 00:42:51.080872353 +0000
++++ vim74/runtime/doc/cmdline.txt       2014-07-21 23:33:13.640201769 +0000
 @@ -1,4 +1,4 @@
 -*cmdline.txt*   For Vim version 7.4.  Last change: 2013 Mar 16
@@ -18713 +18853 @@
 diff -Naur vim74.orig/runtime/doc/develop.txt vim74/runtime/doc/develop.txt
 --- vim74.orig/runtime/doc/develop.txt  2013-08-10 11:24:52.000000000 +0000
-+++ vim74/runtime/doc/develop.txt       2014-06-01 00:42:51.124205576 +0000
++++ vim74/runtime/doc/develop.txt       2014-07-21 23:33:13.676868340 +0000
 @@ -1,4 +1,4 @@
 -*develop.txt*   For Vim version 7.4.  Last change: 2013 Apr 27
@@ -18730 +18870 @@
 diff -Naur vim74.orig/runtime/doc/diff.txt vim74/runtime/doc/diff.txt
 --- vim74.orig/runtime/doc/diff.txt     2013-08-10 11:24:52.000000000 +0000
-+++ vim74/runtime/doc/diff.txt  2014-06-01 00:42:51.130872226 +0000
++++ vim74/runtime/doc/diff.txt  2014-07-21 23:33:13.686868314 +0000
 @@ -1,4 +1,4 @@
 -*diff.txt*      For Vim version 7.4.  Last change: 2013 Jul 07
@@ -18765 +18905 @@
 diff -Naur vim74.orig/runtime/doc/digraph.txt vim74/runtime/doc/digraph.txt
 --- vim74.orig/runtime/doc/digraph.txt  2013-08-10 11:24:52.000000000 +0000
-+++ vim74/runtime/doc/digraph.txt       2014-06-01 00:42:51.154205500 +0000
++++ vim74/runtime/doc/digraph.txt       2014-07-21 23:33:13.713534911 +0000
 @@ -1,4 +1,4 @@
 -*digraph.txt*   For Vim version 7.4.  Last change: 2011 Jan 15
-+*digraph.txt*   For Vim version 7.4.  Last change: 2014 Apr 17
++*digraph.txt*   For Vim version 7.4.  Last change: 2014 Jun 19
  
  
@@ -18781 +18921 @@
         Percent sign            %       Greek/Cyrillic special
         Plus                    +       smalls: Arabic, capitals: Hebrew
-@@ -1077,7 +1077,7 @@
+@@ -170,6 +170,11 @@
+ used for the euro sign, while both of them are the character 164, 0xa4.  For
+ compatibility with zsh Eu can also be used for the euro sign.
+ 
++ROUBLE
++
++The rouble sign was added in 2014 as 0x20bd.  Vim supports the digraphs =R and
++=P for this.  Note that R= and P= are other characters.
++
+                                                        *digraph-table*
+ char  digraph  hex     dec     official name ~
+ ^@     NU      0x00      0     NULL (NUL)
+@@ -966,6 +971,8 @@
+ ₧    Pt      20A7    8359    PESETA SIGN
+ ₩    W=      20A9    8361    WON SIGN
+ €    Eu      20AC    8364    EURO SIGN
++ₜ    =R      20BD    8381    ROUBLE SIGN
++ₜ    =P      20BD    8381    ROUBLE SIGN
+ ℃    oC      2103    8451    DEGREE CELSIUS
+ â„
+        co      2105    8453    CARE OF
+ ℉    oF      2109    8457    DEGREE FAHRENHEIT
+@@ -1077,7 +1084,7 @@
  ⊥    -T      22A5    8869    UP TACK
  â‹
@@ -18793 +18955 @@
 diff -Naur vim74.orig/runtime/doc/editing.txt vim74/runtime/doc/editing.txt
 --- vim74.orig/runtime/doc/editing.txt  2013-08-10 11:24:53.000000000 +0000
-+++ vim74/runtime/doc/editing.txt       2014-06-01 00:42:51.197538723 +0000
++++ vim74/runtime/doc/editing.txt       2014-07-21 23:33:13.746868157 +0000
 @@ -1,4 +1,4 @@
 -*editing.txt*   For Vim version 7.4.  Last change: 2013 Aug 03
-+*editing.txt*   For Vim version 7.4.  Last change: 2014 May 02
++*editing.txt*   For Vim version 7.4.  Last change: 2014 Jul 19
  
  
@@ -18808 +18970 @@
                                                         *:keepalt* *:keepa*
  :keepalt {cmd}         Execute {cmd} while keeping the current alternate file
-@@ -1468,14 +1469,15 @@
+@@ -1361,6 +1362,11 @@
+ {only available when compiled with the |+cryptv| feature}  *E833*
+ 
+ The text in the swap file and the undo file is also encrypted.  *E843*
++However, this is done block-by-block and may reduce the time needed to crack a
++password.  You can disable the swap file, but then a crash will cause you to
++lose your work.  The undo file can be disabled without much disadvantage. >
++       :set noundofile
++       :noswapfile edit secrets
+ 
+ Note: The text in memory is not encrypted.  A system administrator may be able
+ to see your text while you are editing it.  When filtering text with
+@@ -1468,14 +1474,15 @@
  ==============================================================================
  10. Timestamps                                 *timestamp* *timestamps*
@@ -18834 +19008 @@
 diff -Naur vim74.orig/runtime/doc/eval.txt vim74/runtime/doc/eval.txt
 --- vim74.orig/runtime/doc/eval.txt     2013-08-10 11:24:53.000000000 +0000
-+++ vim74/runtime/doc/eval.txt  2014-06-01 00:42:51.230871971 +0000
++++ vim74/runtime/doc/eval.txt  2014-07-21 23:33:13.853534545 +0000
 @@ -1,4 +1,4 @@
 -*eval.txt*     For Vim version 7.4.  Last change: 2013 Aug 03
-+*eval.txt*     For Vim version 7.4.  Last change: 2014 May 07
++*eval.txt*     For Vim version 7.4.  Last change: 2014 Jul 19
  
  
@@ -19007 +19181 @@
  has( {feature})                        Number  TRUE if feature {feature} supported
  has_key( {dict}, {key})                Number  TRUE if {dict} has entry {key}
-@@ -1968,7 +1994,8 @@
+@@ -1861,6 +1887,8 @@
+                                Number  position where {pat} matches in {expr}
+ matchadd( {group}, {pattern}[, {priority}[, {id}]])
+                                Number  highlight {pattern} with {group}
++matchaddpos( {group}, {list}[, {priority}[, {id}]])
++                               Number  highlight positions with {group}
+ matcharg( {nr})                        List    arguments of |:match|
+ matchdelete( {id})             Number  delete match identified by {id}
+ matchend( {expr}, {pat}[, {start}[, {count}]])
+@@ -1968,7 +1996,8 @@
                                 Number  last index of {needle} in {haystack}
  strtrans( {expr})              String  translate string to make it printable
@@ -19017 +19200 @@
                                 String  all {pat} in {expr} replaced with {sub}
  synID( {lnum}, {col}, {trans}) Number  syntax ID at {lnum} and {col}
-@@ -1978,6 +2005,7 @@
+@@ -1978,6 +2007,7 @@
  synconcealed( {lnum}, {col})   List    info about concealing
  synstack( {lnum}, {col})       List    stack of syntax IDs at {lnum} and {col}
@@ -19025 +19208 @@
  tabpagenr( [{arg}])            Number  number of current or last tab page
  tabpagewinnr( {tabarg}[, {arg}])
-@@ -1995,6 +2023,8 @@
+@@ -1995,6 +2025,8 @@
  type( {name})                  Number  type of variable {name}
  undofile( {name})              String  undo file name for {name}
@@ -19034 +19217 @@
  virtcol( {expr})               Number  screen column of cursor or mark
  visualmode( [expr])            String  last visual mode used
-@@ -2076,6 +2106,18 @@
+@@ -2076,6 +2108,18 @@
  argidx()       The result is the current index in the argument list.  0 is
                 the first file.  argc() - 1 is the last one.  See |arglist|.
@@ -19053 +19236 @@
  argv([{nr}])   The result is the {nr}th file in the argument list of the
                 current window.  See |arglist|.  "argv(0)" is the first one.
-@@ -2260,7 +2302,10 @@
+@@ -2260,7 +2304,10 @@
                 {expr}.  Use zero for the first character, it returns zero.
                 This function is only useful when there are multibyte
@@ -19065 +19248 @@
                         echo matchstr(str, ".", byteidx(str, 3))
  <              will display the fourth character.  Another way to do the
-@@ -2269,7 +2314,20 @@
+@@ -2269,7 +2316,20 @@
                         echo strpart(s, 0, byteidx(s, 1))
  <              If there are less than {nr} characters -1 is returned.
@@ -19087 +19270 @@
  call({func}, {arglist} [, {dict}])                     *call()* *E699*
                 Call function {func} with the items in |List| {arglist} as
-@@ -2544,9 +2602,14 @@
+@@ -2544,9 +2604,14 @@
  cursor({list})
                 Positions the cursor at the column (byte count) {col} in the
@@ -19098 +19281 @@
 +                       [{lnum}, {col}, {off}]
 +                       [{lnum}, {col}, {off}, {curswant}]
-+               This is like the return value of |getpos()| or |getcurpos|,
++               This is like the return value of |getpos()| or |getcurpos()|,
 +               but without the first item.
 +
@@ -19104 +19287 @@
                 If {lnum} is greater than the number of lines in the buffer,
                 the cursor will be positioned at the last line in the buffer.
-@@ -2555,6 +2618,8 @@
+@@ -2555,6 +2620,8 @@
                 the cursor will be positioned at the last character in the
                 line.
@@ -19113 +19296 @@
                 screen columns from the start of the character.  E.g., a
                 position within a <Tab> or after the last character.
-@@ -2671,6 +2736,15 @@
+@@ -2671,6 +2738,15 @@
                         0       does not exist
                         -1      not implemented on this system
@@ -19129 +19312 @@
  exists({expr}) The result is a Number, which is non-zero if {expr} is
                 defined, zero otherwise.  The {expr} argument is a string,
-@@ -2683,7 +2757,8 @@
+@@ -2683,7 +2759,8 @@
                                         string)
                         *funcname       built-in function (see |functions|)
@@ -19139 +19322 @@
                                         |internal-variables|).  Also works
                                         for |curly-braces-names|, |Dictionary|
-@@ -2789,7 +2864,7 @@
+@@ -2789,7 +2866,7 @@
                         <afile>         autocmd file name
                         <abuf>          autocmd buffer number (as a String!)
@@ -19148 +19331 @@
                         <cword>         word under the cursor
                         <cWORD>         WORD under the cursor
-@@ -3175,7 +3250,7 @@
+@@ -3175,7 +3252,7 @@
                 If [expr] is 1, only check if a character is available, it is
                         not consumed.  Return zero if no character available.
@@ -19157 +19340 @@
                 result is a number.  Use nr2char() to convert it to a String.
                 Otherwise a String is returned with the encoded character.
-@@ -3185,7 +3260,7 @@
+@@ -3185,7 +3262,11 @@
                 String when a modifier (shift, control, alt) was used that is
                 not included in the character.
  
 -               When {expr} is 1 only the first byte is returned.  For a
++               When [expr] is 0 and Esc is typed, there will be a short delay
++               while Vim waits to see if this is the start of an escape
++               sequence.
++
 +               When [expr] is 1 only the first byte is returned.  For a
                 one-byte character it is the character itself as a number.
                 Use nr2char() to convert it to a String.
  
-@@ -3268,6 +3343,17 @@
+@@ -3268,6 +3349,17 @@
                 Returns an empty string otherwise.
                 Also see |getcmdpos()|, |setcmdpos()| and |getcmdline()|.
@@ -19184 +19371 @@
  getcwd()       The result is a String, which is the name of the current
                 working directory.
-@@ -3417,7 +3503,7 @@
+@@ -3389,6 +3481,34 @@
+                        'pattern': 'FIXME', 'priority': 10, 'id': 2}] >
+                        :unlet m
+ <
++                                                       *getpid()*
++getpid()       Return a Number which is the process ID of the Vim process.
++               On Unix and MS-Windows this is a unique number, until Vim
++               exits.  On MS-DOS it's always zero.
++
++                                                       *getpos()*
++getpos({expr}) Get the position for {expr}.  For possible values of {expr}
++               see |line()|.  For getting the cursor position see
++               |getcurpos()|.
++               The result is a |List| with four numbers:
++                   [bufnum, lnum, col, off]
++               "bufnum" is zero, unless a mark like '0 or 'A is used, then it
++               is the buffer number of the mark.
++               "lnum" and "col" are the position in the buffer.  The first
++               column is 1.
++               The "off" number is zero, unless 'virtualedit' is used.  Then
++               it is the offset in screen columns from the start of the
++               character.  E.g., a position within a <Tab> or after the last
++               character.
++               Note that for '< and '> Visual mode matters: when it is "V"
++               (visual line mode) the column of '< is zero and the column of
++               '> is a large number.
++               This can be used to save and restore the position of a mark: >
++                       let save_a_mark = getpos("'a")
++                       ...
++                       call setpos(''a', save_a_mark
++<              Also see |getcurpos()| and |setpos()|.
++
+ 
+ getqflist()                                            *getqflist()*
+                Returns a list with all the current quickfix errors.  Each
+@@ -3417,7 +3537,7 @@
                         :endfor
  
@@ -19193 +19415 @@
                 {regname}.  Example: >
                         :let cliptext = getreg('*')
-@@ -3426,6 +3512,11 @@
+@@ -3426,6 +3546,11 @@
                 getreg('=', 1) returns the expression itself, so that it can
                 be restored with |setreg()|.  For other registers the extra
@@ -19205 +19427 @@
  
  
-@@ -3435,7 +3526,7 @@
+@@ -3435,7 +3560,7 @@
                     "v"                 for |characterwise| text
                     "V"                 for |linewise| text
@@ -19214 +19436 @@
                 If {regname} is not specified, |v:register| is used.
  
-@@ -3513,11 +3604,12 @@
+@@ -3513,11 +3638,12 @@
                 See |expand()| for expanding special Vim variables.  See
                 |system()| for getting the raw output of an external command.
@@ -19229 +19451 @@
                 |glob()|.  A path separator is inserted when needed.
                 To add a comma inside a directory name escape it with a
-@@ -3525,11 +3617,19 @@
+@@ -3525,11 +3651,19 @@
                 trailing backslash, remove it if you put a comma after it.
                 If the expansion fails for one of the directories, there is no
@@ -19250 +19472 @@
                 For example, to find all "README.txt" files in the directories
                 in 'runtimepath' and below: >
-@@ -4109,6 +4209,8 @@
+@@ -4109,6 +4243,8 @@
                                      (|mapmode-ic|)
                   "sid"      The script local ID, used for <sid> mappings
@@ -19259 +19481 @@
                 The mappings local to the current buffer are checked first,
                 then the global mappings.
-@@ -4210,6 +4312,9 @@
+@@ -4210,6 +4346,9 @@
                 "match").  It will be highlighted with {group}.  Returns an
                 identification number (ID), which can be used to delete the
@@ -19269 +19491 @@
                 The optional {priority} argument assigns a priority to the
                 match.  A match with a high priority will have its
-@@ -4408,7 +4513,8 @@
- 
-                                                        *getpos()*
- getpos({expr}) Get the position for {expr}.  For possible values of {expr}
+@@ -4243,6 +4382,41 @@
+                available from |getmatches()|.  All matches can be deleted in
+                one operation by |clearmatches()|.
+ 
++matchaddpos({group}, {pos}[, {priority}[, {id}]])              *matchaddpos()*
++               Same as |matchadd()|, but requires a list of positions {pos}
++               instead of a pattern. This command is faster than |matchadd()|
++               because it does not require to handle regular expressions and
++               sets buffer line boundaries to redraw screen. It is supposed
++               to be used when fast match additions and deletions are
++               required, for example to highlight matching parentheses.
++
++               The list {pos} can contain one of these items:
++               - A number.  This whole line will be highlighted.  The first
++                 line has number 1.
++               - A list with one number, e.g., [23]. The whole line with this
++                 number will be highlighted.
++               - A list with two numbers, e.g., [23, 11]. The first number is
++                 the line number, the second one is the column number (first
++                 column is 1, the value must correspond to the byte index as
++                 |col()| would return).  The character at this position will
++                 be highlighted.
++               - A list with three numbers, e.g., [23, 11, 3]. As above, but
++                 the third number gives the length of the highlight in bytes.
++               
++               The maximum number of positions is 8.
++
++               Example: >
++                       :highlight MyGroup ctermbg=green guibg=green
++                       :let m = matchaddpos("MyGroup", [[23, 24], 34])
++<              Deletion of the pattern: >
++                       :call matchdelete(m)
++
++<              Matches added by |matchaddpos()| are returned by
++               |getmatches()| with an entry "pos1", "pos2", etc., with the
++               value a list like the {pos} item.
++               These matches cannot be set via |setmatches()|, however they
++               can still be deleted by |clearmatches()|.
++
+ matcharg({nr})                                                 *matcharg()*
+                Selects the {nr} match item, as set with a |:match|,
+                |:2match| or |:3match| command.
+@@ -4401,30 +4575,6 @@
+                characters.  nr2char(0) is a real NUL and terminates the
+                string, thus results in an empty string.
+ 
+-                                                       *getpid()*
+-getpid()       Return a Number which is the process ID of the Vim process.
+-               On Unix and MS-Windows this is a unique number, until Vim
+-               exits.  On MS-DOS it's always zero.
+-
+-                                                       *getpos()*
+-getpos({expr}) Get the position for {expr}.  For possible values of {expr}
 -               see |line()|.
-+               see |line()|.  For getting the cursor position see
-+               |getcurpos()|.
-                The result is a |List| with four numbers:
-                    [bufnum, lnum, col, off]
-                "bufnum" is zero, unless a mark like '0 or 'A is used, then it
-@@ -4419,11 +4525,14 @@
-                it is the offset in screen columns from the start of the
-                character.  E.g., a position within a <Tab> or after the last
-                character.
+-               The result is a |List| with four numbers:
+-                   [bufnum, lnum, col, off]
+-               "bufnum" is zero, unless a mark like '0 or 'A is used, then it
+-               is the buffer number of the mark.
+-               "lnum" and "col" are the position in the buffer.  The first
+-               column is 1.
+-               The "off" number is zero, unless 'virtualedit' is used.  Then
+-               it is the offset in screen columns from the start of the
+-               character.  E.g., a position within a <Tab> or after the last
+-               character.
 -               This can be used to save and restore the cursor position: >
 -                       let save_cursor = getpos(".")
@@ -19288 +19560 @@
 -                       call setpos('.', save_cursor)
 -<              Also see |setpos()|.
-+               Note that for '< and '> Visual mode matters: when it is "V"
-+               (visual line mode) the column of '< is zero and the column of
-+               '> is a large number.
-+               This can be used to save and restore the position of a mark: >
-+                       let save_a_mark = getpos("'a")
-+                       ...
-+                       call setpos(''a', save_a_mark
-+<              Also see |getcurpos()| and |setpos()|.
- 
+-
  or({expr}, {expr})                                     *or()*
                 Bitwise OR on the two arguments.  The arguments are converted
-@@ -5223,8 +5332,9 @@
+                to a number.  A List, Dict or Float argument causes an error.
+@@ -5223,8 +5373,9 @@
                         .       the cursor
                         'x      mark x
@@ -19310 +19575 @@
                 "bufnum" is the buffer number.  Zero can be used for the
                 current buffer.  Setting the cursor is only possible for
-@@ -5242,13 +5352,26 @@
+@@ -5242,13 +5393,26 @@
                 character.  E.g., a position within a <Tab> or after the last
                 character.
@@ -19339 +19604 @@
  
  setqflist({list} [, {action}])                         *setqflist()*
-@@ -5300,6 +5423,8 @@
+@@ -5300,6 +5464,8 @@
                                                         *setreg()*
  setreg({regname}, {value} [,{options}])
@@ -19348 +19613 @@
                 then the value is appended.
                 {options} can also contain a register type specification:
-@@ -5312,10 +5437,15 @@
+@@ -5312,10 +5478,15 @@
                 in the longest line (counting a <Tab> as 1 character).
  
@@ -19368 +19633 @@
                 Examples: >
                         :call setreg(v:register, @*)
-@@ -5323,8 +5453,11 @@
+@@ -5323,8 +5494,11 @@
                         :call setreg('a', "1\n2\n3", 'b5')
  
@@ -19382 +19647 @@
                             ....
                         :call setreg('a', var_a, var_amode)
-@@ -5390,6 +5523,7 @@
+@@ -5390,6 +5564,7 @@
  <              This results in a directory listing for the file under the
                 cursor.  Example of use with |system()|: >
@@ -19390 +19655 @@
  
  shiftwidth()                                           *shiftwidth()*
-@@ -5449,20 +5583,26 @@
+@@ -5449,20 +5624,40 @@
  
  
@@ -19400 +19665 @@
 +               If you want a list to remain unmodified make a copy first: >
                         :let sortedlist = sort(copy(mylist))
- <              Uses the string representation of each item to sort on.
-                Numbers sort after Strings, |Lists| after Numbers.
-                For sorting text in the current buffer use |:sort|.
-+
-                When {func} is given and it is one then case is ignored.
+-<              Uses the string representation of each item to sort on.
+-               Numbers sort after Strings, |Lists| after Numbers.
+-               For sorting text in the current buffer use |:sort|.
+-               When {func} is given and it is one then case is ignored.
 -               {dict} is for functions with the "dict" attribute.  It will be
 -               used to set the local variable "self". |Dictionary-function|
++
++<              When {func} is omitted, is empty or zero, then sort() uses the
++               string representation of each item to sort on.  Numbers sort
++               after Strings, |Lists| after Numbers.  For sorting text in the
++               current buffer use |:sort|.
++
++               When {func} is given and it is is '1' or 'i' then case is
++               ignored.
++               
++               When {func} is given and it is 'n' then all items will be
++               sorted numerical (Implementation detail: This uses the
++               strtod() function to parse numbers, Strings, Lists, Dicts and
++               Funcrefs will be considered as being 0).
++
                 When {func} is a |Funcref| or a function name, this function
                 is called to compare items.  The function is invoked with two
@@ -19416 +19694 @@
 +               used to set the local variable "self". |Dictionary-function|
 +
++               The sort is stable, items which compare equal (as number or as
++               string) will keep their relative position. E.g., when sorting
++               on numbers, text strings will sort next to each other, in the
++               same order as they were originally.
++
 +               Also see |uniq()|.
 +
@@ -19421 +19704 @@
                         func MyCompare(i1, i2)
                            return a:i1 == a:i2 ? 0 : a:i1 > a:i2 ? 1 : -1
-@@ -5604,7 +5744,7 @@
+@@ -5604,7 +5799,7 @@
  
  strdisplaywidth({expr}[, {col}])                       *strdisplaywidth()*
@@ -19430 +19713 @@
                 screen column where to start.  This matters for Tab
                 characters.
-@@ -5729,12 +5869,23 @@
+@@ -5729,12 +5924,23 @@
                 Ambiguous, this function's return value depends on 'ambiwidth'.
                 Also see |strlen()|, |strdisplaywidth()| and |strchars()|.
@@ -19455 +19738 @@
                         :s/\d\+/\=submatch(0) + 1/
  <              This finds the first number in the line and adds one to it.
-@@ -5867,19 +6018,29 @@
+@@ -5867,19 +6073,29 @@
                 valid positions.
  
@@ -19494 +19777 @@
  <              To make the result more system-independent, the shell output
                 is filtered to replace <CR> with <NL> for Macintosh, and
-@@ -5906,6 +6067,16 @@
+@@ -5906,6 +6122,16 @@
                 Use |:checktime| to force a check.
  
@@ -19511 +19794 @@
                 The result is a |List|, where each item is the number of the
                 buffer associated with each window in the current tab page.
-@@ -5928,7 +6099,7 @@
+@@ -5928,7 +6154,7 @@
                 The number can be used with the |:tab| command.
  
@@ -19520 +19803 @@
                 {tabarg} specifies the number of tab page to be used.
                 {arg} is used like with |winnr()|:
-@@ -6128,6 +6299,14 @@
+@@ -6128,6 +6354,14 @@
                                 blocks.  Each item may again have an "alt"
                                 item.
@@ -19535 +19818 @@
                 Return a |List| with all the values of {dict}.  The |List| is
                 in arbitrary order.
-@@ -6257,6 +6436,16 @@
+@@ -6257,6 +6491,16 @@
  winrestview({dict})
                 Uses the |Dictionary| returned by |winsaveview()| to restore
@@ -19552 +19835 @@
                 If the window size changed the result won't be the same.
  
-@@ -6271,7 +6460,9 @@
-                not opened when moving around.
+@@ -6268,10 +6512,12 @@
+                buffer and you want to go back to the original view.
+                This does not save fold information.  Use the 'foldenable'
+                option to temporarily switch off folding, so that folds are
+-               not opened when moving around.
++               not opened when moving around. This may have side effects.
                 The return value includes:
                         lnum            cursor line number
@@ -19563 +19850 @@
                         curswant        column for vertical movement
                         topline         first line in the window
-@@ -6330,13 +6521,24 @@
+@@ -6322,7 +6568,7 @@
+ 
+ 
+                                                        *feature-list*
+-There are three types of features:
++There are four types of features:
+ 1.  Features that are only supported when they have been enabled when Vim
+     was compiled |+feature-list|.  Example: >
+        :if has("cindent")
+@@ -6330,13 +6576,24 @@
      Example: >
         :if has("gui_running")
@@ -19592 +19888 @@
  amiga                  Amiga version of Vim.
  arabic                 Compiled with Arabic support |Arabic|.
-@@ -6503,7 +6705,9 @@
+@@ -6407,8 +6664,8 @@
+ keymap                 Compiled with 'keymap' support.
+ langmap                        Compiled with 'langmap' support.
+ libcall                        Compiled with |libcall()| support.
+-linebreak              Compiled with 'linebreak', 'breakat' and 'showbreak'
+-                       support.
++linebreak              Compiled with 'linebreak', 'breakat', 'showbreak' and
++                       'breakindent' support.
+ lispindent             Compiled with support for lisp indenting.
+ listcmds               Compiled with commands for the buffer list |:files|
+                        and the argument list |arglist|.
+@@ -6503,7 +6760,9 @@
  writebackup            Compiled with 'writebackup' default on.
  xfontset               Compiled with X fontset support |xfontset|.
@@ -19603 +19910 @@
  xsmp_interact          Compiled with interactive X session management support.
  xterm_clipboard                Compiled with support for xterm clipboard.
-@@ -6553,6 +6757,8 @@
+@@ -6553,6 +6812,8 @@
  and autocommands defined in the script.  It is also possible to call the
  function from a mapping defined in the script, but then |<SID>| must be used
@@ -19612 +19919 @@
                                         *:fu* *:function* *E128* *E129* *E123*
  :fu[nction]            List all functions and their arguments.
-@@ -6576,11 +6782,15 @@
+@@ -6576,11 +6837,15 @@
  <
  See |:verbose-cmd| for more information.
@@ -19630 +19937 @@
                         {name} can also be a |Dictionary| entry that is a
                         |Funcref|: >
-@@ -6599,7 +6809,7 @@
+@@ -6599,7 +6864,7 @@
  
                         For the {arguments} see |function-argument|.
@@ -19639 +19946 @@
                         expected to take care of a range itself.  The range is
                         passed as "a:firstline" and "a:lastline".  If [range]
-@@ -6608,10 +6818,10 @@
+@@ -6608,10 +6873,10 @@
                         of each line.  See |function-range-example|.
                         The cursor is still moved to the first line of the
@@ -19652 +19959 @@
                         be invoked through an entry in a |Dictionary|.  The
                         local variable "self" will then be set to the
-@@ -7273,6 +7483,8 @@
+@@ -7273,6 +7538,8 @@
                         {pattern}, so long as it does not have a special
                         meaning (e.g., '|' or '"') and doesn't occur inside
@@ -19661 +19968 @@
                         an error message because it may vary in different
                         locales.
-@@ -7416,13 +7628,22 @@
+@@ -7416,13 +7683,22 @@
                         for Vim commands, |shellescape()| for |:!| commands.
                         Examples: >
@@ -19691 +19998 @@
 diff -Naur vim74.orig/runtime/doc/filetype.txt vim74/runtime/doc/filetype.txt
 --- vim74.orig/runtime/doc/filetype.txt 2013-08-10 11:24:53.000000000 +0000
-+++ vim74/runtime/doc/filetype.txt      2014-06-01 00:42:51.354204990 +0000
++++ vim74/runtime/doc/filetype.txt      2014-07-21 23:33:13.986867531 +0000
 @@ -1,4 +1,4 @@
 -*filetype.txt*  For Vim version 7.4.  Last change: 2013 May 25
@@ -19729 +20036 @@
 diff -Naur vim74.orig/runtime/doc/fold.txt vim74/runtime/doc/fold.txt
 --- vim74.orig/runtime/doc/fold.txt     2013-08-10 11:24:53.000000000 +0000
-+++ vim74/runtime/doc/fold.txt  2014-06-01 00:42:51.370871615 +0000
++++ vim74/runtime/doc/fold.txt  2014-07-21 23:33:13.996867505 +0000
 @@ -1,4 +1,4 @@
 -*fold.txt*      For Vim version 7.4.  Last change: 2010 May 13
@@ -19752 +20059 @@
 diff -Naur vim74.orig/runtime/doc/gui.txt vim74/runtime/doc/gui.txt
 --- vim74.orig/runtime/doc/gui.txt      2013-08-10 11:24:53.000000000 +0000
-+++ vim74/runtime/doc/gui.txt   2014-06-01 00:42:51.410871513 +0000
++++ vim74/runtime/doc/gui.txt   2014-07-21 23:33:14.040200725 +0000
 @@ -1,4 +1,4 @@
 -*gui.txt*       For Vim version 7.4.  Last change: 2013 Jun 12
@@ -19782 +20089 @@
 diff -Naur vim74.orig/runtime/doc/gui_x11.txt vim74/runtime/doc/gui_x11.txt
 --- vim74.orig/runtime/doc/gui_x11.txt  2013-08-10 11:24:54.000000000 +0000
-+++ vim74/runtime/doc/gui_x11.txt       2014-06-01 00:42:51.460871386 +0000
++++ vim74/runtime/doc/gui_x11.txt       2014-07-21 23:33:14.100200568 +0000
 @@ -1,4 +1,4 @@
 -*gui_x11.txt*   For Vim version 7.4.  Last change: 2011 Sep 14
@@ -19800 +20107 @@
 diff -Naur vim74.orig/runtime/doc/if_lua.txt vim74/runtime/doc/if_lua.txt
 --- vim74.orig/runtime/doc/if_lua.txt   2013-08-10 11:24:55.000000000 +0000
-+++ vim74/runtime/doc/if_lua.txt        2014-06-01 00:42:51.564204456 +0000
++++ vim74/runtime/doc/if_lua.txt        2014-07-21 23:33:14.180200360 +0000
 @@ -1,4 +1,4 @@
 -*if_lua.txt*    For Vim version 7.4.  Last change: 2012 Jun 29
@@ -19818 +20125 @@
 diff -Naur vim74.orig/runtime/doc/if_perl.txt vim74/runtime/doc/if_perl.txt
 --- vim74.orig/runtime/doc/if_perl.txt  2013-08-10 11:24:55.000000000 +0000
-+++ vim74/runtime/doc/if_perl.txt       2014-06-01 00:42:51.620870978 +0000
++++ vim74/runtime/doc/if_perl.txt       2014-07-21 23:33:14.236866878 +0000
 @@ -1,4 +1,4 @@
 -*if_perl.txt*   For Vim version 7.4.  Last change: 2012 Oct 25
@@ -19827 +20134 @@
 diff -Naur vim74.orig/runtime/doc/indent.txt vim74/runtime/doc/indent.txt
 --- vim74.orig/runtime/doc/indent.txt   2013-08-10 11:24:56.000000000 +0000
-+++ vim74/runtime/doc/indent.txt        2014-06-01 00:42:51.750870647 +0000
++++ vim74/runtime/doc/indent.txt        2014-07-21 23:33:14.356866565 +0000
 @@ -1,4 +1,4 @@
 -*indent.txt*    For Vim version 7.4.  Last change: 2013 Aug 03
@@ -19972 +20279 @@
 diff -Naur vim74.orig/runtime/doc/index.txt vim74/runtime/doc/index.txt
 --- vim74.orig/runtime/doc/index.txt    2013-08-10 11:24:56.000000000 +0000
-+++ vim74/runtime/doc/index.txt 2014-06-01 00:42:51.770870596 +0000
++++ vim74/runtime/doc/index.txt 2014-07-21 23:33:14.376866513 +0000
 @@ -1,4 +1,4 @@
 -*index.txt*     For Vim version 7.4.  Last change: 2013 Jul 17
@@ -20030 +20337 @@
  |:nunmap|      :nun[map]       like ":unmap" but for Normal mode
  |:nunmenu|     :nunme[nu]      remove menu for Normal mode
+diff -Naur vim74.orig/runtime/doc/insert.txt vim74/runtime/doc/insert.txt
+--- vim74.orig/runtime/doc/insert.txt   2013-08-10 11:24:56.000000000 +0000
++++ vim74/runtime/doc/insert.txt        2014-07-21 23:33:14.403533110 +0000
+@@ -1,4 +1,4 @@
+-*insert.txt*    For Vim version 7.4.  Last change: 2013 Jul 12
++*insert.txt*    For Vim version 7.4.  Last change: 2014 Jul 06
+ 
+ 
+                  VIM REFERENCE MANUAL    by Bram Moolenaar
+@@ -1302,7 +1302,7 @@
+ XHTML                                                  *ft-xhtml-omni*
+ 
+ CTRL-X CTRL-O provides completion of various elements of (X)HTML files.  It is
+-designed to support writing of XHTML 1.0 Strict files but will also works for
++designed to support writing of XHTML 1.0 Strict files but will also work for
+ other versions of HTML. Features:
+ 
+ - after "<" complete tag name depending on context (no div suggestion inside
+diff -Naur vim74.orig/runtime/doc/intro.txt vim74/runtime/doc/intro.txt
+--- vim74.orig/runtime/doc/intro.txt    2013-08-10 11:24:56.000000000 +0000
++++ vim74/runtime/doc/intro.txt 2014-07-21 23:33:14.423533058 +0000
+@@ -1,4 +1,4 @@
+-*intro.txt*     For Vim version 7.4.  Last change: 2013 Jun 17
++*intro.txt*     For Vim version 7.4.  Last change: 2014 May 24
+ 
+ 
+                  VIM REFERENCE MANUAL    by Bram Moolenaar
+@@ -136,9 +136,10 @@
+ Bug reports:                           *bugs* *bug-reports* *bugreport.vim*
+ 
+ Send bug reports to: Vim Developers <vim_dev@vim.org>
+-This is a maillist, many people will see the message.  If you don't want that,
+-e.g. because it is a security issue, send it to <bugs@vim.org>, this only goes
+-to the Vim maintainer (that's Bram).
++This is a maillist, you need to become a member first and many people will see
++the message.  If you don't want that, e.g. because it is a security issue,
++send it to <bugs@vim.org>, this only goes to the Vim maintainer (that's Bram).
++
+ Please be brief; all the time that is spent on answering mail is subtracted
+ from the time that is spent on improving Vim!  Always give a reproducible
+ example and try to find out which settings or other things influence the
 diff -Naur vim74.orig/runtime/doc/map.txt vim74/runtime/doc/map.txt
 --- vim74.orig/runtime/doc/map.txt      2013-08-10 11:24:56.000000000 +0000
-+++ vim74/runtime/doc/map.txt   2014-06-01 00:42:51.837537093 +0000
++++ vim74/runtime/doc/map.txt   2014-07-21 23:33:14.446866330 +0000
 @@ -1,4 +1,4 @@
 -*map.txt*       For Vim version 7.4.  Last change: 2013 Aug 03
-+*map.txt*       For Vim version 7.4.  Last change: 2014 May 10
++*map.txt*       For Vim version 7.4.  Last change: 2014 Jun 02
  
  
                   VIM REFERENCE MANUAL    by Bram Moolenaar
+@@ -60,17 +60,17 @@
+                        {rhs}, is then further scanned for mappings.  This
+                        allows for nested and recursive use of mappings.
+ 
+-
+-:no[remap]  {lhs} {rhs}                |mapmode-nvo|           *:no*  *:noremap*
+-:nn[oremap] {lhs} {rhs}                |mapmode-n|             *:nn*  *:nnoremap*
+-:vn[oremap] {lhs} {rhs}                |mapmode-v|             *:vn*  *:vnoremap*
+-:xn[oremap] {lhs} {rhs}                |mapmode-x|             *:xn*  *:xnoremap*
+-:snor[emap] {lhs} {rhs}                |mapmode-s|             *:snor* *:snoremap*
+-:ono[remap] {lhs} {rhs}                |mapmode-o|             *:ono* *:onoremap*
+-:no[remap]! {lhs} {rhs}                |mapmode-ic|            *:no!* *:noremap!*
+-:ino[remap] {lhs} {rhs}                |mapmode-i|             *:ino* *:inoremap*
+-:ln[oremap] {lhs} {rhs}                |mapmode-l|             *:ln*  *:lnoremap*
+-:cno[remap] {lhs} {rhs}                |mapmode-c|             *:cno* *:cnoremap*
++                                               *:nore* *:norem*
++:no[remap]  {lhs} {rhs}                |mapmode-nvo|   *:no*  *:noremap* *:nor*
++:nn[oremap] {lhs} {rhs}                |mapmode-n|     *:nn*  *:nnoremap*
++:vn[oremap] {lhs} {rhs}                |mapmode-v|     *:vn*  *:vnoremap*
++:xn[oremap] {lhs} {rhs}                |mapmode-x|     *:xn*  *:xnoremap*
++:snor[emap] {lhs} {rhs}                |mapmode-s|     *:snor* *:snoremap*
++:ono[remap] {lhs} {rhs}                |mapmode-o|     *:ono* *:onoremap*
++:no[remap]! {lhs} {rhs}                |mapmode-ic|    *:no!* *:noremap!*
++:ino[remap] {lhs} {rhs}                |mapmode-i|     *:ino* *:inoremap*
++:ln[oremap] {lhs} {rhs}                |mapmode-l|     *:ln*  *:lnoremap*
++:cno[remap] {lhs} {rhs}                |mapmode-c|     *:cno* *:cnoremap*
+                        Map the key sequence {lhs} to {rhs} for the modes
+                        where the map command applies.  Disallow mapping of
+                        {rhs}, to avoid nested and recursive mappings.  Often
 @@ -306,9 +306,21 @@
  to type a count with a zero.
@@ -20056 +20433 @@
 +:lmap  :lnoremap :lunmap    Insert, Command-line, Lang-Arg
 +:cmap  :cnoremap :cunmap    Command-line
++
  
 -    commands:                                modes: ~
-+
 +    COMMANDS                                 MODES ~
                                        Normal  Visual+Select  Operator-pending ~
@@ -20099 +20476 @@
  To avoid mapping of the characters you type in insert or Command-line mode,
  type a CTRL-V first.  The mapping in Insert mode is disabled if the 'paste'
-@@ -1359,6 +1371,8 @@
+@@ -816,12 +828,10 @@
+          let &selection = "inclusive"
+          let reg_save = @@
+ 
+-         if a:0  " Invoked from Visual mode, use '< and '> marks.
+-           silent exe "normal! `<" . a:type . "`>y"
++         if a:0  " Invoked from Visual mode, use gv command.
++           silent exe "normal! gvy"
+          elseif a:type == 'line'
+            silent exe "normal! '[V']y"
+-         elseif a:type == 'block'
+-           silent exe "normal! `[\<C-V>`]y"
+          else
+            silent exe "normal! `[v`]y"
+          endif
+@@ -1359,6 +1369,8 @@
  In the cases of the -count and -register attributes, if the optional argument
  is supplied, it is removed from the argument list and is available to the
@@ -20110 +20502 @@
 diff -Naur vim74.orig/runtime/doc/motion.txt vim74/runtime/doc/motion.txt
 --- vim74.orig/runtime/doc/motion.txt   2013-08-10 11:24:57.000000000 +0000
-+++ vim74/runtime/doc/motion.txt        2014-06-01 00:42:51.920870214 +0000
++++ vim74/runtime/doc/motion.txt        2014-07-21 23:33:14.526866121 +0000
 @@ -1,4 +1,4 @@
 -*motion.txt*    For Vim version 7.4.  Last change: 2013 Jul 17
@@ -20128 +20520 @@
 diff -Naur vim74.orig/runtime/doc/options.txt vim74/runtime/doc/options.txt
 --- vim74.orig/runtime/doc/options.txt  2013-08-10 11:24:57.000000000 +0000
-+++ vim74/runtime/doc/options.txt       2014-06-01 00:42:51.970870087 +0000
++++ vim74/runtime/doc/options.txt       2014-07-21 23:33:14.600199263 +0000
 @@ -1,4 +1,4 @@
 -*options.txt*  For Vim version 7.4.  Last change: 2013 Jul 09
-+*options.txt*  For Vim version 7.4.  Last change: 2014 May 13
++*options.txt*  For Vim version 7.4.  Last change: 2014 Jun 26
  
  
@@ -20144 +20536 @@
                         global
                         {not in Vi}
-@@ -1884,8 +1884,8 @@
+@@ -1200,6 +1200,38 @@
+        break if 'linebreak' is on.  Only works for ASCII and also for 8-bit
+        characters when 'encoding' is an 8-bit encoding.
+ 
++                                               *'breakindent'* *'bri'*
++'breakindent' 'bri'    boolean (default off)
++                       local to window
++                       {not in Vi}
++                       {not available when compiled without the |+linebreak|
++                       feature}
++       Every wrapped line will continue visually indented (same amount of
++       space as the beginning of that line), thus preserving horizontal blocks
++       of text.
++
++                                               *'breakindentopt'* *'briopt'*
++'breakindentopt' 'briopt' string (default empty)
++                       local to window
++                       {not in Vi}
++                       {not available when compiled without the |+linebreak|
++                       feature}
++       Settings for 'breakindent'. It can consist of the following optional
++       items and must be separated by a comma:
++               min:{n}     Minimum text width that will be kept after
++                           applying 'breakindent', even if the resulting
++                           text should normally be narrower. This prevents
++                           text indented almost to the right window border
++                           occupying lot of vertical space when broken.
++               shift:{n}   After applying 'breakindent', the wrapped line's
++                           beginning will be shifted by the given number of
++                           characters.  It permits dynamic French paragraph
++                           indentation (negative) or emphasizing the line
++                           continuation (positive).
++               sbr         Display the 'showbreak' value before applying the 
++                           additional indent.
++       The default value for min is 20 and shift is 0.
++
+                                                *'browsedir'* *'bsdir'*
+ 'browsedir' 'bsdir'    string  (default: "last")
+                        global
+@@ -1884,8 +1916,8 @@
                         global
                         {not in Vi}
@@ -20155 +20586 @@
         Commas can be added for readability.
         To avoid problems with flags that are added in the future, use the
-@@ -2477,7 +2477,7 @@
+@@ -2477,7 +2509,7 @@
  
                                                 *'directory'* *'dir'*
@@ -20164 +20595 @@
                         global
         List of directory names for the swap file, separated with commas.
-@@ -4492,6 +4492,8 @@
+@@ -3920,12 +3952,13 @@
+        NOTE: This option is reset when 'compatible' is set.
+ 
+                                                *'history'* *'hi'*
+-'history' 'hi'         number  (Vim default: 20, Vi default: 0)
++'history' 'hi'         number  (Vim default: 50, Vi default: 0)
+                        global
+                        {not in Vi}
+        A history of ":" commands, and a history of previous search patterns
+-       are remembered.  This option decides how many entries may be stored in
++       is remembered.  This option decides how many entries may be stored in
+        each of these histories (see |cmdline-editing|).
++       The maximum value is 10000.
+        NOTE: This option is set to the Vi default value when 'compatible' is
+        set and to the Vim default value when 'compatible' is reset.
+ 
+@@ -4492,6 +4525,8 @@
         be able to execute Normal mode commands.
         This is the opposite of the 'keymap' option, where characters are
@@ -20174 +20621 @@
             :set langmap=ΑA,ΒB,ΚC,ΔD,ΕE,ΊF,ΓG,ΗH,ΙI,ΞJ,ΚK,ΛL,ΜM,ΝN,ΟO,Î P,QQ,ΡR,ΣS,΀T,ΘU,ΩV,WW,ΧX,Î¥Y,ΖZ,αa,βb,ψc,ÎŽd,εe,φf,γg,ηh,ιi,Οj,κk,λl,ÎŒm,Îœn,οo,πp,qq,ρr,σs,τt,Ξu,ωv,ςw,χx,Ï
 y,ζz
-@@ -4629,7 +4631,7 @@
+@@ -4572,12 +4607,13 @@
+                        {not in Vi}
+                        {not available when compiled without the |+linebreak|
+                        feature}
+-       If on Vim will wrap long lines at a character in 'breakat' rather
++       If on, Vim will wrap long lines at a character in 'breakat' rather
+        than at the last character that fits on the screen.  Unlike
+        'wrapmargin' and 'textwidth', this does not insert <EOL>s in the file,
+-       it only affects the way the file is displayed, not its contents.  The
+-       value of 'showbreak' is used to put in front of wrapped lines.
+-       This option is not used when the 'wrap' option is off or 'list' is on.
++       it only affects the way the file is displayed, not its contents.
++       If 'breakindent' is set, line is visually indented. Then, the value
++       of 'showbreak' is used to put in front of wrapped lines. This option
++       is not used when the 'wrap' option is off.
+        Note that <Tab> characters after an <EOL> are mostly not displayed
+        with the right amount of white space.
+ 
+@@ -4629,7 +4665,7 @@
  
                                                 *'lispwords'* *'lw'*
@@ -20183 +20648 @@
                         {not available when compiled without the |+lispindent|
                         feature}
-@@ -4757,8 +4759,9 @@
+@@ -4757,8 +4793,9 @@
                         global or local to buffer |global-local|
                         {not in Vi}
@@ -20195 +20660 @@
         about including spaces and backslashes.
         Note that a '|' must be escaped twice: once for ":set" and once for
-@@ -6251,6 +6254,9 @@
+@@ -6251,6 +6288,9 @@
           A     don't give the "ATTENTION" message when an existing swap file
                 is found.
@@ -20205 +20670 @@
         This gives you the opportunity to avoid that a change between buffers
         requires you to hit <Enter>, but still gives as useful a message as
-@@ -6555,6 +6561,9 @@
+@@ -6555,6 +6595,9 @@
         region by listing them: "en_us,en_ca" supports both US and Canadian
         English, but not words specific for Australia, New Zealand or Great
@@ -20215 +20680 @@
         As a special case the name of a .spl file can be given as-is.  The
         first "_xx" in the name is removed and used as the region name
-@@ -6615,6 +6624,10 @@
+@@ -6615,6 +6658,10 @@
                         top of the suggestion list with the internal methods.
                         Lines without a slash are ignored, use this for
@@ -20226 +20691 @@
  
         expr:{expr}     Evaluate expression {expr}.  Use a function to avoid
-@@ -6878,6 +6891,8 @@
+@@ -6878,6 +6925,8 @@
         immediately deleted.  When 'swapfile' is set, and 'updatecount' is
         non-zero, a swap file is immediately created.
@@ -20235 +20700 @@
         This option is used together with 'bufhidden' and 'buftype' to
         specify special kinds of buffers.   See |special-buffers|.
-@@ -7498,8 +7513,8 @@
+@@ -7498,8 +7547,8 @@
                                 "s"  = button state
                                 "c"  = column plus 33
@@ -20246 +20711 @@
                         mouse position while the mouse is dragged.  This works
                         much faster and more precise.  Your xterm must at
-@@ -7521,29 +7536,35 @@
+@@ -7521,29 +7570,35 @@
            pterm        QNX pterm mouse handling.
                                                         *urxvt-mouse*
@@ -20296 +20761 @@
  <
                                                 *'ttyscroll'* *'tsl'*
-@@ -7594,7 +7615,7 @@
+@@ -7594,7 +7649,7 @@
                                                 *'undolevels'* *'ul'*
  'undolevels' 'ul'      number  (default 100, 1000 for Unix, VMS,
@@ -20305 +20770 @@
         Maximum number of changes that can be undone.  Since undo information
         is kept in memory, higher numbers will cause more memory to be used
-@@ -7605,8 +7626,9 @@
+@@ -7605,8 +7660,9 @@
  <      But you can also get Vi compatibility by including the 'u' flag in
         'cpoptions', and still be able to use CTRL-R to repeat undo.
@@ -20319 +20784 @@
 diff -Naur vim74.orig/runtime/doc/os_vms.txt vim74/runtime/doc/os_vms.txt
 --- vim74.orig/runtime/doc/os_vms.txt   2013-08-10 11:24:59.000000000 +0000
-+++ vim74/runtime/doc/os_vms.txt        2014-06-01 00:42:52.130869680 +0000
++++ vim74/runtime/doc/os_vms.txt        2014-07-21 23:33:14.766865495 +0000
 @@ -1,4 +1,4 @@
 -*os_vms.txt*    For Vim version 7.4.  Last change: 2011 Aug 14
@@ -20360 +20825 @@
 diff -Naur vim74.orig/runtime/doc/os_win32.txt vim74/runtime/doc/os_win32.txt
 --- vim74.orig/runtime/doc/os_win32.txt 2013-08-10 11:24:59.000000000 +0000
-+++ vim74/runtime/doc/os_win32.txt      2014-06-01 00:42:52.144202979 +0000
++++ vim74/runtime/doc/os_win32.txt      2014-07-21 23:33:14.783532118 +0000
 @@ -93,7 +93,7 @@
  $PATH                                                  *win32-PATH*
@@ -20372 +20837 @@
 diff -Naur vim74.orig/runtime/doc/pattern.txt vim74/runtime/doc/pattern.txt
 --- vim74.orig/runtime/doc/pattern.txt  2013-08-10 11:24:59.000000000 +0000
-+++ vim74/runtime/doc/pattern.txt       2014-06-01 00:42:52.164202928 +0000
++++ vim74/runtime/doc/pattern.txt       2014-07-21 23:33:14.803532066 +0000
 @@ -1,4 +1,4 @@
 -*pattern.txt*   For Vim version 7.4.  Last change: 2013 Jul 06
-+*pattern.txt*   For Vim version 7.4.  Last change: 2014 May 13
++*pattern.txt*   For Vim version 7.4.  Last change: 2014 May 28
  
  
@@ -20423 +20888 @@
  When a composing character appears at the start of the pattern of after an
  item that doesn't include the composing character, a match is found at any
+@@ -1325,7 +1332,7 @@
+                patterns defined by both |matchadd()| and |:match|.
+ 
+                Highlighting matches using |:match| are limited to three
+-               matches (aside from |:match|, |:2match| and |:3match|are
++               matches (aside from |:match|, |:2match| and |:3match| are
+                available). |matchadd()| does not have this limitation and in
+                addition makes it possible to prioritize matches.
+ 
 diff -Naur vim74.orig/runtime/doc/pi_getscript.txt vim74/runtime/doc/pi_getscript.txt
 --- vim74.orig/runtime/doc/pi_getscript.txt     2013-08-10 11:24:59.000000000 +0000
-+++ vim74/runtime/doc/pi_getscript.txt  2014-06-01 00:42:52.197536177 +0000
++++ vim74/runtime/doc/pi_getscript.txt  2014-07-21 23:33:14.836865312 +0000
 @@ -1,4 +1,4 @@
 -*pi_getscript.txt*  For Vim version 7.4.  Last change: 2012 Apr 07
@@ -20445 +20919 @@
 diff -Naur vim74.orig/runtime/doc/pi_netrw.txt vim74/runtime/doc/pi_netrw.txt
 --- vim74.orig/runtime/doc/pi_netrw.txt 2013-08-10 11:24:59.000000000 +0000
-+++ vim74/runtime/doc/pi_netrw.txt      2014-06-01 00:42:52.234202750 +0000
++++ vim74/runtime/doc/pi_netrw.txt      2014-07-21 23:33:14.936865051 +0000
 @@ -1,4 +1,4 @@
 -*pi_netrw.txt*  For Vim version 7.4.  Last change: 2013 May 18
@@ -21598 +22072 @@
 diff -Naur vim74.orig/runtime/doc/pi_vimball.txt vim74/runtime/doc/pi_vimball.txt
 --- vim74.orig/runtime/doc/pi_vimball.txt       2013-08-10 11:25:00.000000000 +0000
-+++ vim74/runtime/doc/pi_vimball.txt    2014-06-01 00:42:52.307535896 +0000
++++ vim74/runtime/doc/pi_vimball.txt    2014-07-21 23:33:14.990198246 +0000
 @@ -188,7 +188,7 @@
                           * Changed silent! to sil! (shorter)
@@ -21610 +22084 @@
 diff -Naur vim74.orig/runtime/doc/quickfix.txt vim74/runtime/doc/quickfix.txt
 --- vim74.orig/runtime/doc/quickfix.txt 2013-08-10 11:25:00.000000000 +0000
-+++ vim74/runtime/doc/quickfix.txt      2014-06-01 00:42:52.350869119 +0000
++++ vim74/runtime/doc/quickfix.txt      2014-07-21 23:33:15.036864790 +0000
 @@ -1,4 +1,4 @@
 -*quickfix.txt*  For Vim version 7.4.  Last change: 2013 Aug 03
@@ -21690 +22164 @@
  You need to put the following in "vim-javac-filter" somewhere in your path
  (e.g., in ~/bin) and make it executable: >
+diff -Naur vim74.orig/runtime/doc/quickref.txt vim74/runtime/doc/quickref.txt
+--- vim74.orig/runtime/doc/quickref.txt 2013-08-10 11:25:00.000000000 +0000
++++ vim74/runtime/doc/quickref.txt      2014-07-21 23:33:15.056864738 +0000
+@@ -1,4 +1,4 @@
+-*quickref.txt*  For Vim version 7.4.  Last change: 2013 Jun 29
++*quickref.txt*  For Vim version 7.4.  Last change: 2014 Jun 25
+ 
+ 
+                  VIM REFERENCE MANUAL    by Bram Moolenaar
+@@ -624,6 +624,8 @@
+ 'bioskey'        'biosk'   MS-DOS: use bios calls for input characters
+ 'bomb'                     prepend a Byte Order Mark to the file
+ 'breakat'        'brk'     characters that may cause a line break
++'breakindent'    'bri'     wrapped line repeats indent 
++'breakindentopt'  'briopt'  settings for 'breakindent'
+ 'browsedir'      'bsdir'   which directory to start browsing in
+ 'bufhidden'      'bh'      what to do when buffer is no longer in window
+ 'buflisted'      'bl'      whether the buffer shows up in the buffer list
 diff -Naur vim74.orig/runtime/doc/recover.txt vim74/runtime/doc/recover.txt
 --- vim74.orig/runtime/doc/recover.txt  2013-08-10 11:25:00.000000000 +0000
-+++ vim74/runtime/doc/recover.txt       2014-06-01 00:42:52.410868967 +0000
++++ vim74/runtime/doc/recover.txt       2014-07-21 23:33:15.096864634 +0000
 @@ -1,4 +1,4 @@
 -*recover.txt*   For Vim version 7.4.  Last change: 2010 Jul 20
@@ -21717 +22209 @@
 diff -Naur vim74.orig/runtime/doc/repeat.txt vim74/runtime/doc/repeat.txt
 --- vim74.orig/runtime/doc/repeat.txt   2013-08-10 11:25:00.000000000 +0000
-+++ vim74/runtime/doc/repeat.txt        2014-06-01 00:42:52.434202241 +0000
++++ vim74/runtime/doc/repeat.txt        2014-07-21 23:33:15.120197906 +0000
 @@ -1,4 +1,4 @@
 -*repeat.txt*    For Vim version 7.4.  Last change: 2013 Jul 25
@@ -21771 +22263 @@
 diff -Naur vim74.orig/runtime/doc/sign.txt vim74/runtime/doc/sign.txt
 --- vim74.orig/runtime/doc/sign.txt     2013-08-10 11:25:01.000000000 +0000
-+++ vim74/runtime/doc/sign.txt  2014-06-01 00:42:52.494202088 +0000
++++ vim74/runtime/doc/sign.txt  2014-07-21 23:33:15.176864425 +0000
 @@ -1,4 +1,4 @@
 -*sign.txt*      For Vim version 7.4.  Last change: 2012 Jul 10
@@ -21797 +22289 @@
 diff -Naur vim74.orig/runtime/doc/spell.txt vim74/runtime/doc/spell.txt
 --- vim74.orig/runtime/doc/spell.txt    2013-08-10 11:25:01.000000000 +0000
-+++ vim74/runtime/doc/spell.txt 2014-06-01 00:42:52.504202062 +0000
++++ vim74/runtime/doc/spell.txt 2014-07-21 23:33:15.190197724 +0000
 @@ -1,4 +1,4 @@
 -*spell.txt*    For Vim version 7.4.  Last change: 2013 Jul 17
-+*spell.txt*    For Vim version 7.4.  Last change: 2013 Nov 12
++*spell.txt*    For Vim version 7.4.  Last change: 2014 Jul 02
  
  
@@ -21818 +22310 @@
  SPELL FILES                                            *spell-load*
  
+@@ -932,9 +939,10 @@
+ 
+ If you get an E763 warning that the word tables differ you need to update your
+ ".spl" spell files.  If you downloaded the files, get the latest version of
+-all spell files you use.  Otherwise generate the .spl file again with
+-|:mkspell|.  If you still get errors check the FOL, LOW and UPP lines in the
+-used .aff files.
++all spell files you use.  If you are only using one, e.g., German, then also
++download the recent English spell files.  Otherwise generate the .spl file
++again with |:mkspell|.  If you still get errors check the FOL, LOW and UPP
++lines in the used .aff files.
+ 
+ The XX.ascii.spl spell file generated with the "-ascii" argument will not
+ contain the table with characters, so that it can be combine with spell files
 diff -Naur vim74.orig/runtime/doc/starting.txt vim74/runtime/doc/starting.txt
 --- vim74.orig/runtime/doc/starting.txt 2013-08-10 11:25:01.000000000 +0000
-+++ vim74/runtime/doc/starting.txt      2014-06-01 00:42:52.540868636 +0000
++++ vim74/runtime/doc/starting.txt      2014-07-21 23:33:15.223530970 +0000
 @@ -1,4 +1,4 @@
 -*starting.txt*  For Vim version 7.4.  Last change: 2013 Jul 20
-+*starting.txt*  For Vim version 7.4.  Last change: 2014 Mar 29
++*starting.txt*  For Vim version 7.4.  Last change: 2014 Jul 09
  
  
                   VIM REFERENCE MANUAL    by Bram Moolenaar
-@@ -1276,8 +1276,10 @@
+@@ -167,7 +167,10 @@
+                                                        *-+/*
+ +/{pat}                The cursor will be positioned on the first line containing
+                "pat" in the first file being edited (see |pattern| for the
+-               available search patterns).
++               available search patterns).  The search starts at the cursor
++               position, which can be the first line or the cursor position
++               last used from |viminfo|. To force a search from the first
++               line use "+1 +/pat".
+ 
+ +{command}                                             *-+c* *-c*
+ -c {command}   {command} will be executed after the first file has been
+@@ -1276,8 +1279,10 @@
                         When [!] is included an existing file is overwritten.
                         When [file] is omitted or is a number from 1 to 9, a
@@ -21840 +22358 @@
                         |:loadview| to load this view again.
                         When [file] is the name of a file ('viewdir' is not
+@@ -1501,7 +1506,7 @@
+                        already set (registers, marks, |v:oldfiles|, etc.)
+                        will be overwritten   {not in Vi}
+ 
+-                                       *:wv* *:wviminfo* *E137* *E138* *E574*
++                               *:wv* *:wviminfo* *E137* *E138* *E574* *E886*
+ :wv[iminfo][!] [file]  Write to viminfo file [file] (default: see above).
+                        The information in the file is first read in to make
+                        a merge between old and new info.  When [!] is used,
 diff -Naur vim74.orig/runtime/doc/syntax.txt vim74/runtime/doc/syntax.txt
 --- vim74.orig/runtime/doc/syntax.txt   2013-08-10 11:25:01.000000000 +0000
-+++ vim74/runtime/doc/syntax.txt        2014-06-01 00:42:52.604201808 +0000
++++ vim74/runtime/doc/syntax.txt        2014-07-21 23:33:15.276864164 +0000
 @@ -1,4 +1,4 @@
 -*syntax.txt*   For Vim version 7.4.  Last change: 2013 Jul 05
-+*syntax.txt*   For Vim version 7.4.  Last change: 2014 Apr 05
++*syntax.txt*   For Vim version 7.4.  Last change: 2014 Jun 27
  
  
@@ -21904 +22431 @@
  
  Erlang is a functional programming language developed by Ericsson.  Files with
+@@ -1647,7 +1688,7 @@
+ HTML comments are rather special (see an HTML reference document for the
+ details), and the syntax coloring scheme will highlight all errors.
+ However, if you prefer to use the wrong style (starts with <!-- and
+-ends with --!>) you can define >
++ends with -->) you can define >
+        :let html_wrong_comments=1
+ 
+ JavaScript and Visual Basic embedded inside HTML documents are highlighted as
 @@ -1918,7 +1959,7 @@
  There are several implementations for LPC, we intend to support most widely
@@ -21913 +22449 @@
  
         :let lpc_pre_v22 = 1
+@@ -2238,7 +2279,7 @@
+ 
+        :let perl_include_pod = 0
+ 
+-The reduce the complexity of parsing (and increase performance) you can switch
++To reduce the complexity of parsing (and increase performance) you can switch
+ off two elements in the parsing of variable names and contents. >
+ 
+ To handle package references in variable and function names not differently
 @@ -3156,18 +3197,16 @@
  embedded script highlighting they wish to have. >
@@ -21944 +22489 @@
 diff -Naur vim74.orig/runtime/doc/tags vim74/runtime/doc/tags
 --- vim74.orig/runtime/doc/tags 2013-08-10 12:23:34.000000000 +0000
-+++ vim74/runtime/doc/tags      2014-06-01 00:42:52.630868407 +0000
++++ vim74/runtime/doc/tags      2014-07-21 23:33:15.336864008 +0000
 @@ -12,6 +12,7 @@
  %      motion.txt      /*%*
@@ -21953 +22498 @@
  %:gs   cmdline.txt     /*%:gs*
  %:h    cmdline.txt     /*%:h*
-@@ -1140,6 +1141,7 @@
+@@ -90,6 +91,10 @@
+ 'bl'   options.txt     /*'bl'*
+ 'bomb' options.txt     /*'bomb'*
+ 'breakat'      options.txt     /*'breakat'*
++'breakindent'  options.txt     /*'breakindent'*
++'breakindentopt'       options.txt     /*'breakindentopt'*
++'bri'  options.txt     /*'bri'*
++'briopt'       options.txt     /*'briopt'*
+ 'brk'  options.txt     /*'brk'*
+ 'browsedir'    options.txt     /*'browsedir'*
+ 'bs'   options.txt     /*'bs'*
+@@ -1140,6 +1145,7 @@
  +GUI_Photon    various.txt     /*+GUI_Photon*
  +GUI_neXtaw    various.txt     /*+GUI_neXtaw*
@@ -21961 +22517 @@
  +autocmd       various.txt     /*+autocmd*
  +balloon_eval  various.txt     /*+balloon_eval*
-@@ -1199,6 +1201,7 @@
+@@ -1199,6 +1205,7 @@
  +mouse various.txt     /*+mouse*
  +mouse_dec     various.txt     /*+mouse_dec*
@@ -21969 +22525 @@
  +mouse_pterm   various.txt     /*+mouse_pterm*
  +mouse_sgr     various.txt     /*+mouse_sgr*
-@@ -1262,6 +1265,7 @@
+@@ -1262,6 +1269,7 @@
  +writebackup   various.txt     /*+writebackup*
  +xfontset      various.txt     /*+xfontset*
@@ -21977 +22533 @@
  +xsmp  various.txt     /*+xsmp*
  +xsmp_interact various.txt     /*+xsmp_interact*
-@@ -1412,6 +1416,7 @@
+@@ -1412,6 +1420,7 @@
  /\%>c  pattern.txt     /*\/\\%>c*
  /\%>l  pattern.txt     /*\/\\%>l*
@@ -21985 +22541 @@
  /\%V   pattern.txt     /*\/\\%V*
  /\%[]  pattern.txt     /*\/\\%[]*
-@@ -1786,6 +1791,7 @@
+@@ -1786,6 +1795,7 @@
  :3match        pattern.txt     /*:3match*
  ::.    cmdline.txt     /*::.*
@@ -21993 +22549 @@
  ::gs   cmdline.txt     /*::gs*
  ::h    cmdline.txt     /*::h*
-@@ -1825,6 +1831,7 @@
+@@ -1825,6 +1835,7 @@
  :GnatPretty    ft_ada.txt      /*:GnatPretty*
  :GnatTags      ft_ada.txt      /*:GnatTags*
@@ -22001 +22557 @@
  :MkVimball     pi_vimball.txt  /*:MkVimball*
  :N     editing.txt     /*:N*
-@@ -1836,6 +1843,7 @@
+@@ -1836,6 +1847,7 @@
  :Nread pi_netrw.txt    /*:Nread*
  :Ns    pi_netrw.txt    /*:Ns*
@@ -22009 +22565 @@
  :Nwrite        pi_netrw.txt    /*:Nwrite*
  :P     various.txt     /*:P*
-@@ -1967,8 +1975,8 @@
+@@ -1967,8 +1979,8 @@
  :cabc  map.txt /*:cabc*
  :cabclear      map.txt /*:cabclear*
@@ -22019 +22575 @@
  :caddf quickfix.txt    /*:caddf*
  :caddfile      quickfix.txt    /*:caddfile*
-@@ -2212,6 +2220,9 @@
+@@ -2212,6 +2224,9 @@
  :foldopen      fold.txt        /*:foldopen*
  :for   eval.txt        /*:for*
@@ -22029 +22585 @@
  :function-verbose      eval.txt        /*:function-verbose*
  :g     repeat.txt      /*:g*
-@@ -2298,6 +2309,8 @@
+@@ -2298,6 +2313,8 @@
  :keepj motion.txt      /*:keepj*
  :keepjumps     motion.txt      /*:keepjumps*
@@ -22038 +22594 @@
  :lN    quickfix.txt    /*:lN*
  :lNext quickfix.txt    /*:lNext*
-@@ -2489,6 +2502,7 @@
+@@ -2489,6 +2506,7 @@
  :nbkey netbeans.txt    /*:nbkey*
  :nbstart       netbeans.txt    /*:nbstart*
@@ -22046 +22602 @@
  :next  editing.txt     /*:next*
  :next_f        editing.txt     /*:next_f*
-@@ -2518,6 +2532,8 @@
+@@ -2509,8 +2527,11 @@
+ :noautocmd     autocmd.txt     /*:noautocmd*
+ :noh   pattern.txt     /*:noh*
+ :nohlsearch    pattern.txt     /*:nohlsearch*
++:nor   map.txt /*:nor*
++:nore  map.txt /*:nore*
+ :norea map.txt /*:norea*
+ :noreabbrev    map.txt /*:noreabbrev*
++:norem map.txt /*:norem*
+ :noremap       map.txt /*:noremap*
+ :noremap!      map.txt /*:noremap!*
+ :noreme        gui.txt /*:noreme*
+@@ -2518,6 +2539,8 @@
  :norm  various.txt     /*:norm*
  :normal        various.txt     /*:normal*
@@ -22055 +22623 @@
  :number        various.txt     /*:number*
  :nun   map.txt /*:nun*
-@@ -2738,6 +2754,7 @@
+@@ -2738,6 +2761,7 @@
  :sign-jump     sign.txt        /*:sign-jump*
  :sign-list     sign.txt        /*:sign-list*
@@ -22063 +22631 @@
  :sign-unplace  sign.txt        /*:sign-unplace*
  :sil   various.txt     /*:sil*
-@@ -4294,6 +4311,11 @@
+@@ -4294,6 +4318,12 @@
  E879   syntax.txt      /*E879*
  E88    windows.txt     /*E88*
@@ -22072 +22640 @@
 +E884   eval.txt        /*E884*
 +E885   sign.txt        /*E885*
++E886   starting.txt    /*E886*
  E89    message.txt     /*E89*
  E90    message.txt     /*E90*
  E91    options.txt     /*E91*
-@@ -4423,6 +4445,13 @@
+@@ -4423,6 +4453,13 @@
  OverTheSpot    mbyte.txt       /*OverTheSpot*
  P      change.txt      /*P*
@@ -22089 +22658 @@
  Perl   if_perl.txt     /*Perl*
  Posix  intro.txt       /*Posix*
-@@ -4900,6 +4929,7 @@
+@@ -4766,6 +4803,7 @@
+ arglist        editing.txt     /*arglist*
+ arglist-position       editing.txt     /*arglist-position*
+ arglist-quit   usr_07.txt      /*arglist-quit*
++arglistid()    eval.txt        /*arglistid()*
+ argument-list  editing.txt     /*argument-list*
+ argv() eval.txt        /*argv()*
+ as     motion.txt      /*as*
+@@ -4900,6 +4938,7 @@
  byte-count     editing.txt     /*byte-count*
  byte2line()    eval.txt        /*byte2line()*
@@ -22097 +22674 @@
  c      change.txt      /*c*
  c.vim  syntax.txt      /*c.vim*
-@@ -5350,6 +5380,7 @@
+@@ -5350,6 +5389,7 @@
  dialog gui_w32.txt     /*dialog*
  dialogs-added  version5.txt    /*dialogs-added*
@@ -22105 +22682 @@
  dict-identity  eval.txt        /*dict-identity*
  dict-modification      eval.txt        /*dict-modification*
-@@ -5458,6 +5489,8 @@
+@@ -5458,6 +5498,8 @@
  escape intro.txt       /*escape*
  escape()       eval.txt        /*escape()*
@@ -22114 +22691 @@
  eval() eval.txt        /*eval()*
  eval-examples  eval.txt        /*eval-examples*
-@@ -5492,6 +5525,7 @@
+@@ -5492,6 +5534,7 @@
  exclusive-linewise     motion.txt      /*exclusive-linewise*
  executable()   eval.txt        /*executable()*
@@ -22122 +22699 @@
  exists()       eval.txt        /*exists()*
  exp()  eval.txt        /*exp()*
-@@ -5708,6 +5742,7 @@
+@@ -5708,6 +5751,7 @@
  ft-changelog-syntax    syntax.txt      /*ft-changelog-syntax*
  ft-chill-syntax        syntax.txt      /*ft-chill-syntax*
@@ -22130 +22707 @@
  ft-coldfusion-syntax   syntax.txt      /*ft-coldfusion-syntax*
  ft-cpp-syntax  syntax.txt      /*ft-cpp-syntax*
-@@ -5724,6 +5759,7 @@
+@@ -5724,6 +5768,7 @@
  ft-dtd-syntax  syntax.txt      /*ft-dtd-syntax*
  ft-eiffel-syntax       syntax.txt      /*ft-eiffel-syntax*
@@ -22138 +22715 @@
  ft-form-syntax syntax.txt      /*ft-form-syntax*
  ft-fortran-indent      indent.txt      /*ft-fortran-indent*
-@@ -5876,6 +5912,8 @@
+@@ -5876,6 +5921,8 @@
  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*
@@ -22147 +22724 @@
  g:clojure_fuzzy_indent_blacklist       indent.txt      /*g:clojure_fuzzy_indent_blacklist*
  g:clojure_fuzzy_indent_patterns        indent.txt      /*g:clojure_fuzzy_indent_patterns*
-@@ -5924,6 +5962,7 @@
+@@ -5924,6 +5971,7 @@
  g:html_use_encoding    syntax.txt      /*g:html_use_encoding*
  g:html_use_xhtml       syntax.txt      /*g:html_use_xhtml*
@@ -22155 +22732 @@
  g:netrw_altv   pi_netrw.txt    /*g:netrw_altv*
  g:netrw_banner pi_netrw.txt    /*g:netrw_banner*
-@@ -5944,6 +5983,7 @@
+@@ -5944,6 +5992,7 @@
  g:netrw_errorlvl       pi_netrw.txt    /*g:netrw_errorlvl*
  g:netrw_fastbrowse     pi_netrw.txt    /*g:netrw_fastbrowse*
@@ -22163 +22740 @@
  g:netrw_ftp    pi_netrw.txt    /*g:netrw_ftp*
  g:netrw_ftp_browse_reject      pi_netrw.txt    /*g:netrw_ftp_browse_reject*
-@@ -5958,6 +5998,7 @@
+@@ -5958,6 +6007,7 @@
  g:netrw_hide   pi_netrw.txt    /*g:netrw_hide*
  g:netrw_home   pi_netrw.txt    /*g:netrw_home*
@@ -22171 +22748 @@
  g:netrw_ignorenetrc    pi_netrw.txt    /*g:netrw_ignorenetrc*
  g:netrw_keepdir        pi_netrw.txt    /*g:netrw_keepdir*
-@@ -6358,6 +6399,7 @@
+@@ -6087,6 +6137,7 @@
+ getcmdline()   eval.txt        /*getcmdline()*
+ getcmdpos()    eval.txt        /*getcmdpos()*
+ getcmdtype()   eval.txt        /*getcmdtype()*
++getcurpos()    eval.txt        /*getcurpos()*
+ getcwd()       eval.txt        /*getcwd()*
+ getfontname()  eval.txt        /*getfontname()*
+ getfperm()     eval.txt        /*getfperm()*
+@@ -6358,6 +6409,7 @@
  hl-WildMenu    syntax.txt      /*hl-WildMenu*
  hlID() eval.txt        /*hlID()*
@@ -22179 +22764 @@
  home   intro.txt       /*home*
  home-replace   editing.txt     /*home-replace*
-@@ -6669,6 +6711,7 @@
+@@ -6669,6 +6721,7 @@
  linewise-visual        visual.txt      /*linewise-visual*
  lisp.vim       syntax.txt      /*lisp.vim*
@@ -22187 +22772 @@
  list-identity  eval.txt        /*list-identity*
  list-index     eval.txt        /*list-index*
-@@ -6921,6 +6964,15 @@
+@@ -6780,6 +6833,7 @@
+ match-highlight        pattern.txt     /*match-highlight*
+ match-parens   tips.txt        /*match-parens*
+ matchadd()     eval.txt        /*matchadd()*
++matchaddpos()  eval.txt        /*matchaddpos()*
+ matcharg()     eval.txt        /*matcharg()*
+ matchdelete()  eval.txt        /*matchdelete()*
+ matchend()     eval.txt        /*matchend()*
+@@ -6921,6 +6975,15 @@
  netrw  pi_netrw.txt    /*netrw*
  netrw-%        pi_netrw.txt    /*netrw-%*
@@ -22203 +22796 @@
  netrw-D        pi_netrw.txt    /*netrw-D*
  netrw-O        pi_netrw.txt    /*netrw-O*
-@@ -6978,6 +7030,7 @@
+@@ -6978,6 +7041,7 @@
  netrw-getftype pi_netrw.txt    /*netrw-getftype*
  netrw-gf       pi_netrw.txt    /*netrw-gf*
@@ -22211 +22804 @@
  netrw-gx       pi_netrw.txt    /*netrw-gx*
  netrw-handler  pi_netrw.txt    /*netrw-handler*
-@@ -6992,6 +7045,7 @@
+@@ -6992,6 +7056,7 @@
  netrw-internal-variables       pi_netrw.txt    /*netrw-internal-variables*
  netrw-intro-browse     pi_netrw.txt    /*netrw-intro-browse*
@@ -22219 +22812 @@
  netrw-listbookmark     pi_netrw.txt    /*netrw-listbookmark*
  netrw-listhack pi_netrw.txt    /*netrw-listhack*
-@@ -7022,6 +7076,7 @@
+@@ -7022,6 +7087,7 @@
  netrw-nexplore pi_netrw.txt    /*netrw-nexplore*
  netrw-noload   pi_netrw.txt    /*netrw-noload*
@@ -22227 +22820 @@
  netrw-o        pi_netrw.txt    /*netrw-o*
  netrw-options  pi_netrw.txt    /*netrw-options*
-@@ -7033,6 +7088,7 @@
+@@ -7033,6 +7099,7 @@
  netrw-p13      pi_netrw.txt    /*netrw-p13*
  netrw-p14      pi_netrw.txt    /*netrw-p14*
@@ -22235 +22828 @@
  netrw-p3       pi_netrw.txt    /*netrw-p3*
  netrw-p4       pi_netrw.txt    /*netrw-p4*
-@@ -7374,6 +7430,7 @@
+@@ -7374,6 +7441,7 @@
  profiling      repeat.txt      /*profiling*
  profiling-variable     eval.txt        /*profiling-variable*
@@ -22243 +22836 @@
  pronounce      intro.txt       /*pronounce*
  psql   ft_sql.txt      /*psql*
-@@ -7577,6 +7634,7 @@
+@@ -7577,6 +7645,7 @@
  s/\3   change.txt      /*s\/\\3*
  s/\9   change.txt      /*s\/\\9*
@@ -22251 +22844 @@
  s/\L   change.txt      /*s\/\\L*
  s/\U   change.txt      /*s\/\\U*
-@@ -7787,6 +7845,7 @@
+@@ -7787,6 +7856,7 @@
  spell-affix-mbyte      spell.txt       /*spell-affix-mbyte*
  spell-affix-not-supported      spell.txt       /*spell-affix-not-supported*
@@ -22259 +22852 @@
  spell-dic-format       spell.txt       /*spell-dic-format*
  spell-double-scoring   spell.txt       /*spell-double-scoring*
-@@ -7872,6 +7931,7 @@
+@@ -7872,6 +7942,7 @@
  strdisplaywidth()      eval.txt        /*strdisplaywidth()*
  strftime()     eval.txt        /*strftime()*
@@ -22267 +22860 @@
  string-functions       usr_41.txt      /*string-functions*
  string-match   eval.txt        /*string-match*
-@@ -7936,6 +7996,7 @@
+@@ -7936,6 +8007,7 @@
  system()       eval.txt        /*system()*
  system-functions       usr_41.txt      /*system-functions*
@@ -22275 +22868 @@
  t      motion.txt      /*t*
  t:     eval.txt        /*t:*
-@@ -8280,6 +8341,7 @@
+@@ -8280,6 +8352,7 @@
  undofile()     eval.txt        /*undofile()*
  undotree()     eval.txt        /*undotree()*
@@ -22283 +22876 @@
  unlisted-buffer        windows.txt     /*unlisted-buffer*
  up-down-motions        motion.txt      /*up-down-motions*
-@@ -8364,6 +8426,7 @@
+@@ -8364,6 +8437,7 @@
  v:foldend      eval.txt        /*v:foldend*
  v:foldlevel    eval.txt        /*v:foldlevel*
@@ -22291 +22884 @@
  v:key  eval.txt        /*v:key*
  v:lang eval.txt        /*v:lang*
-@@ -8377,6 +8440,7 @@
+@@ -8377,6 +8451,7 @@
  v:prevcount    eval.txt        /*v:prevcount*
  v:profiling    eval.txt        /*v:profiling*
@@ -22301 +22894 @@
 diff -Naur vim74.orig/runtime/doc/tagsrch.txt vim74/runtime/doc/tagsrch.txt
 --- vim74.orig/runtime/doc/tagsrch.txt  2013-08-10 11:25:02.000000000 +0000
-+++ vim74/runtime/doc/tagsrch.txt       2014-06-01 00:42:52.637535056 +0000
++++ vim74/runtime/doc/tagsrch.txt       2014-07-21 23:33:15.386863877 +0000
 @@ -1,4 +1,4 @@
 -*tagsrch.txt*   For Vim version 7.4.  Last change: 2013 Jul 28
@@ -22325 +22918 @@
 diff -Naur vim74.orig/runtime/doc/term.txt vim74/runtime/doc/term.txt
 --- vim74.orig/runtime/doc/term.txt     2013-08-10 11:25:02.000000000 +0000
-+++ vim74/runtime/doc/term.txt  2014-06-01 00:42:52.644201706 +0000
++++ vim74/runtime/doc/term.txt  2014-07-21 23:33:15.423530448 +0000
 @@ -1,4 +1,4 @@
 -*term.txt*      For Vim version 7.4.  Last change: 2013 Mar 13
@@ -22345 +22938 @@
 diff -Naur vim74.orig/runtime/doc/todo.txt vim74/runtime/doc/todo.txt
 --- vim74.orig/runtime/doc/todo.txt     2013-08-10 11:25:02.000000000 +0000
-+++ vim74/runtime/doc/todo.txt  2014-06-01 00:42:52.700868228 +0000
++++ vim74/runtime/doc/todo.txt  2014-07-21 23:33:15.583530030 +0000
 @@ -1,4 +1,4 @@
 -*todo.txt*      For Vim version 7.4.  Last change: 2013 Aug 10
-+*todo.txt*      For Vim version 7.4.  Last change: 2014 May 22
++*todo.txt*      For Vim version 7.4.  Last change: 2014 Jul 19
  
  
                   VIM REFERENCE MANUAL    by Bram Moolenaar
-@@ -34,38 +34,242 @@
+@@ -34,38 +34,289 @@
                                                         *known-bugs*
  -------------------- Known bugs and current work -----------------------
  
++Completion menu: remove redraw (Hirohito Higashi)
++
 +Regexp problems:
 +- Bug with pattern: '\vblock (\d+)\.\n.*\d+%(\1)@<!\.$'
@@ -22369 +22964 @@
 +  \%u, \%x, \%o, \%d followed by a composing character
 +
++Crash when splitting the window when the size is tiny.
++(Yukihiro Nakadaira, 2014 Jul 15-16)
++
++Another problem with splitting window. (Yukihiro Nakadaira, 2014 Jul 17)
++Patch Jul 17.
++
++Using freed memory when jumping from a quickfix list. (lcd47, 2014 Jul 17)
++
++Patch to fix valgrind error. (Dominique Pelle, 2014 Jul 9)
++
++Vroom filetype support. (David Barnett, 2014 Jul 10)
++
++u_undo error.  Reproduce with description from Ayberk Ozgur, 2014 Jul 17.
++
++Updated Django files. (Dave Hodder, 2014 Jul 13)
++
++Title of quickfist list is not kept for setqflist(list 'r').
++(Lcd, 2014 Jul 17)  With test Jul 18.
++
++Patch to fix noremap flags not cleared after typing Esc. (Jacob Niehus, 2014
++Jul 9)
++
 +Problem that a previous silent ":throw" causes a following try/catch not to
 +work. (ZyX, 2013 Sep 28)
 +
++DiffChange highlighting doesn't combine with 'cursurline'. (Benjamin Fritz)
++Patch by Christian (2014 Jul 12)
++
++BufWinLeave autocommand executed in the wrong buffer? (Davit Samvelyan, 2014
++Jul 14)
++
++When 'clipboard' is "unnamed", :g/pat/d is very slow.  Only set the clipboard
++after the last delete? (Praful, 2014 May 28)
++Patch by Christian Brabandt, 2014 Jun 18.  Update Jun 25.
++
++Completion for :buf does not use 'wildignorecase'. (Akshay H, 2014 May 31)
++
 +":cd C:\Windows\System32\drivers\etc*" does not work, even though the
 +directory exists. (Sergio Gallelli, 2013 Dec 29)
 +
++The entries added by matchaddpos() are returned by getmatches() but can't be
++set with setmatches(). (lcd47, 2014 Jun 29)
++
 +Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15)
 +
-+Setting 'ttymouse' empty causes Dec mouse to be detected. (Elijah Griffin,
-+2014 May 13)
-+
  Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
  
 -Patch to add "acl" and "xpm" as a feature. (Ken Takata, 2013 Jul 8)
++When using an undo file, also restore the changelist, so that "g;" works.
++
++Value returned by virtcol() changes depending on how lines wrap.  This is
++inconsistant with the documentation.
++
 +MS-Windows: Crash opening very long file name starting with "\\".
 +(Christian Brock, 2012 Jun 29)
@@ -22390 +23024 @@
 +Adding "~" to 'cdpath' doesn't work for completion?  (Davido, 2013 Aug 19)
 +
++"hi link" does not respect groups with GUI settings only. (Mark Lodato, 2014
++Jun 8)
++
 +Syntax file for gnuplot.  Existing one is very old. (Andrew Rasmussen, 2014
 +Feb 24)
 +
-+Add digraph for Rouble: =P.  What's the Unicode?
-+
 +Issue 174: Detect Mason files.
 +
@@ -22402 +23037 @@
 +
 +PHP syntax is extremely slow. (Anhad Jai Singh, 2014 Jan 19)
++
++Patch for matchparen. (James McCoy, 2014 Jul 11)
 +
 +Spell files use a latin single quote. Unicode also has another single quote:
@@ -22413 +23050 @@
 +
 +Win32: use 64 bit stat() if possible. (Ken Takata, 2014 May 12)
-+More tests May 14.
++More tests May 14. Update May 29.
+ 
+-Patch to make has() check for Vim version and patch at the same time.
+-(Marc Weber, 2013 Jun 7)
++The garbage collector may use too much stack.  Make set_ref_in_item()
++iterative instead of recursive.   Test program by Marc Weber (2013 Dec 10)
++Patch by Ben Fritz, 2014 Jun 22.
 +
 +Idea: For a window in the middle (has window above and below it), use
@@ -22421 +23064 @@
 +Can we make ":unlet $VAR" use unsetenv() to delete the env var?
 +What for systems that don't have unsetenv()?
-+
-+Patch to make getchar() work for typing Esc. (Yasuhiro Matsumoto, 2014 May 13)
-+
-+Patch for problem that v:register is set to '_' after deleting into the black
-+hole register.
 +
 +This does not give an error: (Andre Sihera, 2014 Mar 21)
@@ -22436 +23074 @@
 +from?
 +
-+Patch to add arglistid(), get the ID of the currently used argument list.
-+(Marcin Szamotulski, 2014 Apr 27)
++Problem with upwards search on Windows (works OK on Linux). (Brett Stahlman,
++2014 Jun 8)
 +
 +Include a plugin manager with Vim? Neobundle seems to be the best currently.
@@ -22476 +23114 @@
 +normal spell file. (Enno Nagel, 2014 Mar 29)
 +
-+-   Patch for 'breakindent' option: repeat indent for wrapped line. (Vaclav
-+    Smilauer, 2004 Sep 13, fix Oct 31, update 2007 May 30)
-+    Version for latest MacVim: Tobia Conforto, 2009 Nov 23
-+    More recent version: https://retracile.net/wiki/VimBreakIndent
-+    Posted to vim-dev by Taylor Hedberg, 2011 Nov 25
-+    Update by Taylor Hedberg, 2013 May 30.
-+    Updated for Vim 7.4 by Ken Takata, 2013 Oct 5.
-+    Update by Christian Brabandt, 2014 May 9.  Remarks by Ken Takata.
-+    Update by Christian 2014 May 12, github link on May 15
++CTRL-] in Visual mode uses the selected text as a tag.  This does not work
++when preceded with CTRL-W. (Patrick Hemmer, 2014 Jun 28)
 +
 +When typing the first character of a command, e.g. "f", then using a menu, the
@@ -22495 +23126 @@
 +various other commands.  (ZyX, 2014 Mar 30)
 +
++patch to skip sort if no line matches the expression.
++(Christian Brabandt, 2014 Jun 25)
++
++Patch to add sortuniq(). (Cade Forester, 2014 Mar 19)
++Or add uniq() instead?  Patch by lcd47, but it has problems.
++
++Patch to support sorting on floating point number.  (Alex Jakushev, 2010 Oct
++30)
++
++Patch to support expression argument to sort() instead of a function name.
++Yasuhiro Matsumoto, 2013 May 31.
++Or should we add a more general mechanism, like lambda functions?
++
 +VMS: Select() doesn't work properly, typing ESC may hang Vim.  Use sys$qiow
 +instead. (Samuel Ferencik, 2013 Sep 28)
- 
--Patch to make has() check for Vim version and patch at the same time.
--(Marc Weber, 2013 Jun 7)
++
 +Patch for XDG base directory support. (Jean François Bignolles, 2014 Mar 4)
-+
-+Patch to add flag to shortmess to avoid giving completion messages.
-+(Shougo Matsu, 2014 Jan 6, update Jan 11)
++Remark on the docs.  Should not be a compile time feature.  But then what?
++
++Completion of ":e" is ":earlier", whould be ":edit".  Complete to the matching
++command instead of doing this alphabetically. (Mikel Jorgensen)
 +
 +Patch to add v:completed_item. (Shougo Matsu, 2013 Nov 29).
@@ -22510 +23153 @@
 +
 +Patch to define macros for hardcoded values. (Elias Diem, 2013 Dec 14)
-+
-+Patch to add sortuniq(). (Cade Forester, 2014 Mar 19)
-+Or add uniq() instead?  Patch by lcd47, but it has problems.
 +
 +Perl: support for Activestate perl 5.18: Issue 170.
@@ -22527 +23167 @@
 +Patch to add ":undorecover", get as much text out of the undo file as
 +possible. (Christian Brabandt, 2014 Mar 12)
-+
-+Include Haiku port? (Adrien Destugues, Siarzhuk Zharski, 2013 Oct 24)
  
 -Several Win32 functions are not using Unicode.
 -Patches to fix this. (Ken Takata, 2013 Aug 9)
++Include Haiku port? (Adrien Destugues, Siarzhuk Zharski, 2013 Oct 24)
++
 +Updated spec ftplugin. (Matěj Cepl, 2013 Oct 16)
 +
@@ -22604 +23244 @@
  
  The BufUnload event is triggered when re-using the empty buffer.
-@@ -76,6 +280,10 @@
+@@ -76,6 +327,10 @@
  - The word that was selected (empty if abandoned complete)
  - Type of completion: tag, omnifunc, user func.
@@ -22615 +23255 @@
  That is, calling a dictionary function on an autoloaded dict.
  Works OK for echo, just not for  ":call" and ":call call()". (Ted, 2011 Mar
-@@ -83,10 +291,6 @@
+@@ -83,17 +338,19 @@
  Patch by Christian Brabandt, 2013 Mar 23.
  Not 100% sure this is the right solution.
@@ -22623 +23263 @@
 -Stocker, 2012 Jan 5)
 -
- Patch to support expression argument to sort() instead of a function name.
- Yasuhiro Matsumoto, 2013 May 31.
- Or should we add a more general mechanism, like lambda functions?
-@@ -94,6 +298,19 @@
+-Patch to support expression argument to sort() instead of a function name.
+-Yasuhiro Matsumoto, 2013 May 31.
+-Or should we add a more general mechanism, like lambda functions?
+-
  Problem caused by patch 7.3.638: window->open does not update window
  correctly. Issue 91.
@@ -22632 +23272 @@
 +Patch to add {lhs} to :mapclear: clear all maps starting with {lhs}.
 +(Christian Brabandt, 2013 Dec 9)
-+
-+The garbage collector may use too much stack.  Make set_ref_in_item()
-+iterative instead of recursive.   Test program by Marc Weber (2013 Dec 10)
 +
 +Exception caused by argument of return is not caught by try/catch.
@@ -22646 +23283 @@
  2013 Mar 19, later message)
  
-@@ -108,6 +325,8 @@
+@@ -108,6 +365,8 @@
  Bug with 'cursorline' in diff mode.  Line being scrolled into view gets
  highlighted as the cursor line.  (Alessandro Ivaldi, 2013 Jun 4)
@@ -22655 +23292 @@
  May 17: with winlist() and tabpagelist().
  May 19: with local variables.
-@@ -119,6 +338,8 @@
+@@ -119,10 +378,13 @@
  Patch from Christian Brabandt to make the "buffer" argument for ":sign place"
  optional. (2013 Jul 12)
@@ -22664 +23301 @@
  functions. (Christian Brabandt, 2013 May 8, update May 21)
  Patch to add getlocstack() / setlocstack(). (Christian Brabandt, 2013 May 14)
-@@ -149,11 +370,19 @@
+ Second one. Update May 22.
++Update by Daniel Hahler, 2014 Jul 4.
+ 
+ Patch to make fold updates much faster. (Christian Brabandt, 2012 Dec)
+ 
+@@ -137,9 +399,6 @@
+ 
+ Bug: findfile("any", "file:///tmp;") does not work.
+ 
+-v:register is not directly reset to " after a delete command that specifies a
+-register.  It is reset after the next command. (Steve Vermeulen, 2013 Mar 16)
+-
+ 'ff' is wrong for one-line file without EOL. (Issue 77)
+ 
+ Patch to set antialiasing style on Windows. (Ondrej Balaz, 2013 Mar 14)
+@@ -149,11 +408,19 @@
  process that is running.  It might actually be some other program, e.g. after
  a reboot.
@@ -22686 +23338 @@
  not correctly updated. (Paul Harris, 2012 Feb 27)
  
-@@ -167,8 +396,17 @@
+@@ -167,8 +434,17 @@
  
  Patch to add functions for signs. (Christian Brabandt, 2013 Jan 27)
@@ -22704 +23356 @@
  Patch to add 'completeselect' option.  Specifies how to select a candidate in
  insert completion. (Shougo, 2013 May 29)
-@@ -182,9 +420,6 @@
+@@ -182,9 +458,6 @@
  Win32: The Python interface only works with one version of Python, selected at
  compile time.  Can this be made to work with version 2.1 and 2.2 dynamically?
@@ -22714 +23366 @@
  Vim script.  Requires converting the arguments and return value, like with
  vim.bindeval().
-@@ -205,9 +440,6 @@
+@@ -205,9 +478,6 @@
  Add a check for b:no_match_paren in Highlight_matching_Pair() (Marcin
  Szamotulski, 2012 Nov 8)
@@ -22724 +23376 @@
  
  Session file creation: 'autochdir' causes trouble.  Keep it off until after
-@@ -240,10 +472,6 @@
+@@ -240,10 +510,6 @@
  Help for 'b:undo_indent'. (Thilo Six, 2012 May 28)
  Also question if examples are correct.
@@ -22735 +23387 @@
  Suggestion for another map. (Philip Mat, 2012 Jun 18)
  But use "gi" instead of "a".  Or use CTRL-\ CTRL-O.
-@@ -251,10 +479,6 @@
+@@ -251,13 +517,12 @@
  Patch to support user name completion on MS-Windows. (Yasuhiro Matsumoto, 2012
  Aug 16)
@@ -22746 +23398 @@
  is confusing.  Should say "the argument list is empty".
  
-@@ -272,27 +496,23 @@
++xterm supports escape sequences to mark a paste operation.  Need to be
++enabled. (Bruno Sutic, 2014 Jul 11)  How to know the terminal supports this?
++
+ URXVT:
+ - will get stuck if byte sequence does not contain the expected semicolon.
+ - Use urxvt mouse support also in xterm.  Explanations:
+@@ -272,27 +537,23 @@
  
  Patch to list user digraphs. (Christian Brabandt, 2012 Apr 14)
@@ -22779 +23437 @@
  
  Update for vim2html.pl. (Tyru, 2013 Feb 22)
-@@ -374,8 +594,6 @@
+@@ -374,8 +635,6 @@
  Setting $HOME on MS-Windows is not very well documented.  Suggestion by Ben
  Fritz (2011 Oct 27).
@@ -22788 +23446 @@
  doing ":g/test/d".  Putting every delete on the clipboard? (Robert Chan, 2011
  Jun 17)
-@@ -396,10 +614,10 @@
+@@ -396,10 +655,10 @@
  Changes to manpage plugin. (Elias Toivanen, 2011 Jul 25)
  
@@ -22801 +23459 @@
  On 64 bit MS-Windows "long" is only 32 bits, but we sometimes need to store a
  64 bits value.  Change all number options to use nropt_T and define it to the
-@@ -419,6 +637,8 @@
+@@ -419,6 +678,8 @@
  When setqflist() uses a filename that triggers a BufReadCmd autocommand Vim
  doesn't jump to the correct line with :cfirst. (ZyX,  2011 Sep 18)
@@ -22810 +23468 @@
  Patch from Christian Brabandt, 2011 Aug 19.
  
-@@ -456,6 +676,9 @@
+@@ -439,9 +700,6 @@
+ 
+ "0g@$" puts '] on last byte of multi-byte. (ZyX, 2011 Jan 22)
+ 
+-Patch to support sorting on floating point number.  (Alex Jakushev, 2010 Oct
+-30)
+-
+ Patch to addd TextDeletePost and TextYankPost events. (Philippe Vaucher, 2011
+ May 24)  Update May 26.
+ 
+@@ -456,6 +714,9 @@
  number, but it is in the sign column.  Doesn't look right. (ZyX 2011 Jun 5)
  Patch by Christian Brabandt, 2011 Jun 5.  Introduces new problems.
@@ -22820 +23488 @@
  Patch by Christian Brabandt, uses ]e [e ]t and [t. 2011 Aug 9.
  
-@@ -524,9 +747,6 @@
+@@ -524,9 +785,6 @@
  Patch to add FoldedLineNr highlighting: different highlighting for the line
  number of a closed fold. (eXerigumo Clanjor, 2013 Jul 15)
@@ -22830 +23498 @@
  - Profiling:
         ./vim -u NONE -s ~/vim/test/ruby.vim
-@@ -556,7 +776,7 @@
+@@ -556,7 +814,7 @@
  the system encoding (usually utf-8).
  
@@ -22839 +23507 @@
  Problem producing tags file when hebrew.frx is present.  It has a BOM.
  Results in E670. (Tony Mechelynck, 2010 May 2)
-@@ -573,8 +793,7 @@
- 
- getpos()/setpos() don't include curswant.  getpos() could return a fifth
- element.  setpos() could accept an optional fifth element.
+@@ -571,11 +829,6 @@
+     file names unique, also support this for 'backupdir'. (Mikolaj Machowski)
+     Patch by Christian Brabandt, 2010 Oct 21.
+ 
+-getpos()/setpos() don't include curswant.  getpos() could return a fifth
+-element.  setpos() could accept an optional fifth element.
 -Patch by Christian Brabandt, 2010 Sep 6.  Check that new argument is optional
 -and that it's documented.
-+Patch by Christian Brabandt, 2010 Sep 6.  Again 2013 Aug 22.
- 
+-
  With "tw=55 fo+=a" typing space before ) doesn't work well. (Scott Mcdermott,
  2010 Oct 24)
-@@ -595,9 +814,6 @@
+ 
+@@ -595,9 +848,6 @@
  checked to be in a comment.  Implement FM_SKIPCOMM flag of findmatchlimit().
  Issue 46.
@@ -22859 +23529 @@
  
  Using CompilerSet doesn't record where an option was set from.  E.g., in the
-@@ -620,8 +836,6 @@
+@@ -620,8 +870,6 @@
  When 'lines' is 25 and 'scrolloff' is 12, "j" scrolls zero or two lines
  instead of one. (Constantin Pan, 2010 Sep 10)
@@ -22868 +23538 @@
  Winckler, 2011 May 11)
  Requires a map mode for Insert mode started from blockwise Visual mode.
-@@ -629,10 +843,6 @@
+@@ -629,10 +877,6 @@
  Writing nested List and Dict in viminfo gives error message and can't be read
  back. (Yukihiro Nakadaira, 2010 Nov 13)
@@ -22879 +23549 @@
  Additional info by Dominique Pelle. (also on 2010 Apr 10)
  
-@@ -759,6 +969,7 @@
+@@ -759,6 +1003,7 @@
  
  Patch to add farsi handling to arabic.c (Ali Gholami Rudi, 2009 May 2)
@@ -22887 +23557 @@
  Patch to add "focusonly" to 'scrollopt', so that scrollbind also applies in
  window that doesn't have focus. (Jonathon Mah, 2009 Jan 12)
-@@ -838,8 +1049,6 @@
+@@ -838,8 +1083,6 @@
  Win32 GUI: last message from startup doesn't show up when there is an echoerr
  command. (Cyril Slobin, 2009 Mar 13)
@@ -22896 +23566 @@
  does not work. (Nieko Maatjes, 2009 Jan 8, Ingo Karkat, 2009 Jan 22)
  
-@@ -856,7 +1065,12 @@
+@@ -856,7 +1099,12 @@
  Using ~ works OK on 'a' with composing char, but not on 0x0418  with composing
  char 0x0301. (Tony Mechelynck, 2009 Mar 4)
@@ -22910 +23580 @@
  Inconsistent: starting with $LANG set to es_ES.utf-8 gives Spanish
  messages, even though locale is not supported.  But ":lang messages
-@@ -885,7 +1099,7 @@
+@@ -885,7 +1133,7 @@
  Completion for ":buf" doesn't work properly on Win32 when 'shellslash' is off.
  (Henrik Ohman, 2009, Jan 29)
@@ -22919 +23589 @@
  Use a different option or let it depend on whether 'shell' looks like a
  unix-like shell?
-@@ -918,8 +1132,6 @@
+@@ -918,8 +1166,6 @@
  Add v:motion_force. (Kana Natsuno, 2008 Dec 6)
  Maybe call it v:motiontype.
@@ -22928 +23598 @@
  doesn't set 'ff' to "unix".  (Ben Fritz, 2008 Dec 5) Reusing the old buffer
  probably causes this.
-@@ -928,7 +1140,7 @@
+@@ -928,7 +1174,7 @@
  2009 Jan 16)
  
@@ -22937 +23607 @@
  Document that default font in Athena can be set with resources:
     XtDefaultFont: "9x15"
-@@ -942,6 +1154,7 @@
+@@ -942,6 +1188,7 @@
  
  ":pedit %" with a BufReadPre autocommand causes the cursor to move to the
@@ -22945 +23615 @@
  Wildmenu not deleted: "gvim -u NONE", ":set nocp wildmenu cmdheight=3
  laststatus=2", CTRL-D CTRL-H CTRL-H CTRL-H. (A.Politz, 2008 April 1)
-@@ -1085,9 +1298,6 @@
+@@ -1085,9 +1332,6 @@
  result in no matches.  Convert chars to lower case? (Erik Wognsen, 2009 Apr
  16)
@@ -22955 +23625 @@
  (Lech Lorens, 2010 Aug 30)
  
-@@ -1289,6 +1499,7 @@
+@@ -1289,6 +1533,7 @@
  
  Win64: Seek error in swap file for a very big file (3 Gbyte).  Check storing
@@ -22963 +23633 @@
  Win32: patch for fullscreen mode. (Liushaolin, 2008 April 17)
  
-@@ -1296,14 +1507,17 @@
+@@ -1296,14 +1541,17 @@
  Depends on 'shellslash', 'shellquote' and 'shellxquote', but shellescape()
  only takes 'shellslash' into account.
@@ -22985 +23655 @@
  2007 Jun 21)
  
-@@ -1459,6 +1673,9 @@
+@@ -1459,6 +1707,9 @@
  tree stops unexpectedly when using ":cd " and entering a directory that
  doesn't contain other directories.
@@ -22995 +23665 @@
     highlight Normal ctermbg=DarkGray
     set background=dark
-@@ -1685,7 +1902,7 @@
+@@ -1685,7 +1936,7 @@
  -   testdir/Make_dos_sh.mak for running tests with MingW. (Bill Mccarthy, 2008
      Sep 13)
@@ -23004 +23674 @@
      Vissale Neang.  (Martin Stubenschrott) Asked Vissale to make the scripts
      more friendly for the Vim distribution.
-@@ -1715,7 +1932,7 @@
+@@ -1715,7 +1966,7 @@
      How does this work?  Missing comments.
  8   Add a few more command names to the menus.  Patch from Jiri Brezina
@@ -23013 +23683 @@
  -   Include flipcase patch: ~/vim/patches/wall.flipcase2 ?  Make it work
      for multi-byte characters.
-@@ -1864,8 +2081,6 @@
+@@ -1864,8 +2115,6 @@
  Win32 GUI known bugs:
  -   Win32: tearoff menu window should have a scrollbar when it's taller than
@@ -23022 +23692 @@
      file names.  Can we load unicows.dll dynamically?
  8   The -P argument doesn't work very well with many MDI applications.
-@@ -1873,9 +2088,6 @@
+@@ -1873,9 +2122,6 @@
      Tutorial: http://win32assembly.online.fr/tut32.html
  8   In eval.c, io.h is included when MSWIN32 is defined.  Shouldn't this be
@@ -23032 +23702 @@
      of ":only" is highlighted like the cursor.  (Lipelis)
  8   When 'encoding' is "utf-8", should use 'guifont' for both normal and wide
-@@ -1887,9 +2099,6 @@
+@@ -1887,9 +2133,6 @@
  8   Use another default for 'termencoding': the active codepage.  Means that
      when 'encoding' is changed typing characters still works properly.
@@ -23042 +23712 @@
      2004 May 9)
  8   Win32: When clicking on the gvim title bar, which gives it focus, produces
-@@ -2272,8 +2481,6 @@
+@@ -2272,8 +2515,6 @@
      character. (Yasuhiro Matsumoto)  It should return 1 when used on a tail
      byte, like for utf-8.  Store second byte of double-byte in ScreenLines2[]
@@ -23051 +23721 @@
      ":insert" command, causing the following "endfunction" not to be found.
      Add skipping this perl construction inside function definitions.
-@@ -2566,8 +2773,6 @@
+@@ -2566,8 +2807,6 @@
      input method called from GDK code.  Without Perl it doesn't crash.
  -   VMS: Vimdiff doesn't work with the VMS diff, because the output looks
@@ -23060 +23730 @@
      in Vim as if the rightmost scrollbar was used.
  -   GTK with Gnome: Produces an error message when starting up:
-@@ -2736,10 +2941,6 @@
+@@ -2736,10 +2975,6 @@
  
  
@@ -23071 +23741 @@
      https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=219777    
  -   Unicode defines another quote character: 0x2019.  Use it as an equivalent
-@@ -2925,12 +3126,8 @@
+@@ -2925,12 +3160,8 @@
  8   toupper() function doesn't handle byte count changes.
  7   Searching and composing characters:
@@ -23084 +23754 @@
  8   Detect overlong UTF-8 sequences and handle them like illegal bytes.
  8   ":s/x/\u\1/" doesn't work, making uppercase isn't done for multi-byte
-@@ -3153,6 +3350,7 @@
+@@ -3153,6 +3384,7 @@
  Built-in script language:
  8   Make the filename and line number available to script functions, so that
@@ -23092 +23762 @@
      restore option values.  Especially useful for new options.  Problem: how
      to avoid a performance penalty (esp. for string options)?
-@@ -4035,8 +4233,7 @@
+@@ -4035,8 +4267,7 @@
  7   Use Tabs for the indent of starting lines, pad with spaces for
      continuation lines.  Allows changing 'tabstop' without messing up the
@@ -23102 +23772 @@
  
  Java:
-@@ -4655,7 +4852,7 @@
+@@ -4655,7 +4886,7 @@
  
  Digraphs:
@@ -23111 +23781 @@
      characters?
  8   Add command to remove one or more (all) digraphs. (Brown)
-@@ -4852,6 +5049,7 @@
+@@ -4852,6 +5083,7 @@
  6   Add ":timer" command, to set a command to be executed at a certain
      interval, or once after some time has elapsed. (Aaron)
@@ -23121 +23791 @@
 diff -Naur vim74.orig/runtime/doc/undo.txt vim74/runtime/doc/undo.txt
 --- vim74.orig/runtime/doc/undo.txt     2013-08-10 11:25:02.000000000 +0000
-+++ vim74/runtime/doc/undo.txt  2014-06-01 00:42:52.734201477 +0000
++++ vim74/runtime/doc/undo.txt  2014-07-21 23:33:15.630196575 +0000
 @@ -1,4 +1,4 @@
 -*undo.txt*      For Vim version 7.4.  Last change: 2012 Mar 04
-+*undo.txt*      For Vim version 7.4.  Last change: 2013 Sep 08
++*undo.txt*      For Vim version 7.4.  Last change: 2014 May 24
  
  
@@ -23137 +23807 @@
  nothing (undoes an undo).
  
+@@ -97,9 +97,9 @@
+                        or redo.
+                        {not in Vi}
+ 
+-This is most useful when you need to prompt the user halfway a change.  For
+-example in a function that calls |getchar()|.  Do make sure that there was a
+-related change before this that you must join with.
++This is most useful when you need to prompt the user halfway through a change.
++For example in a function that calls |getchar()|.  Do make sure that there was
++a related change before this that you must join with.
+ 
+ This doesn't work by itself, because the next key press will start a new
+ change again.  But you can do something like this: >
 @@ -249,8 +249,9 @@
  detect if an undo file is no longer synchronized with the file it was written
@@ -23149 +23832 @@
  Undo files are normally saved in the same directory as the file.  This can be
  changed with the 'undodir' option.
+diff -Naur vim74.orig/runtime/doc/usr_08.txt vim74/runtime/doc/usr_08.txt
+--- vim74.orig/runtime/doc/usr_08.txt   2013-08-10 11:25:03.000000000 +0000
++++ vim74/runtime/doc/usr_08.txt        2014-07-21 23:33:15.696863068 +0000
+@@ -1,4 +1,4 @@
+-*usr_08.txt*   For Vim version 7.4.  Last change: 2006 Jul 18
++*usr_08.txt*   For Vim version 7.4.  Last change: 2014 Jul 06
+ 
+                     VIM USER MANUAL - by Bram Moolenaar
+ 
+@@ -532,7 +532,7 @@
+ 
+ You now have two tab pages.  The first one has a window for "thisfile" and the
+ second one a window for "thatfile".  It's like two pages that are on top of
+-eachother, with a tab sticking out of each page showing the file name.
++each other, with a tab sticking out of each page showing the file name.
+ 
+ Now use the mouse to click on "thisfile" in the top line.  The result is
+ 
 diff -Naur vim74.orig/runtime/doc/usr_25.txt vim74/runtime/doc/usr_25.txt
 --- vim74.orig/runtime/doc/usr_25.txt   2013-08-10 11:25:05.000000000 +0000
-+++ vim74/runtime/doc/usr_25.txt        2014-06-01 00:42:52.944200942 +0000
++++ vim74/runtime/doc/usr_25.txt        2014-07-21 23:33:15.816862755 +0000
 @@ -86,7 +86,7 @@
  
@@ -23163 +23864 @@
 diff -Naur vim74.orig/runtime/doc/usr_30.txt vim74/runtime/doc/usr_30.txt
 --- vim74.orig/runtime/doc/usr_30.txt   2013-08-10 11:25:05.000000000 +0000
-+++ vim74/runtime/doc/usr_30.txt        2014-06-01 00:42:53.064200637 +0000
++++ vim74/runtime/doc/usr_30.txt        2014-07-21 23:33:15.870195949 +0000
 @@ -128,7 +128,7 @@
  You can include special Vim keywords in the command specification.  The %
@@ -23184 +23885 @@
 diff -Naur vim74.orig/runtime/doc/usr_40.txt vim74/runtime/doc/usr_40.txt
 --- vim74.orig/runtime/doc/usr_40.txt   2013-08-10 11:25:05.000000000 +0000
-+++ vim74/runtime/doc/usr_40.txt        2014-06-01 00:42:53.100867210 +0000
++++ vim74/runtime/doc/usr_40.txt        2014-07-21 23:33:15.920195819 +0000
 @@ -209,7 +209,7 @@
  separates the two commands.  This also means that a | character can't be used
@@ -23196 +23897 @@
 diff -Naur vim74.orig/runtime/doc/usr_41.txt vim74/runtime/doc/usr_41.txt
 --- vim74.orig/runtime/doc/usr_41.txt   2013-08-10 11:25:05.000000000 +0000
-+++ vim74/runtime/doc/usr_41.txt        2014-06-01 00:42:53.110867184 +0000
++++ vim74/runtime/doc/usr_41.txt        2014-07-21 23:33:15.946862416 +0000
 @@ -1,4 +1,4 @@
 -*usr_41.txt*   For Vim version 7.4.  Last change: 2013 Feb 20
-+*usr_41.txt*   For Vim version 7.4.  Last change: 2014 Apr 05
++*usr_41.txt*   For Vim version 7.4.  Last change: 2014 May 28
  
                      VIM USER MANUAL - by Bram Moolenaar
@@ -23248 +23949 @@
  Variables:                                             *var-functions*
         type()                  type of a variable
-@@ -697,11 +706,15 @@
+@@ -697,11 +706,16 @@
         wincol()                window column number of the cursor
         winline()               window line number of the cursor
@@ -23254 +23955 @@
 +       screencol()             get screen column of the cursor
 +       screenrow()             get screen row of the cursor
++       getcurpos()             get position of the cursor
         getpos()                get position of cursor, mark, etc.
         setpos()                set position of cursor, mark, etc.
@@ -23264 +23966 @@
  Working with text in the current buffer:               *text-functions*
         getline()               get a line or list of lines from the buffer
-@@ -729,6 +742,7 @@
+@@ -729,6 +743,7 @@
         pathshorten()           shorten directory names in a path
         simplify()              simplify a path without changing its meaning
@@ -23272 +23974 @@
         filewritable()          check if a file can be written to
         getfperm()              get the permissions of a file
-@@ -741,7 +755,8 @@
+@@ -741,7 +756,8 @@
         mkdir()                 create a new directory
         delete()                delete a file
@@ -23282 +23984 @@
         readfile()              read a file into a List of lines
         writefile()             write a List of lines into a file
-@@ -757,6 +772,7 @@
+@@ -757,6 +773,7 @@
  Buffers, windows and the argument list:
         argc()                  number of entries in the argument list
@@ -23290 +23992 @@
         bufexists()             check if a buffer exists
         buflisted()             check if a buffer exists and is listed
-@@ -883,14 +899,22 @@
+@@ -810,6 +827,7 @@
+        synconcealed()          get info about concealing
+        diff_hlID()             get highlight ID for diff mode at a position
+        matchadd()              define a pattern to highlight (a "match")
++       matchaddpos()           define a list of positions to highlight
+        matcharg()              get info about |:match| arguments
+        matchdelete()           delete a match defined by |matchadd()| or a
+                                |:match| command
+@@ -883,14 +901,22 @@
         libcall()               call a function in an external library
         libcallnr()             idem, returning a number
@@ -23315 +24025 @@
 diff -Naur vim74.orig/runtime/doc/usr_42.txt vim74/runtime/doc/usr_42.txt
 --- vim74.orig/runtime/doc/usr_42.txt   2013-08-10 11:25:05.000000000 +0000
-+++ vim74/runtime/doc/usr_42.txt        2014-06-01 00:42:53.120867159 +0000
++++ vim74/runtime/doc/usr_42.txt        2014-07-21 23:33:15.973529013 +0000
 @@ -311,7 +311,7 @@
  item with a bitmap.  For example, define a new toolbar item with: >
@@ -23327 +24037 @@
 diff -Naur vim74.orig/runtime/doc/usr_45.txt vim74/runtime/doc/usr_45.txt
 --- vim74.orig/runtime/doc/usr_45.txt   2013-08-10 11:25:06.000000000 +0000
-+++ vim74/runtime/doc/usr_45.txt        2014-06-01 00:42:53.167533707 +0000
++++ vim74/runtime/doc/usr_45.txt        2014-07-21 23:33:16.006862259 +0000
 @@ -328,8 +328,8 @@
  *45.5* Entering language text
@@ -23341 +24051 @@
 diff -Naur vim74.orig/runtime/doc/various.txt vim74/runtime/doc/various.txt
 --- vim74.orig/runtime/doc/various.txt  2013-08-10 11:25:06.000000000 +0000
-+++ vim74/runtime/doc/various.txt       2014-06-01 00:42:53.190866981 +0000
++++ vim74/runtime/doc/various.txt       2014-07-21 23:33:16.030195531 +0000
 @@ -1,4 +1,4 @@
 -*various.txt*   For Vim version 7.4.  Last change: 2013 May 18
@@ -23427 +24137 @@
 diff -Naur vim74.orig/runtime/doc/version5.txt vim74/runtime/doc/version5.txt
 --- vim74.orig/runtime/doc/version5.txt 2013-08-10 11:25:07.000000000 +0000
-+++ vim74/runtime/doc/version5.txt      2014-06-01 00:42:53.237533529 +0000
++++ vim74/runtime/doc/version5.txt      2014-07-21 23:33:16.090195375 +0000
 @@ -2020,7 +2020,7 @@
  
@@ -23439 +24149 @@
 diff -Naur vim74.orig/runtime/doc/version7.txt vim74/runtime/doc/version7.txt
 --- vim74.orig/runtime/doc/version7.txt 2013-08-10 12:23:06.000000000 +0000
-+++ vim74/runtime/doc/version7.txt      2014-06-01 00:42:53.430866370 +0000
++++ vim74/runtime/doc/version7.txt      2014-07-21 23:33:16.276861554 +0000
 @@ -1,4 +1,4 @@
 -*version7.txt*  For Vim version 7.4.  Last change: 2013 Aug 10
@@ -23483 +24193 @@
 diff -Naur vim74.orig/runtime/doc/vi_diff.txt vim74/runtime/doc/vi_diff.txt
 --- vim74.orig/runtime/doc/vi_diff.txt  2013-08-10 11:25:07.000000000 +0000
-+++ vim74/runtime/doc/vi_diff.txt       2014-06-01 00:42:53.477532917 +0000
++++ vim74/runtime/doc/vi_diff.txt       2014-07-21 23:33:16.303528151 +0000
 @@ -1,4 +1,4 @@
 -*vi_diff.txt*   For Vim version 7.4.  Last change: 2012 Aug 08
@@ -23510 +24220 @@
 diff -Naur vim74.orig/runtime/doc/visual.txt vim74/runtime/doc/visual.txt
 --- vim74.orig/runtime/doc/visual.txt   2013-08-10 11:25:08.000000000 +0000
-+++ vim74/runtime/doc/visual.txt        2014-06-01 00:42:53.920865122 +0000
++++ vim74/runtime/doc/visual.txt        2014-07-21 23:33:16.740193679 +0000
 @@ -1,4 +1,4 @@
 -*visual.txt*    For Vim version 7.4.  Last change: 2012 Aug 15
@@ -23541 +24251 @@
 diff -Naur vim74.orig/runtime/doc/windows.txt vim74/runtime/doc/windows.txt
 --- vim74.orig/runtime/doc/windows.txt  2013-08-10 11:25:08.000000000 +0000
-+++ vim74/runtime/doc/windows.txt       2014-06-01 00:42:53.937531746 +0000
++++ vim74/runtime/doc/windows.txt       2014-07-21 23:33:16.756860302 +0000
 @@ -1,4 +1,4 @@
 -*windows.txt*   For Vim version 7.4.  Last change: 2012 Nov 15
@@ -23577 +24287 @@
 diff -Naur vim74.orig/runtime/filetype.vim vim74/runtime/filetype.vim
 --- vim74.orig/runtime/filetype.vim     2013-08-03 15:50:05.000000000 +0000
-+++ vim74/runtime/filetype.vim  2014-06-01 00:42:54.130864587 +0000
++++ vim74/runtime/filetype.vim  2014-07-21 23:33:16.946859806 +0000
 @@ -1,7 +1,7 @@
  " Vim support file to detect file types
@@ -23583 +24293 @@
  " Maintainer:  Bram Moolenaar <Bram@vim.org>
 -" Last Change: 2013 Aug 03
-+" Last Change: 2014 Feb 26
++" Last Change: 2014 Jul 16
  
  " Listen very carefully, I will say this only once
@@ -23664 +24374 @@
  
  " ERicsson LANGuage; Yaws is erlang too
+@@ -843,7 +864,7 @@
+       setf xhtml
+       return
+     endif
+-    if getline(n) =~ '{%\s*\(extends\|block\)\>'
++    if getline(n) =~ '{%\s*\(extends\|block\|load\)\>'
+       setf htmldjango
+       return
+     endif
 @@ -952,6 +973,9 @@
  " Inno Setup
@@ -23674 +24393 @@
  au BufNewFile,BufRead *.jal,*.JAL              setf jal
  
-@@ -1014,7 +1038,7 @@
+@@ -965,7 +989,7 @@
+ au BufNewFile,BufRead *.jj,*.jjt               setf javacc
+ 
+ " JavaScript, ECMAScript
+-au BufNewFile,BufRead *.js,*.javascript,*.es,*.jsx,*.json   setf javascript
++au BufNewFile,BufRead *.js,*.javascript,*.es,*.jsx   setf javascript
+ 
+ " Java Server Pages
+ au BufNewFile,BufRead *.jsp                    setf jsp
+@@ -983,12 +1007,18 @@
+ " Jovial
+ au BufNewFile,BufRead *.jov,*.j73,*.jovial     setf jovial
+ 
++" JSON
++au BufNewFile,BufRead *.json                   setf json
++
+ " Kixtart
+ au BufNewFile,BufRead *.kix                    setf kix
+ 
+ " Kimwitu[++]
+ au BufNewFile,BufRead *.k                      setf kwt
+ 
++" Kivy
++au BufNewFile,BufRead *.kv                     setf kivy
++
+ " KDE script
+ au BufNewFile,BufRead *.ks                     setf kscript
+ 
+@@ -1014,7 +1044,7 @@
  au BufNewFile,BufRead *.ld                     setf ld
  
@@ -23683 +24430 @@
  " Libao
  au BufNewFile,BufRead */etc/libao.conf,*/.libao        setf libao
-@@ -1169,6 +1193,9 @@
+@@ -1169,6 +1199,9 @@
  " MGL
  au BufNewFile,BufRead *.mgl                    setf mgl
@@ -23693 +24440 @@
  au BufNewFile,BufRead *.mms                    call s:FTmms()
  
-@@ -2058,14 +2085,15 @@
+@@ -1619,6 +1652,20 @@
+   au BufNewFile,BufRead *.rnw,*.snw                    setf rnoweb
+ endif
+ 
++" R Markdown file
++if has("fname_case")
++  au BufNewFile,BufRead *.Rmd,*.rmd,*.Smd,*.smd                setf rmd
++else
++  au BufNewFile,BufRead *.rmd,*.smd                    setf rmd
++endif
++
++" R reStructuredText file
++if has("fname_case")
++  au BufNewFile,BufRead *.Rrst,*.rrst,*.Srst,*.srst    setf rrst
++else
++  au BufNewFile,BufRead *.rrst,*.srst                  setf rrst
++endif
++
+ " Rexx, Rebol or R
+ au BufNewFile,BufRead *.r,*.R                  call s:FTr()
+ 
+@@ -2058,14 +2105,15 @@
  " SVG (Scalable Vector Graphics)
  au BufNewFile,BufRead *.svg                    setf svg
@@ -23712 +24480 @@
      return 1
    endif
-@@ -2092,7 +2120,7 @@
+@@ -2092,7 +2140,7 @@
  
  " Task
@@ -23721 +24489 @@
  " Tcl (JACL too)
  au BufNewFile,BufRead *.tcl,*.tk,*.itcl,*.itk,*.jacl   setf tcl
-@@ -2217,12 +2245,12 @@
+@@ -2217,12 +2265,12 @@
  au BufNewFile,BufRead */etc/updatedb.conf      setf updatedb
  
@@ -23738 +24506 @@
  " Vera
  au BufNewFile,BufRead *.vr,*.vri,*.vrh         setf vera
-@@ -2233,6 +2261,9 @@
+@@ -2233,6 +2281,9 @@
  " Verilog-AMS HDL
  au BufNewFile,BufRead *.va,*.vams              setf verilogams
@@ -23748 +24516 @@
  au BufNewFile,BufRead *.hdl,*.vhd,*.vhdl,*.vbe,*.vst  setf vhdl
  au BufNewFile,BufRead *.vhdl_[0-9]*            call s:StarSetf('vhdl')
-@@ -2405,7 +2436,7 @@
+@@ -2405,7 +2456,7 @@
  au BufNewFile,BufRead *.xsl,*.xslt             setf xslt
  
@@ -23757 +24525 @@
  " Yacc or racc
  au BufNewFile,BufRead *.y                      call s:FTy()
+@@ -2630,7 +2681,7 @@
+ 
+ " Plain text files, needs to be far down to not override others.  This avoids
+ " the "conf" type being used if there is a line starting with '#'.
+-au BufNewFile,BufRead *.txt,*.text             setf text
++au BufNewFile,BufRead *.txt,*.text,README      setf text
+ 
+ 
+ " Use the filetype detect plugins.  They may overrule any of the previously
 diff -Naur vim74.orig/runtime/ftplugin/changelog.vim vim74/runtime/ftplugin/changelog.vim
 --- vim74.orig/runtime/ftplugin/changelog.vim   2012-08-23 20:47:22.000000000 +0000
-+++ vim74/runtime/ftplugin/changelog.vim        2014-06-01 00:42:54.380863951 +0000
++++ vim74/runtime/ftplugin/changelog.vim        2014-07-21 23:33:17.186859180 +0000
 @@ -1,7 +1,7 @@
  " Vim filetype plugin file
@@ -23874 +24651 @@
 diff -Naur vim74.orig/runtime/ftplugin/clojure.vim vim74/runtime/ftplugin/clojure.vim
 --- vim74.orig/runtime/ftplugin/clojure.vim     2013-02-06 14:35:23.000000000 +0000
-+++ vim74/runtime/ftplugin/clojure.vim  2014-06-01 00:42:54.384197276 +0000
++++ vim74/runtime/ftplugin/clojure.vim  2014-07-21 23:33:17.193525829 +0000
 @@ -1,44 +1,60 @@
  " Vim filetype plugin file
@@ -24006 +24783 @@
 diff -Naur vim74.orig/runtime/ftplugin/cobol.vim vim74/runtime/ftplugin/cobol.vim
 --- vim74.orig/runtime/ftplugin/cobol.vim       2010-05-15 11:04:03.000000000 +0000
-+++ vim74/runtime/ftplugin/cobol.vim    2014-06-01 00:42:54.400863900 +0000
++++ vim74/runtime/ftplugin/cobol.vim    2014-07-21 23:33:17.206859127 +0000
 @@ -1,7 +1,7 @@
  " Vim filetype plugin file
@@ -24055 +24832 @@
 diff -Naur vim74.orig/runtime/ftplugin/debchangelog.vim vim74/runtime/ftplugin/debchangelog.vim
 --- vim74.orig/runtime/ftplugin/debchangelog.vim        2012-02-04 19:59:23.000000000 +0000
-+++ vim74/runtime/ftplugin/debchangelog.vim     2014-06-01 00:42:54.534196894 +0000
++++ vim74/runtime/ftplugin/debchangelog.vim     2014-07-21 23:33:17.316858840 +0000
 @@ -3,7 +3,7 @@
  " Maintainer:   Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
@@ -24076 +24853 @@
 diff -Naur vim74.orig/runtime/ftplugin/fortran.vim vim74/runtime/ftplugin/fortran.vim
 --- vim74.orig/runtime/ftplugin/fortran.vim     2012-04-18 07:32:40.000000000 +0000
-+++ vim74/runtime/ftplugin/fortran.vim  2014-06-01 00:42:54.750863009 +0000
++++ vim74/runtime/ftplugin/fortran.vim  2014-07-21 23:33:17.536858266 +0000
 @@ -1,12 +1,12 @@
  " Vim settings file
@@ -24126 +24903 @@
  
  let &cpoptions=s:cposet
+diff -Naur vim74.orig/runtime/ftplugin/html.vim vim74/runtime/ftplugin/html.vim
+--- vim74.orig/runtime/ftplugin/html.vim        2012-03-11 13:50:46.000000000 +0000
++++ vim74/runtime/ftplugin/html.vim     2014-07-21 23:33:17.760191017 +0000
+@@ -20,49 +20,9 @@
+     setlocal formatoptions-=t formatoptions+=croql
+ endif
+ 
+-
+ if exists('&omnifunc')
+-    " Distinguish between HTML versions
+-    " To use with other HTML versions add another
+-    " elseif condition to match proper DOCTYPE
+-    setlocal omnifunc=htmlcomplete#CompleteTags
+-
+-    if &filetype == 'xhtml'
+-            let b:html_omni_flavor = 'xhtml10s'
+-    else
+-            let b:html_omni_flavor = 'html401t'
+-    endif
+-    let i = 1
+-    let line = ""
+-    while i < 10 && i < line("$")
+-        let line = getline(i)
+-        if line =~ '<!DOCTYPE.*\<DTD '
+-            break
+-        endif
+-        let i += 1
+-    endwhile
+-    if line =~ '<!DOCTYPE.*\<DTD '  " doctype line found above
+-        if line =~ ' HTML 3\.2'
+-            let b:html_omni_flavor = 'html32'
+-        elseif line =~ ' XHTML 1\.1'
+-            let b:html_omni_flavor = 'xhtml11'
+-        else    " two-step detection with strict/frameset/transitional
+-            if line =~ ' XHTML 1\.0'
+-                let b:html_omni_flavor = 'xhtml10'
+-            elseif line =~ ' HTML 4\.01'
+-                let b:html_omni_flavor = 'html401'
+-            elseif line =~ ' HTML 4.0\>'
+-                let b:html_omni_flavor = 'html40'
+-            endif
+-            if line =~ '\<Transitional\>'
+-                let b:html_omni_flavor .= 't'
+-            elseif line =~ '\<Frameset\>'
+-                let b:html_omni_flavor .= 'f'
+-            else
+-                let b:html_omni_flavor .= 's'
+-            endif
+-        endif
+-    endif
++  setlocal omnifunc=htmlcomplete#CompleteTags
++  call htmlcomplete#DetectOmniFlavor()
+ endif
+ 
+ " HTML:  thanks to Johannes Zellner and Benji Fisher.
 diff -Naur vim74.orig/runtime/ftplugin/j.vim vim74/runtime/ftplugin/j.vim
 --- vim74.orig/runtime/ftplugin/j.vim   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/runtime/ftplugin/j.vim        2014-06-01 00:42:55.014195672 +0000
++++ vim74/runtime/ftplugin/j.vim        2014-07-21 23:33:17.823524185 +0000
 @@ -0,0 +1,75 @@
 +" Vim filetype plugin
@@ -24207 +25039 @@
 diff -Naur vim74.orig/runtime/ftplugin/jproperties.vim vim74/runtime/ftplugin/jproperties.vim
 --- vim74.orig/runtime/ftplugin/jproperties.vim 1970-01-01 00:00:00.000000000 +0000
-+++ vim74/runtime/ftplugin/jproperties.vim      2014-06-01 00:42:55.057528895 +0000
++++ vim74/runtime/ftplugin/jproperties.vim      2014-07-21 23:33:17.863524080 +0000
 @@ -0,0 +1,15 @@
 +" Vim filetype plugin
@@ -24224 +25056 @@
 +
 +let b:undo_ftplugin = "setl cms< com< fo<"
+diff -Naur vim74.orig/runtime/ftplugin/json.vim vim74/runtime/ftplugin/json.vim
+--- vim74.orig/runtime/ftplugin/json.vim        1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/ftplugin/json.vim     2014-07-21 23:33:17.896857327 +0000
+@@ -0,0 +1,17 @@
++" Vim filetype plugin
++" Language:            JSON
++" Maintainer:          David Barnett <daviebdawg+vim@gmail.com>
++" Last Change:         2014 Jul 16
++
++if exists('b:did_ftplugin')
++  finish
++endif
++let b:did_ftplugin = 1
++
++let b:undo_ftplugin = 'setlocal formatoptions< comments< commentstring<'
++
++setlocal formatoptions-=t
++
++" JSON has no comments.
++setlocal comments=
++setlocal commentstring=
 diff -Naur vim74.orig/runtime/ftplugin/lisp.vim vim74/runtime/ftplugin/lisp.vim
 --- vim74.orig/runtime/ftplugin/lisp.vim        2013-02-13 11:35:55.000000000 +0000
-+++ vim74/runtime/ftplugin/lisp.vim     2014-06-01 00:42:55.154195315 +0000
++++ vim74/runtime/ftplugin/lisp.vim     2014-07-21 23:33:18.006857040 +0000
 @@ -4,7 +4,7 @@
  " URL:          http://sites.google.com/site/khorser/opensource/vim
@@ -24248 +25101 @@
 diff -Naur vim74.orig/runtime/ftplugin/python.vim vim74/runtime/ftplugin/python.vim
 --- vim74.orig/runtime/ftplugin/python.vim      2012-04-30 11:49:26.000000000 +0000
-+++ vim74/runtime/ftplugin/python.vim   2014-06-01 00:42:55.670860666 +0000
++++ vim74/runtime/ftplugin/python.vim   2014-07-21 23:33:18.453522541 +0000
 @@ -1,7 +1,8 @@
  " Vim filetype plugin file
@@ -24329 +25182 @@
  let &cpo = s:keepcpo
  unlet s:keepcpo
+diff -Naur vim74.orig/runtime/ftplugin/r.vim vim74/runtime/ftplugin/r.vim
+--- vim74.orig/runtime/ftplugin/r.vim   1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/ftplugin/r.vim        2014-07-21 23:33:18.483522462 +0000
+@@ -0,0 +1,31 @@
++" Vim filetype plugin file
++" Language: R
++" Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
++" Last Change: Sun Feb 23, 2014  04:07PM
++
++" Only do this when not yet done for this buffer
++if exists("b:did_ftplugin")
++  finish
++endif
++
++" Don't load another plugin for this buffer
++let b:did_ftplugin = 1
++
++let s:cpo_save = &cpo
++set cpo&vim
++
++setlocal iskeyword=@,48-57,_,.
++setlocal formatoptions-=t
++setlocal commentstring=#\ %s
++setlocal comments=:#',:###,:##,:#
++
++if has("gui_win32") && !exists("b:browsefilter")
++  let b:browsefilter = "R Source Files (*.R)\t*.R\n" .
++        \ "Files that include R (*.Rnw *.Rd *.Rmd *.Rrst)\t*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
++        \ "All Files (*.*)\t*.*\n"
++endif
++
++let b:undo_ftplugin = "setl cms< com< fo< isk< | unlet! b:browsefilter"
++
++let &cpo = s:cpo_save
++unlet s:cpo_save
 diff -Naur vim74.orig/runtime/ftplugin/registry.vim vim74/runtime/ftplugin/registry.vim
 --- vim74.orig/runtime/ftplugin/registry.vim    1970-01-01 00:00:00.000000000 +0000
-+++ vim74/runtime/ftplugin/registry.vim 2014-06-01 00:42:55.717527214 +0000
++++ vim74/runtime/ftplugin/registry.vim 2014-07-21 23:33:18.523522358 +0000
 @@ -0,0 +1,36 @@
 +" Vim filetype plugin file
@@ -24369 +25257 @@
 +let &cpo = s:cpo_save
 +unlet s:cpo_save
+diff -Naur vim74.orig/runtime/ftplugin/rhelp.vim vim74/runtime/ftplugin/rhelp.vim
+--- vim74.orig/runtime/ftplugin/rhelp.vim       1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/ftplugin/rhelp.vim    2014-07-21 23:33:18.536855656 +0000
+@@ -0,0 +1,29 @@
++" Vim filetype plugin file
++" Language: R help file
++" Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
++" Last Change: Wed Jul 09, 2014  06:23PM
++
++" Only do this when not yet done for this buffer
++if exists("b:did_ftplugin")
++  finish
++endif
++
++" Don't load another plugin for this buffer
++let b:did_ftplugin = 1
++
++let s:cpo_save = &cpo
++set cpo&vim
++
++setlocal iskeyword=@,48-57,_,.
++
++if has("gui_win32") && !exists("b:browsefilter")
++  let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
++        \ "All Files (*.*)\t*.*\n"
++endif
++
++let b:undo_ftplugin = "setl isk< | unlet! b:browsefilter"
++
++let &cpo = s:cpo_save
++unlet s:cpo_save
++
++" vim: sw=2
+diff -Naur vim74.orig/runtime/ftplugin/rmd.vim vim74/runtime/ftplugin/rmd.vim
+--- vim74.orig/runtime/ftplugin/rmd.vim 1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/ftplugin/rmd.vim      2014-07-21 23:33:18.563522253 +0000
+@@ -0,0 +1,43 @@
++" Vim filetype plugin file
++" Language: R help file
++" Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
++" Last Change: Wed Jul 09, 2014  06:23PM
++" Original work by Alex Zvoleff (adjusted for rmd by Michel Kuhlmann)
++
++" Only do this when not yet done for this buffer
++if exists("b:did_ftplugin")
++  finish
++endif
++
++runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
++
++setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=>\ %s
++setlocal formatoptions+=tcqln
++setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+
++setlocal iskeyword=@,48-57,_,.
++
++let s:cpo_save = &cpo
++set cpo&vim
++
++" Enables pandoc if it is installed
++unlet! b:did_ftplugin
++runtime ftplugin/pandoc.vim
++
++" Don't load another plugin for this buffer
++let b:did_ftplugin = 1
++
++if has("gui_win32") && !exists("b:browsefilter")
++  let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
++        \ "All Files (*.*)\t*.*\n"
++endif
++
++if exists('b:undo_ftplugin')
++  let b:undo_ftplugin .= " | setl cms< com< fo< flp< isk< | unlet! b:browsefilter"
++else
++  let b:undo_ftplugin = "setl cms< com< fo< flp< isk< | unlet! b:browsefilter"
++endif
++
++let &cpo = s:cpo_save
++unlet s:cpo_save
++
++" vim: sw=2
+diff -Naur vim74.orig/runtime/ftplugin/rnoweb.vim vim74/runtime/ftplugin/rnoweb.vim
+--- vim74.orig/runtime/ftplugin/rnoweb.vim      1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/ftplugin/rnoweb.vim   2014-07-21 23:33:18.580188877 +0000
+@@ -0,0 +1,40 @@
++" Vim filetype plugin file
++" Language: Rnoweb
++" Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
++" Last Change: Wed Jul 09, 2014  06:23PM
++
++" Only do this when not yet done for this buffer
++if exists("b:did_ftplugin")
++  finish
++endif
++
++let s:cpo_save = &cpo
++set cpo&vim
++
++runtime! ftplugin/tex.vim
++
++" Don't load another plugin for this buffer
++let b:did_ftplugin = 1
++
++" Enables Vim-Latex-Suite, LaTeX-Box if installed
++runtime ftplugin/tex_*.vim
++
++setlocal iskeyword=@,48-57,_,.
++setlocal suffixesadd=.bib,.tex
++setlocal comments=b:%,b:#,b:##,b:###,b:#'
++
++if has("gui_win32") && !exists("b:browsefilter")
++  let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
++        \ "All Files (*.*)\t*.*\n"
++endif
++
++if exists('b:undo_ftplugin')
++  let b:undo_ftplugin .= " | setl isk< sua< com< | unlet! b:browsefilter"
++else
++  let b:undo_ftplugin = "setl isk< sua< com< | unlet! b:browsefilter"
++endif
++
++let &cpo = s:cpo_save
++unlet s:cpo_save
++
++" vim: sw=2
+diff -Naur vim74.orig/runtime/ftplugin/rrst.vim vim74/runtime/ftplugin/rrst.vim
+--- vim74.orig/runtime/ftplugin/rrst.vim        1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/ftplugin/rrst.vim     2014-07-21 23:33:18.586855526 +0000
+@@ -0,0 +1,37 @@
++" Vim filetype plugin file
++" Language: reStructuredText documentation format with R code
++" Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
++" Last Change: Wed Jul 09, 2014  06:23PM
++" Original work by Alex Zvoleff
++
++" Only do this when not yet done for this buffer
++if exists("b:did_ftplugin")
++  finish
++endif
++
++" Don't load another plugin for this buffer
++let b:did_ftplugin = 1
++
++let s:cpo_save = &cpo
++set cpo&vim
++
++setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=>\ %s
++setlocal formatoptions+=tcqln
++setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+
++setlocal iskeyword=@,48-57,_,.
++
++if has("gui_win32") && !exists("b:browsefilter")
++  let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
++        \ "All Files (*.*)\t*.*\n"
++endif
++
++if exists('b:undo_ftplugin')
++  let b:undo_ftplugin .= " | setl cms< com< fo< flp< isk< | unlet! b:browsefilter"
++else
++  let b:undo_ftplugin = "setl cms< com< fo< flp< isk< | unlet! b:browsefilter"
++endif
++
++let &cpo = s:cpo_save
++unlet s:cpo_save
++
++" vim: sw=2
 diff -Naur vim74.orig/runtime/ftplugin/scheme.vim vim74/runtime/ftplugin/scheme.vim
 --- vim74.orig/runtime/ftplugin/scheme.vim      2013-02-13 11:35:55.000000000 +0000
-+++ vim74/runtime/ftplugin/scheme.vim   2014-06-01 00:42:55.780860386 +0000
++++ vim74/runtime/ftplugin/scheme.vim   2014-07-21 23:33:18.620188772 +0000
 @@ -4,7 +4,7 @@
  " URL:          http://sites.google.com/site/khorser/opensource/vim
@@ -24394 +25447 @@
 diff -Naur vim74.orig/runtime/ftplugin/spec.vim vim74/runtime/ftplugin/spec.vim
 --- vim74.orig/runtime/ftplugin/spec.vim        2012-03-07 12:16:03.000000000 +0000
-+++ vim74/runtime/ftplugin/spec.vim     2014-06-01 00:42:55.910860055 +0000
++++ vim74/runtime/ftplugin/spec.vim     2014-07-21 23:33:18.763521732 +0000
 @@ -1,7 +1,8 @@
  " Plugin to update the %changelog section of RPM spec files
@@ -24419 +25472 @@
 diff -Naur vim74.orig/runtime/ftplugin/systemverilog.vim vim74/runtime/ftplugin/systemverilog.vim
 --- vim74.orig/runtime/ftplugin/systemverilog.vim       1970-01-01 00:00:00.000000000 +0000
-+++ vim74/runtime/ftplugin/systemverilog.vim    2014-06-01 00:42:55.994193176 +0000
++++ vim74/runtime/ftplugin/systemverilog.vim    2014-07-21 23:33:18.843521523 +0000
 @@ -0,0 +1,11 @@
 +" Vim filetype plugin file
@@ -24432 +25485 @@
 +" Behaves just like Verilog
 +runtime! ftplugin/verilog.vim
+diff -Naur vim74.orig/runtime/ftplugin/text.vim vim74/runtime/ftplugin/text.vim
+--- vim74.orig/runtime/ftplugin/text.vim        1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/ftplugin/text.vim     2014-07-21 23:33:18.910188015 +0000
+@@ -0,0 +1,17 @@
++" Vim filetype plugin
++" Language:            Text
++" Maintainer:          David Barnett <daviebdawg+vim@gmail.com>
++" Last Change:         2014 Jul 09
++
++if exists('b:did_ftplugin')
++  finish
++endif
++let b:did_ftplugin = 1
++
++let b:undo_ftplugin = 'setlocal comments< commentstring<'
++
++" We intentionally don't set formatoptions-=t since text should wrap as text.
++
++" Pseudo comment leaders to indent bulleted lists.
++setlocal comments=fb:-,fb:*
++setlocal commentstring=
 diff -Naur vim74.orig/runtime/indent/clojure.vim vim74/runtime/indent/clojure.vim
 --- vim74.orig/runtime/indent/clojure.vim       2013-02-06 14:35:23.000000000 +0000
-+++ vim74/runtime/indent/clojure.vim    2014-06-01 00:42:56.610858273 +0000
++++ vim74/runtime/indent/clojure.vim    2014-07-21 23:33:19.486853177 +0000
 @@ -1,23 +1,27 @@
  " Vim indent file
@@ -25125 +26199 @@
 -" vim:sts=4 sw=4 et:
 +" vim:sts=8:sw=8:ts=8:noet
+diff -Naur vim74.orig/runtime/indent/html.vim vim74/runtime/indent/html.vim
+--- vim74.orig/runtime/indent/html.vim  2013-06-13 17:50:24.000000000 +0000
++++ vim74/runtime/indent/html.vim       2014-07-21 23:33:19.803519017 +0000
+@@ -1,505 +1,1003 @@
+ " Vim indent script for HTML
+-" General: "{{{
+-" File:                html.vim (Vimscript #2075)
+-" Author:      Andy Wokula <anwoku@yahoo.de>
+-" Last Change: 2013 Jun 12
+-" Rev Days:     13
+-" Version:     0.9
+-" Vim Version: Vim7
+-" Description:
+-"   Improved version of the distributed html indent script, faster on a
+-"   range of lines.
++" Header: "{{{
++" Maintainer:  Bram Moolenaar
++" Original Author: Andy Wokula <anwoku@yahoo.de>
++" Last Change: 2014 Jul 04
++" Version:     1.0
++" Description: HTML indent script with cached state for faster indenting on a
++"              range of lines.
++"              Supports template systems through hooks.
++"              Supports Closure stylesheets.
+ "
+ " Credits:
+ "      indent/html.vim (2006 Jun 05) from J. Zellner
+ "      indent/css.vim (2006 Dec 20) from N. Weibull
+ "
+ " History:
++" 2014 June    (v1.0) overhaul (Bram)
+ " 2012 Oct 21  (v0.9) added support for shiftwidth()
+ " 2011 Sep 09  (v0.8) added HTML5 tags (thx to J. Zuckerman)
+ " 2008 Apr 28  (v0.6) revised customization
+ " 2008 Mar 09  (v0.5) fixed 'indk' issue (thx to C.J. Robinson)
+-" }}}
++"}}}
+ 
+-" Init Folklore, check user settings (2nd time ++) "{{{
+-if exists("b:did_indent")
+-    finish
++" Init Folklore, check user settings (2nd time ++)
++if exists("b:did_indent") "{{{
++  finish
+ endif
+ let b:did_indent = 1
+ 
+ setlocal indentexpr=HtmlIndent()
+ setlocal indentkeys=o,O,<Return>,<>>,{,},!^F
+ 
+-let b:indent = {"lnum": -1}
+-let b:undo_indent = "set inde< indk<| unlet b:indent"
++" "j1" is included to make cindent() work better with Javascript.
++setlocal cino=j1
++" "J1" should be included, but it doen't work properly before 7.4.355.
++if has("patch-7.4.355")
++  setlocal cino+=J1
++endif
++" Before patch 7.4.355 indenting after "(function() {" does not work well, add
++" )2 to limit paren search.
++if !has("patch-7.4.355")
++  setlocal cino+=)2
++endif
++
++" Needed for % to work when finding start/end of a tag.
++setlocal matchpairs+=<:>
+ 
+-" Load Once:
+-if exists("*HtmlIndent")
+-    call HtmlIndent_CheckUserSettings()
+-    finish
++let b:undo_indent = "setlocal inde< indk< cino<"
++
++" b:hi_indent keeps state to speed up indenting consecutive lines.
++let b:hi_indent = {"lnum": -1}
++
++"""""" Code below this is loaded only once. """""
++if exists("*HtmlIndent") && !exists('g:force_reload_html')
++  call HtmlIndent_CheckUserSettings()
++  finish
+ endif
+ 
+-" Patch 7.3.694
++" shiftwidth() exists since patch 7.3.694
+ if exists('*shiftwidth')
+-    let s:ShiftWidth = function('shiftwidth')
++  let s:ShiftWidth = function('shiftwidth')
+ else
+-    func! s:ShiftWidth()
+-       return &shiftwidth
+-    endfunc
++  func! s:ShiftWidth()
++    return &shiftwidth
++  endfunc
+ endif
+ 
++" Allow for line continuation below.
+ let s:cpo_save = &cpo
+ set cpo-=C
+ "}}}
+ 
+-func! HtmlIndent_CheckUserSettings() "{{{
+-    if exists("g:html_indent_inctags")
+-       call s:AddITags(split(g:html_indent_inctags, ","))
+-    endif
+-    if exists("g:html_indent_autotags")
+-       call s:RemoveITags(split(g:html_indent_autotags, ","))
+-    endif
++" Check and process settings from b:html_indent and g:html_indent... variables.
++" Prefer using buffer-local settings over global settings, so that there can
++" be defaults for all HTML files and exceptions for specific types of HTML
++" files.
++func! HtmlIndent_CheckUserSettings()
++  "{{{
++  let inctags = ''
++  if exists("b:html_indent_inctags")
++    let inctags = b:html_indent_inctags
++  elseif exists("g:html_indent_inctags")
++    let inctags = g:html_indent_inctags
++  endif
++  let b:hi_tags = {}
++  if len(inctags) > 0
++    call s:AddITags(b:hi_tags, split(inctags, ","))
++  endif
++
++  let autotags = ''
++  if exists("b:html_indent_autotags")
++    let autotags = b:html_indent_autotags
++  elseif exists("g:html_indent_autotags")
++    let autotags = g:html_indent_autotags
++  endif
++  let b:hi_removed_tags = {}
++  if autotags
++    call s:RemoveITags(b:hi_removed_tags, split(autotags, ","))
++  endif
++
++  " Syntax names indicating being inside a string of an attribute value.
++  let string_names = []
++  if exists("b:html_indent_string_names")
++    let string_names = b:html_indent_string_names
++  elseif exists("g:html_indent_string_names")
++    let string_names = g:html_indent_string_names
++  endif
++  let b:hi_insideStringNames = ['htmlString']
++  if len(string_names) > 0
++    for s in string_names
++      call add(b:hi_insideStringNames, s)
++    endfor
++  endif
+ 
+-    let indone = {"zero": 0
+-               \,"auto": "indent(prevnonblank(v:lnum-1))"
+-               \,"inc": "b:indent.blocktagind + s:ShiftWidth()"}
+-    if exists("g:html_indent_script1")
+-       let s:js1indent = get(indone, g:html_indent_script1, indone.zero)
+-    endif
+-    if exists("g:html_indent_style1")
+-       let s:css1indent = get(indone, g:html_indent_style1, indone.zero)
++  " Syntax names indicating being inside a tag.
++  let tag_names = []
++  if exists("b:html_indent_tag_names")
++    let tag_names = b:html_indent_tag_names
++  elseif exists("g:html_indent_tag_names")
++    let tag_names = g:html_indent_tag_names
++  endif
++  let b:hi_insideTagNames = ['htmlTag', 'htmlScriptTag']
++  if len(tag_names) > 0
++    for s in tag_names
++      call add(b:hi_insideTagNames, s)
++    endfor
++  endif
++
++  let indone = {"zero": 0
++              \,"auto": "indent(prevnonblank(v:lnum-1))"
++              \,"inc": "b:hi_indent.blocktagind + s:ShiftWidth()"}
++
++  let script1 = ''
++  if exists("b:html_indent_script1")
++    let script1 = b:html_indent_script1
++  elseif exists("g:html_indent_script1")
++    let script1 = g:html_indent_script1
++  endif
++  if len(script1) > 0
++    let b:hi_js1indent = get(indone, script1, indone.zero)
++  else
++    let b:hi_js1indent = 0
++  endif
++
++  let style1 = ''
++  if exists("b:html_indent_style1")
++    let style1 = b:html_indent_style1
++  elseif exists("g:html_indent_style1")
++    let style1 = g:html_indent_style1
++  endif
++  if len(style1) > 0
++    let b:hi_css1indent = get(indone, style1, indone.zero)
++  else
++    let b:hi_css1indent = 0
++  endif
++
++  if !exists('b:html_indent_line_limit')
++    if exists('g:html_indent_line_limit')
++      let b:html_indent_line_limit = g:html_indent_line_limit
++    else
++      let b:html_indent_line_limit = 200
+     endif
++  endif
+ endfunc "}}}
+ 
+-" Init Script Vars  "{{{
+-let s:usestate = 1
+-let s:css1indent = 0
+-let s:js1indent = 0
+-" not to be changed:
+-let s:endtags = [0,0,0,0,0,0,0,0]   " some places unused
+-let s:newstate = {}
++" Init Script Vars
++"{{{
++let b:hi_lasttick = 0
++let b:hi_newstate = {}
+ let s:countonly = 0
+  "}}}
+-func! s:AddITags(taglist) "{{{
+-    for itag in a:taglist
+-       let s:indent_tags[itag] = 1
+-       let s:indent_tags['/'.itag] = -1
+-    endfor
+-endfunc "}}}
+-func! s:AddBlockTag(tag, id, ...) "{{{
+-    if !(a:id >= 2 && a:id < 2+len(s:endtags))
+-       return
+-    endif
+-    let s:indent_tags[a:tag] = a:id
+-    if a:0 == 0
+-       let s:indent_tags['/'.a:tag] = -a:id
+-       let s:endtags[a:id-2] = "</".a:tag.">"
+-    else
+-       let s:indent_tags[a:1] = -a:id
+-       let s:endtags[a:id-2] = a:1
+-    endif
+-endfunc "}}}
+-func! s:RemoveITags(taglist) "{{{
+-    " remove itags (protect blocktags from being removed)
+-    for itag in a:taglist
+-       if !has_key(s:indent_tags, itag) || s:indent_tags[itag] != 1
+-           continue
+-       endif
+-       unlet s:indent_tags[itag]
+-       if itag =~ '^\w\+$'
+-           unlet s:indent_tags["/".itag]
+-       endif
+-    endfor
+-endfunc "}}}
+-" Add Indent Tags: {{{
+-if !exists("s:indent_tags")
+-    let s:indent_tags = {}
+-endif
+ 
+-" old tags:
+-call s:AddITags(['a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big',
+-    \ 'blockquote', 'button', 'caption', 'center', 'cite', 'code', 'colgroup',
+-    \ 'del', 'dfn', 'dir', 'div', 'dl', 'em', 'fieldset', 'font', 'form',
+-    \ 'frameset', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'i', 'iframe', 'ins', 'kbd',
+-    \ 'label', 'legend', 'map', 'menu', 'noframes', 'noscript', 'object', 'ol',
++" Fill the s:indent_tags dict with known tags.
++" The key is "tagname" or "/tagname".  {{{
++" The value is:
++" 1   opening tag
++" 2   "pre"
++" 3   "script"
++" 4   "style"
++" 5   comment start
++" -1  closing tag
++" -2  "/pre"
++" -3  "/script"
++" -4  "/style"
++" -5  comment end
++let s:indent_tags = {}
++let s:endtags = [0,0,0,0,0,0]   " long enough for the highest index
++"}}}
++
++" Add a list of tag names for a pair of <tag> </tag> to "tags".
++func! s:AddITags(tags, taglist)
++  "{{{
++  for itag in a:taglist
++    let a:tags[itag] = 1
++    let a:tags['/' . itag] = -1
++  endfor
++endfunc "}}}
++
++" Take a list of tag name pairs that are not to be used as tag pairs.
++func! s:RemoveITags(tags, taglist)
++  "{{{
++  for itag in a:taglist
++    let a:tags[itag] = 1
++    let a:tags['/' . itag] = 1
++  endfor
++endfunc "}}}
++
++" Add a block tag, that is a tag with a different kind of indenting.
++func! s:AddBlockTag(tag, id, ...)
++  "{{{
++  if !(a:id >= 2 && a:id < len(s:endtags))
++    echoerr 'AddBlockTag ' . a:id
++    return
++  endif
++  let s:indent_tags[a:tag] = a:id
++  if a:0 == 0
++    let s:indent_tags['/' . a:tag] = -a:id
++    let s:endtags[a:id] = "</" . a:tag . ">"
++  else
++    let s:indent_tags[a:1] = -a:id
++    let s:endtags[a:id] = a:1
++  endif
++endfunc "}}}
++
++" Add known tag pairs.
++" Self-closing tags and tags that are sometimes {{{
++" self-closing (e.g., <p>) are not here (when encountering </p> we can find
++" the matching <p>, but not the other way around).
++" Old HTML tags:
++call s:AddITags(s:indent_tags, [
++    \ 'a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big',
++    \ 'blockquote', 'body', 'button', 'caption', 'center', 'cite', 'code',
++    \ 'colgroup', 'del', 'dfn', 'dir', 'div', 'dl', 'em', 'fieldset', 'font',
++    \ 'form', 'frameset', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'html',
++    \ 'i', 'iframe', 'ins', 'kbd', 'label', 'legend', 'li',
++    \ 'map', 'menu', 'noframes', 'noscript', 'object', 'ol',
+     \ 'optgroup', 'q', 's', 'samp', 'select', 'small', 'span', 'strong', 'sub',
+     \ 'sup', 'table', 'textarea', 'title', 'tt', 'u', 'ul', 'var', 'th', 'td',
+-    \ 'tr', 'tfoot', 'thead'])
++    \ 'tr', 'tbody', 'tfoot', 'thead'])
+ 
+-" tags added 2011 Sep 09 (especially HTML5 tags):
+-call s:AddITags(['area', 'article', 'aside', 'audio', 'bdi', 'canvas',
++" Tags added 2011 Sep 09 (especially HTML5 tags):
++call s:AddITags(s:indent_tags, [
++    \ 'area', 'article', 'aside', 'audio', 'bdi', 'canvas',
+     \ 'command', 'datalist', 'details', 'embed', 'figure', 'footer',
+     \ 'header', 'group', 'keygen', 'mark', 'math', 'meter', 'nav', 'output',
+     \ 'progress', 'ruby', 'section', 'svg', 'texture', 'time', 'video',
+     \ 'wbr', 'text'])
+-
+ "}}}
+-" Add Block Tags: contain alien content "{{{
++
++" Add Block Tags: these contain alien content
++"{{{
+ call s:AddBlockTag('pre', 2)
+ call s:AddBlockTag('script', 3)
+ call s:AddBlockTag('style', 4)
+ call s:AddBlockTag('<!--', 5, '-->')
+ "}}}
+ 
+-func! s:CountITags(...) "{{{
+-
+-    " relative indent steps for current line [unit &sw]:
+-    let s:curind = 0
+-    " relative indent steps for next line [unit &sw]:
+-    let s:nextrel = 0
+-
+-    if a:0==0
+-       let s:block = s:newstate.block
+-       let tmpline = substitute(s:curline, '<\zs\/\=\w\+\>\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
+-       if s:block == 3
+-           let s:newstate.scripttype = s:GetScriptType(matchstr(tmpline, '\C.*<SCRIPT\>\zs[^>]*'))
+-       endif
+-       let s:newstate.block = s:block
+-    else
+-       let s:block = 0         " assume starting outside of a block
+-       let s:countonly = 1     " don't change state
+-       let tmpline = substitute(s:altline, '<\zs\/\=\w\+\>\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
+-       let s:countonly = 0
+-    endif
+-endfunc "}}}
+-func! s:CheckTag(itag) "{{{
+-    " "tag" or "/tag" or "<!--" or "-->"
+-    let ind = get(s:indent_tags, a:itag)
+-    if ind == -1
+-       " closing tag
+-       if s:block != 0
+-           " ignore itag within a block
+-           return "foo"
+-       endif
+-       if s:nextrel == 0
+-           let s:curind -= 1
+-       else
+-           let s:nextrel -= 1
+-       endif
+-       " if s:curind >= 1
+-       "     let s:curind -= 1
+-       " else
+-       "     let s:nextrel -= 1
+-       " endif
+-    elseif ind == 1
+-       " opening tag
+-       if s:block != 0
+-           return "foo"
+-       endif
+-       let s:nextrel += 1
+-    elseif ind != 0
+-       " block-tag (opening or closing)
+-       return s:Blocktag(a:itag, ind)
+-    endif
+-    " else ind==0 (other tag found): keep indent
+-    return "foo"   " no matter
+-endfunc "}}}
+-func! s:Blocktag(blocktag, ind) "{{{
+-    if a:ind > 0
+-       " a block starts here
+-       if s:block != 0
+-           " already in a block (nesting) - ignore
+-           " especially ignore comments after other blocktags
+-           return "foo"
+-       endif
+-       let s:block = a:ind             " block type
+-       if s:countonly
+-           return "foo"
+-       endif
+-       let s:newstate.blocklnr = v:lnum
+-       " save allover indent for the endtag
+-       let s:newstate.blocktagind = b:indent.baseindent + (s:nextrel + s:curind) * s:ShiftWidth()
+-       if a:ind == 3
+-           return "SCRIPT"    " all except this must be lowercase
+-           " line is to be checked again for the type attribute
+-       endif
+-    else
+-       let s:block = 0
+-       " we get here if starting and closing block-tag on same line
++" Return non-zero when "tagname" is an opening tag, not being a block tag, for
++" which there should be a closing tag.  Can be used by scripts that include
++" HTML indenting.
++func! HtmlIndent_IsOpenTag(tagname)
++  "{{{
++  if get(s:indent_tags, a:tagname) == 1
++    return 1
++  endif
++  return get(b:hi_tags, a:tagname) == 1
++endfunc "}}}
++
++" Get the value for "tagname", taking care of buffer-local tags.
++func! s:get_tag(tagname)
++  "{{{
++  let i = get(s:indent_tags, a:tagname)
++  if (i == 1 || i == -1) && get(b:hi_removed_tags, a:tagname) != 0
++    return 0
++  endif
++  if i == 0
++    let i = get(b:hi_tags, a:tagname)
++  endif
++  return i
++endfunc "}}}
++
++" Count the number of start and end tags in "text".
++func! s:CountITags(text)
++  "{{{
++  " Store the result in s:curind and s:nextrel.
++  let s:curind = 0  " relative indent steps for current line [unit &sw]:
++  let s:nextrel = 0  " relative indent steps for next line [unit &sw]:
++  let s:block = 0              " assume starting outside of a block
++  let s:countonly = 1  " don't change state
++  call substitute(a:text, '<\zs/\=\w\+\>\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
++  let s:countonly = 0
++endfunc "}}}
++
++" Count the number of start and end tags in text.
++func! s:CountTagsAndState(text)
++  "{{{
++  " Store the result in s:curind and s:nextrel.  Update b:hi_newstate.block.
++  let s:curind = 0  " relative indent steps for current line [unit &sw]:
++  let s:nextrel = 0  " relative indent steps for next line [unit &sw]:
++
++  let s:block = b:hi_newstate.block
++  let tmp = substitute(a:text, '<\zs/\=\w\+\>\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
++  if s:block == 3
++    let b:hi_newstate.scripttype = s:GetScriptType(matchstr(tmp, '\C.*<SCRIPT\>\zs[^>]*'))
++  endif
++  let b:hi_newstate.block = s:block
++endfunc "}}}
++
++" Used by s:CountITags() and s:CountTagsAndState().
++func! s:CheckTag(itag)
++  "{{{
++  " Returns an empty string or "SCRIPT".
++  " a:itag can be "tag" or "/tag" or "<!--" or "-->"
++  let ind = s:get_tag(a:itag)
++  if ind == -1
++    " closing tag
++    if s:block != 0
++      " ignore itag within a block
++      return ""
+     endif
+-    return "foo"
+-endfunc "}}}
+-func! s:GetScriptType(str) "{{{
+-    if a:str == "" || a:str =~ "java"
+-       return "javascript"
++    if s:nextrel == 0
++      let s:curind -= 1
+     else
+-       return ""
++      let s:nextrel -= 1
+     endif
+-endfunc "}}}
++  elseif ind == 1
++    " opening tag
++    if s:block != 0
++      return ""
++    endif
++    let s:nextrel += 1
++  elseif ind != 0
++    " block-tag (opening or closing)
++    return s:CheckBlockTag(a:itag, ind)
++  " else ind==0 (other tag found): keep indent
++  endif
++  return ""
++endfunc "}}}
++
++" Used by s:CheckTag(). Returns an empty string or "SCRIPT".
++func! s:CheckBlockTag(blocktag, ind)
++  "{{{
++  if a:ind > 0
++    " a block starts here
++    if s:block != 0
++      " already in a block (nesting) - ignore
++      " especially ignore comments after other blocktags
++      return ""
++    endif
++    let s:block = a:ind                " block type
++    if s:countonly
++      return ""
++    endif
++    let b:hi_newstate.blocklnr = v:lnum
++    " save allover indent for the endtag
++    let b:hi_newstate.blocktagind = b:hi_indent.baseindent + (s:nextrel + s:curind) * s:ShiftWidth()
++    if a:ind == 3
++      return "SCRIPT"    " all except this must be lowercase
++      " line is to be checked again for the type attribute
++    endif
++  else
++    let s:block = 0
++    " we get here if starting and closing a block-tag on the same line
++  endif
++  return ""
++endfunc "}}}
++
++" Return the <script> type: either "javascript" or ""
++func! s:GetScriptType(str)
++  "{{{
++  if a:str == "" || a:str =~ "java"
++    return "javascript"
++  else
++    return ""
++  endif
++endfunc "}}}
++
++" Look back in the file, starting at a:lnum - 1, to compute a state for the
++" start of line a:lnum.  Return the new state.
++func! s:FreshState(lnum)
++  "{{{
++  " A state is to know ALL relevant details about the
++  " lines 1..a:lnum-1, initial calculating (here!) can be slow, but updating is
++  " fast (incremental).
++  " TODO: this should be split up in detecting the block type and computing the
++  " indent for the block type, so that when we do not know the indent we do
++  " not need to clear the whole state and re-detect the block type again.
++  " State:
++  "    lnum            last indented line == prevnonblank(a:lnum - 1)
++  "    block = 0       a:lnum located within special tag: 0:none, 2:<pre>,
++  "                    3:<script>, 4:<style>, 5:<!--
++  "    baseindent      use this indent for line a:lnum as a start - kind of
++  "                    autoindent (if block==0)
++  "    scripttype = '' type attribute of a script tag (if block==3)
++  "    blocktagind     indent for current opening (get) and closing (set)
++  "                    blocktag (if block!=0)
++  "    blocklnr        lnum of starting blocktag (if block!=0)
++  "    inattr          line {lnum} starts with attributes of a tag
++  let state = {}
++  let state.lnum = prevnonblank(a:lnum - 1)
++  let state.scripttype = ""
++  let state.blocktagind = -1
++  let state.block = 0
++  let state.baseindent = 0
++  let state.blocklnr = 0
++  let state.inattr = 0
++
++  if state.lnum == 0
++    return state
++  endif
+ 
+-func! s:FreshState(lnum) "{{{
+-    " Look back in the file (lines 1 to a:lnum-1) to calc a state for line
+-    " a:lnum.  A state is to know ALL relevant details about the lines
+-    " 1..a:lnum-1, initial calculating (here!) can be slow, but updating is
+-    " fast (incremental).
+-    " State:
+-    "  lnum            last indented line == prevnonblank(a:lnum - 1)
+-    "  block = 0       a:lnum located within special tag: 0:none, 2:<pre>,
+-    "                  3:<script>, 4:<style>, 5:<!--
+-    "  baseindent      use this indent for line a:lnum as a start - kind of
+-    "                  autoindent (if block==0)
+-    "  scripttype = '' type attribute of a script tag (if block==3)
+-    "  blocktagind     indent for current opening (get) and closing (set)
+-    "                  blocktag (if block!=0)
+-    "  blocklnr        lnum of starting blocktag (if block!=0)
+-    "  inattr          line {lnum} starts with attributes of a tag
+-    let state = {}
+-    let state.lnum = prevnonblank(a:lnum - 1)
+-    let state.scripttype = ""
+-    let state.blocktagind = -1
+-    let state.block = 0
+-    let state.baseindent = 0
+-    let state.blocklnr = 0
+-    let state.inattr = 0
+-
+-    if state.lnum == 0
+-       return state
+-    endif
+-
+-    " Heuristic:
+-    " remember startline state.lnum
+-    " look back for <pre, </pre, <script, </script, <style, </style tags
+-    " remember stopline
+-    " if opening tag found,
+-    "  assume a:lnum within block
+-    " else
+-    "  look back in result range (stopline, startline) for comment
+-    "      \ delimiters (<!--, -->)
+-    "  if comment opener found,
+-    "      assume a:lnum within comment
+-    "  else
+-    "      assume usual html for a:lnum
+-    "      if a:lnum-1 has a closing comment
+-    "          look back to get indent of comment opener
+-    " FI
+-
+-    " look back for blocktag
+-    call cursor(a:lnum, 1)
+-    let [stopline, stopcol] = searchpos('\c<\zs\/\=\%(pre\>\|script\>\|style\>\)', "bW")
++  " Heuristic:
++  " remember startline state.lnum
++  " look back for <pre, </pre, <script, </script, <style, </style tags
++  " remember stopline
++  " if opening tag found,
++  "    assume a:lnum within block
++  " else
++  "    look back in result range (stopline, startline) for comment
++  "        \ delimiters (<!--, -->)
++  "    if comment opener found,
++  "        assume a:lnum within comment
++  "    else
++  "        assume usual html for a:lnum
++  "        if a:lnum-1 has a closing comment
++  "            look back to get indent of comment opener
++  " FI
++
++  " look back for a blocktag
++  call cursor(a:lnum, 1)
++  let [stopline, stopcol] = searchpos('\c<\zs\/\=\%(pre\>\|script\>\|style\>\)', "bW")
++  if stopline > 0
+     " fugly ... why isn't there searchstr()
+     let tagline = tolower(getline(stopline))
+-    let blocktag = matchstr(tagline, '\/\=\%(pre\>\|script\>\|style\>\)', stopcol-1)
+-    if stopline > 0 && blocktag[0] != "/"
+-       " opening tag found, assume a:lnum within block
+-       let state.block = s:indent_tags[blocktag]
+-       if state.block == 3
+-           let state.scripttype = s:GetScriptType(matchstr(tagline, '\>[^>]*', stopcol))
+-       endif
+-       let state.blocklnr = stopline
+-       " check preceding tags in the line:
+-       let s:altline = tagline[: stopcol-2]
+-       call s:CountITags(1)
+-       let state.blocktagind = indent(stopline) + (s:curind + s:nextrel) * s:ShiftWidth()
+-       return state
++    let blocktag = matchstr(tagline, '\/\=\%(pre\>\|script\>\|style\>\)', stopcol - 1)
++    if blocktag[0] != "/"
++      " opening tag found, assume a:lnum within block
++      let state.block = s:indent_tags[blocktag]
++      if state.block == 3
++        let state.scripttype = s:GetScriptType(matchstr(tagline, '\>[^>]*', stopcol))
++      endif
++      let state.blocklnr = stopline
++      " check preceding tags in the line:
++      call s:CountITags(tagline[: stopcol-2])
++      let state.blocktagind = indent(stopline) + (s:curind + s:nextrel) * s:ShiftWidth()
++      return state
+     elseif stopline == state.lnum
+-       " handle special case: previous line (= state.lnum) contains a
+-       " closing blocktag which is preceded by line-noise;
+-       " blocktag == "/..."
+-       let swendtag = match(tagline, '^\s*</') >= 0
+-       if !swendtag
+-           let [bline, bcol] = searchpos('<'.blocktag[1:].'\>', "bW")
+-           let s:altline = tolower(getline(bline)[: bcol-2])
+-           call s:CountITags(1)
+-           let state.baseindent = indent(bline) + (s:nextrel+s:curline) * s:ShiftWidth()
+-           return state
+-       endif
+-    endif
+-
+-    " else look back for comment
+-    call cursor(a:lnum, 1)
+-    let [comline, comcol, found] = searchpos('\(<!--\)\|-->', 'bpW', stopline)
+-    if found == 2
+-       " comment opener found, assume a:lnum within comment
+-       let state.block = 5
+-       let state.blocklnr = comline
+-       " check preceding tags in the line:
+-       let s:altline = tolower(getline(comline)[: comcol-2])
+-       call s:CountITags(1)
+-       let state.blocktagind = indent(comline) + (s:curind + s:nextrel) * s:ShiftWidth()
+-       return state
+-    endif
+-
+-    " else within usual html
+-    let s:altline = tolower(getline(state.lnum))
+-    " check a:lnum-1 for closing comment (we need indent from the opening line)
+-    let comcol = stridx(s:altline, '-->')
+-    if comcol >= 0
+-       call cursor(state.lnum, comcol+1)
+-       let [comline, comcol] = searchpos('<!--', 'bW')
+-       if comline == state.lnum
+-           let s:altline = s:altline[: comcol-2]
+-       else
+-           let s:altline = tolower(getline(comline)[: comcol-2])
+-       endif
+-       call s:CountITags(1)
+-       let state.baseindent = indent(comline) + (s:nextrel+s:curline) * s:ShiftWidth()
+-       return state
+-       " TODO check tags that follow "-->"
+-    endif
+-
+-    " else no comments
+-    call s:CountITags(1)
+-    let state.baseindent = indent(state.lnum) + s:nextrel * s:ShiftWidth()
+-    " line starts with end tag
+-    let swendtag = match(s:altline, '^\s*</') >= 0
+-    if !swendtag
+-       let state.baseindent += s:curind * s:ShiftWidth()
++      " handle special case: previous line (= state.lnum) contains a
++      " closing blocktag which is preceded by line-noise;
++      " blocktag == "/..."
++      let swendtag = match(tagline, '^\s*</') >= 0
++      if !swendtag
++        let [bline, bcol] = searchpos('<'.blocktag[1:].'\>', "bW")
++        call s:CountITags(tolower(getline(bline)[: bcol-2]))
++        let state.baseindent = indent(bline) + (s:curind + s:nextrel) * s:ShiftWidth()
++        return state
++      endif
++    endif
++  endif
++
++  " else look back for comment
++  call cursor(a:lnum, 1)
++  let [comlnum, comcol, found] = searchpos('\(<!--\)\|-->', 'bpW', stopline)
++  if found == 2
++    " comment opener found, assume a:lnum within comment
++    let state.block = 5
++    let state.blocklnr = comlnum
++    " check preceding tags in the line:
++    call s:CountITags(tolower(getline(comlnum)[: comcol-2]))
++    let state.blocktagind = indent(comlnum) + (s:curind + s:nextrel) * s:ShiftWidth()
++    return state
++  endif
++
++  " else within usual HTML
++  let text = tolower(getline(state.lnum))
++
++  " Check a:lnum-1 for closing comment (we need indent from the opening line).
++  " Not when other tags follow (might be --> inside a string).
++  let comcol = stridx(text, '-->')
++  if comcol >= 0 && match(text, '[<>]', comcol) <= 0
++    call cursor(state.lnum, comcol + 1)
++    let [comlnum, comcol] = searchpos('<!--', 'bW')
++    if comlnum == state.lnum
++      let text = text[: comcol-2]
++    else
++      let text = tolower(getline(comlnum)[: comcol-2])
+     endif
++    call s:CountITags(text)
++    let state.baseindent = indent(comlnum) + (s:curind + s:nextrel) * s:ShiftWidth()
++    " TODO check tags that follow "-->"
+     return state
+-endfunc "}}}
++  endif
++
++  " Check if the previous line starts with end tag.
++  let swendtag = match(text, '^\s*</') >= 0
+ 
+-func! s:Alien2() "{{{
+-    " <pre> block
++  " If previous line ended in a closing tag, line up with the opening tag.
++  if !swendtag && text =~ '</\w\+\s*>\s*$'
++    call cursor(state.lnum, 99999)
++    normal F<
++    let start_lnum = HtmlIndent_FindStartTag()
++    if start_lnum > 0
++      let state.baseindent = indent(start_lnum)
++      if col('.') > 2
++        " check for tags before the matching opening tag.
++        let text = getline(start_lnum)
++        let swendtag = match(text, '^\s*</') >= 0
++        call s:CountITags(text[: col('.') - 2])
++        let state.baseindent += s:nextrel * s:ShiftWidth()
++        if !swendtag
++          let state.baseindent += s:curind * s:ShiftWidth()
++        endif
++      endif
++      return state
++    endif
++  endif
++
++  " Else: no comments. Skip backwards to find the tag we're inside.
++  let [state.lnum, found] = HtmlIndent_FindTagStart(state.lnum)
++  " Check if that line starts with end tag.
++  let text = getline(state.lnum)
++  let swendtag = match(text, '^\s*</') >= 0
++  call s:CountITags(tolower(text))
++  let state.baseindent = indent(state.lnum) + s:nextrel * s:ShiftWidth()
++  if !swendtag
++    let state.baseindent += s:curind * s:ShiftWidth()
++  endif
++  return state
++endfunc "}}}
++
++" Indent inside a <pre> block: Keep indent as-is.
++func! s:Alien2()
++  "{{{
++  return -1
++endfunc "}}}
++
++" Return the indent inside a <script> block for javascript.
++func! s:Alien3()
++  "{{{
++  let lnum = prevnonblank(v:lnum - 1)
++  while lnum > 1 && getline(lnum) =~ '^\s*/[/*]'
++    " Skip over comments to avoid that cindent() aligns with the <script> tag
++    let lnum = prevnonblank(lnum - 1)
++  endwhile
++  if lnum == b:hi_indent.blocklnr
++    " indent for the first line after <script>
++    return eval(b:hi_js1indent)
++  endif
++  if b:hi_indent.scripttype == "javascript"
++    return cindent(v:lnum)
++  else
+     return -1
++  endif
+ endfunc "}}}
+-func! s:Alien3() "{{{
+-    " <script> javascript
+-    if prevnonblank(v:lnum-1) == b:indent.blocklnr
+-       " indent for the first line after <script>
+-       return eval(s:js1indent)
+-    endif
+-    if b:indent.scripttype == "javascript"
+-       return cindent(v:lnum)
++
++" Return the indent inside a <style> block.
++func! s:Alien4()
++  "{{{
++  if prevnonblank(v:lnum-1) == b:hi_indent.blocklnr
++    " indent for first content line
++    return eval(b:hi_css1indent)
++  endif
++  return s:CSSIndent()
++endfunc "}}}
++
++" Indending inside a <style> block.  Returns the indent.
++func! s:CSSIndent()
++  "{{{
++  " This handles standard CSS and also Closure stylesheets where special lines
++  " start with @.
++  " When the line starts with '*' or the previous line starts with "/*"
++  " and does not end in "*/", use C indenting to format the comment.
++  " Adopted $VIMRUNTIME/indent/css.vim
++  let curtext = getline(v:lnum)
++  if curtext =~ '^\s*[*]'
++        \ || (v:lnum > 1 && getline(v:lnum - 1) =~ '\s*/\*'
++        \     && getline(v:lnum - 1) !~ '\*/\s*$')
++    return cindent(v:lnum)
++  endif
++
++  let min_lnum = b:hi_indent.blocklnr
++  let prev_lnum = s:CssPrevNonComment(v:lnum - 1, min_lnum)
++  let [prev_lnum, found] = HtmlIndent_FindTagStart(prev_lnum)
++  if prev_lnum <= min_lnum
++    " Just below the <style> tag, indent for first content line after comments.
++    return eval(b:hi_css1indent)
++  endif
++
++  " If the current line starts with "}" align with it's match.
++  if curtext =~ '^\s*}'
++    call cursor(v:lnum, 1)
++    try
++      normal! %
++      " Found the matching "{", align with it after skipping unfinished lines.
++      let align_lnum = s:CssFirstUnfinished(line('.'), min_lnum)
++      return indent(align_lnum)
++    catch
++      " can't find it, try something else, but it's most likely going to be
++      " wrong
++    endtry
++  endif
++
++  " add indent after {
++  let brace_counts = HtmlIndent_CountBraces(prev_lnum)
++  let extra = brace_counts.c_open * s:ShiftWidth()
++
++  let prev_text = getline(prev_lnum)
++  let below_end_brace = prev_text =~ '}\s*$'
++
++  " Search back to align with the first line that's unfinished.
++  let align_lnum = s:CssFirstUnfinished(prev_lnum, min_lnum)
++
++  " Handle continuation lines if aligning with previous line and not after a
++  " "}".
++  if extra == 0 && align_lnum == prev_lnum && !below_end_brace
++    let prev_hasfield = prev_text =~ '^\s*[a-zA-Z0-9-]\+:'
++    let prev_special = prev_text =~ '^\s*\(/\*\|@\)'
++    if curtext =~ '^\s*\(/\*\|@\)'
++      " if the current line is not a comment or starts with @ (used by template
++      " systems) reduce indent if previous line is a continuation line
++      if !prev_hasfield && !prev_special
++        let extra = -s:ShiftWidth()
++      endif
+     else
+-       return -1
++      let cur_hasfield = curtext =~ '^\s*[a-zA-Z0-9-]\+:'
++      let prev_unfinished = s:CssUnfinished(prev_text)
++      if !cur_hasfield && (prev_hasfield || prev_unfinished)
++        " Continuation line has extra indent if the previous line was not a
++        " continuation line.
++        let extra = s:ShiftWidth()
++        " Align with @if
++        if prev_text =~ '^\s*@if '
++          let extra = 4
++        endif
++      elseif cur_hasfield && !prev_hasfield && !prev_special
++        " less indent below a continuation line
++        let extra = -s:ShiftWidth()
++      endif
++    endif
++  endif
++
++  if below_end_brace
++    " find matching {, if that line starts with @ it's not the start of a rule
++    " but something else from a template system
++    call cursor(prev_lnum, 1)
++    call search('}\s*$')
++    try
++      normal! %
++      " Found the matching "{", align with it.
++      let align_lnum = s:CssFirstUnfinished(line('.'), min_lnum)
++      let special = getline(align_lnum) =~ '^\s*@'
++    catch
++      let special = 0
++    endtry
++    if special
++      " do not reduce indent below @{ ... }
++      if extra < 0
++        let extra += s:ShiftWidth()
++      endif
++    else
++      let extra -= (brace_counts.c_close - (prev_text =~ '^\s*}')) * s:ShiftWidth()
+     endif
+-endfunc "}}}
+-func! s:Alien4() "{{{
+-    " <style>
+-    if prevnonblank(v:lnum-1) == b:indent.blocklnr
+-       " indent for first content line
+-       return eval(s:css1indent)
+-    endif
+-    return s:CSSIndent()
+-endfunc
+-
+-func! s:CSSIndent() "{{{
+-    " adopted $VIMRUNTIME/indent/css.vim
+-    if getline(v:lnum) =~ '^\s*[*}]'
+-       return cindent(v:lnum)
+-    endif
+-    let minline = b:indent.blocklnr
+-    let pnum = s:css_prevnoncomment(v:lnum - 1, minline)
+-    if pnum <= minline
+-       " < is to catch errors
+-       " indent for first content line after comments
+-       return eval(s:css1indent)
+-    endif
+-    let ind = indent(pnum) + s:css_countbraces(pnum, 1) * s:ShiftWidth()
+-    let pline = getline(pnum)
+-    if pline =~ '}\s*$'
+-       let ind -= (s:css_countbraces(pnum, 0) - (pline =~ '^\s*}')) * s:ShiftWidth()
+-    endif
+-    return ind
+-endfunc "}}}
+-func! s:css_prevnoncomment(lnum, stopline) "{{{
+-    " caller starts from a line a:lnum-1 that is not a comment
+-    let lnum = prevnonblank(a:lnum)
++  endif
++
++  " if no extra indent yet...
++  if extra == 0
++    if brace_counts.p_open > brace_counts.p_close
++      " previous line has more ( than ): add a shiftwidth
++      let extra = s:ShiftWidth()
++    elseif brace_counts.p_open < brace_counts.p_close
++      " previous line has more ) than (: subtract a shiftwidth
++      let extra = -s:ShiftWidth()
++    endif
++  endif
++
++  return indent(align_lnum) + extra
++endfunc "}}}
++
++" Inside <style>: Whether a line is unfinished.
++func! s:CssUnfinished(text)
++  "{{{
++  return a:text =~ '\s\(||\|&&\|:\)\s*$'
++endfunc "}}}
++
++" Search back for the first unfinished line above "lnum".
++func! s:CssFirstUnfinished(lnum, min_lnum)
++  "{{{
++  let align_lnum = a:lnum
++  while align_lnum > a:min_lnum && s:CssUnfinished(getline(align_lnum - 1))
++    let align_lnum -= 1
++  endwhile
++  return align_lnum
++endfunc "}}}
++
++" Find the non-empty line at or before "lnum" that is not a comment.
++func! s:CssPrevNonComment(lnum, stopline)
++  "{{{
++  " caller starts from a line a:lnum + 1 that is not a comment
++  let lnum = prevnonblank(a:lnum)
++  while 1
+     let ccol = match(getline(lnum), '\*/')
+     if ccol < 0
+-       return lnum
++      " No comment end thus its something else.
++      return lnum
+     endif
+-    call cursor(lnum, ccol+1)
++    call cursor(lnum, ccol + 1)
++    " Search back for the /* that starts the comment
+     let lnum = search('/\*', 'bW', a:stopline)
+-    if indent(".") == virtcol(".")-1
+-       return prevnonblank(lnum-1)
++    if indent(".") == virtcol(".") - 1
++      " The  found /* is at the start of the line. Now go back to the line
++      " above it and again check if it is a comment.
++      let lnum = prevnonblank(lnum - 1)
+     else
+-       return lnum
++      " /* is after something else, thus it's not a comment line.
++      return lnum
+     endif
++  endwhile
+ endfunc "}}}
+-func! s:css_countbraces(lnum, count_open) "{{{
+-    let brs = substitute(getline(a:lnum),'[''"].\{-}[''"]\|/\*.\{-}\*/\|/\*.*$\|[^{}]','','g')
+-    let n_open = 0
+-    let n_close = 0
+-    for brace in split(brs, '\zs')
+-       if brace == "{"
+-           let n_open += 1
+-       elseif brace == "}"
+-           if n_open > 0
+-               let n_open -= 1
+-           else
+-               let n_close += 1
+-           endif
+-       endif
+-    endfor
+-    return a:count_open ? n_open : n_close
+-endfunc "}}}
+-
+-"}}}
+-func! s:Alien5() "{{{
+-    " <!-- -->
+-    return -1
+-endfunc "}}}
+-
+-func! HtmlIndent() "{{{
+-    let s:curline = tolower(getline(v:lnum))
+-    let indentunit = s:ShiftWidth()
+ 
+-    let s:newstate = {}
+-    let s:newstate.lnum = v:lnum
++" Check the number of {} and () in line "lnum". Return a dict with the counts.
++func! HtmlIndent_CountBraces(lnum)
++  "{{{
++  let brs = substitute(getline(a:lnum), '[''"].\{-}[''"]\|/\*.\{-}\*/\|/\*.*$\|[^{}()]', '', 'g')
++  let c_open = 0
++  let c_close = 0
++  let p_open = 0
++  let p_close = 0
++  for brace in split(brs, '\zs')
++    if brace == "{"
++      let c_open += 1
++    elseif brace == "}"
++      if c_open > 0
++        let c_open -= 1
++      else
++        let c_close += 1
++      endif
++    elseif brace == '('
++      let p_open += 1
++    elseif brace == ')'
++      if p_open > 0
++        let p_open -= 1
++      else
++        let p_close += 1
++      endif
++    endif
++  endfor
++  return {'c_open': c_open,
++        \ 'c_close': c_close,
++        \ 'p_open': p_open,
++        \ 'p_close': p_close}
++endfunc "}}}
++
++" Return the indent for a comment: <!-- -->
++func! s:Alien5()
++  "{{{
++  let curtext = getline(v:lnum)
++  if curtext =~ '^\s*\zs-->'
++    " current line starts with end of comment, line up with comment start.
++    call cursor(v:lnum, 0)
++    let lnum = search('<!--', 'b')
++    if lnum > 0
++      " TODO: what if <!-- is not at the start of the line?
++      return indent(lnum)
++    endif
+ 
+-    " does the line start with a closing tag?
+-    let swendtag = match(s:curline, '^\s*</') >= 0
++    " Strange, can't find it.
++    return -1
++  endif
+ 
+-    if prevnonblank(v:lnum-1) == b:indent.lnum && s:usestate
+-       " use state (continue from previous line)
++  let prevlnum = prevnonblank(v:lnum - 1)
++  let prevtext = getline(prevlnum)
++  let idx = match(prevtext, '^\s*\zs<!--')
++  if idx >= 0
++    " just below comment start, add a shiftwidth
++    return idx + s:ShiftWidth()
++  endif
++
++  " Some files add 4 spaces just below a TODO line.  It's difficult to detect
++  " the end of the TODO, so let's not do that.
++
++  " Align with the previous non-blank line.
++  return indent(prevlnum)
++endfunc "}}}
++
++" When the "lnum" line ends in ">" find the line containing the matching "<".
++func! HtmlIndent_FindTagStart(lnum)
++  "{{{
++  " Avoids using the indent of a continuation line.
++  " Moves the cursor.
++  " Return two values:
++  " - the matching line number or "lnum".
++  " - a flag indicating whether we found the end of a tag.
++  " This method is global so that HTML-like indenters can use it.
++  " To avoid matching " > " or " < " inside a string require that the opening
++  " "<" is followed by a word character and the closing ">" comes after a
++  " non-white character.
++  let idx = match(getline(a:lnum), '\S>\s*$')
++  if idx > 0
++    call cursor(a:lnum, idx)
++    let lnum = searchpair('<\w', '' , '\S>', 'bW', '', max([a:lnum - b:html_indent_line_limit, 0]))
++    if lnum > 0
++      return [lnum, 1]
++    endif
++  endif
++  return [a:lnum, 0]
++endfunc "}}}
++
++" Find the unclosed start tag from the current cursor position.
++func! HtmlIndent_FindStartTag()
++  "{{{
++  " The cursor must be on or before a closing tag.
++  " If found, positions the cursor at the match and returns the line number.
++  " Otherwise returns 0.
++  let tagname = matchstr(getline('.')[col('.') - 1:], '</\zs\w\+\ze')
++  let start_lnum = searchpair('<' . tagname . '\>', '', '</' . tagname . '\>', 'bW')
++  if start_lnum > 0
++    return start_lnum
++  endif
++  return 0
++endfunc "}}}
++
++" Moves the cursor from a "<" to the matching ">".
++func! HtmlIndent_FindTagEnd()
++  "{{{
++  " Call this with the cursor on the "<" of a start tag.
++  " This will move the cursor to the ">" of the matching end tag or, when it's
++  " a self-closing tag, to the matching ">".
++  " Limited to look up to b:html_indent_line_limit lines away.
++  let text = getline('.')
++  let tagname = matchstr(text, '\w\+\|!--', col('.'))
++  if tagname == '!--'
++    call search('--\zs>')
++  elseif s:get_tag('/' . tagname) != 0
++    " tag with a closing tag, find matching "</tag>"
++    call searchpair('<' . tagname, '', '</' . tagname . '\zs>', 'W', '', line('.') + b:html_indent_line_limit)
++  else
++    " self-closing tag, find the ">"
++    call search('\S\zs>')
++  endif
++endfunc "}}}
++
++" Indenting inside a start tag. Return the correct indent or -1 if unknown.
++func! s:InsideTag(foundHtmlString)
++  "{{{
++  if a:foundHtmlString
++    " Inside an attribute string.
++    " Align with the previous line or use an external function.
++    let lnum = v:lnum - 1
++    if lnum > 1
++      if exists('b:html_indent_tag_string_func')
++        return b:html_indent_tag_string_func(lnum)
++      endif
++      return indent(lnum)
++    endif
++  endif
++
++  " Should be another attribute: " attr="val".  Align with the previous
++  " attribute start.
++  let lnum = v:lnum
++  while lnum > 1
++    let lnum -= 1
++    let text = getline(lnum)
++    " Find a match with one of these, align with "attr":
++    "       attr=
++    "  <tag attr=
++    "  text<tag attr=
++    "  <tag>text</tag>text<tag attr=
++    " For long lines search for the first match, finding the last match
++    " gets very slow.
++    if len(text) < 300
++      let idx = match(text, '.*\s\zs[_a-zA-Z0-9-]\+="')
+     else
+-       " start over (know nothing)
+-       let b:indent = s:FreshState(v:lnum)
++      let idx = match(text, '\s\zs[_a-zA-Z0-9-]\+="')
+     endif
++    if idx > 0
++      " Found the attribute.  TODO: assumes spaces, no Tabs.
++      return idx
++    endif
++  endwhile
++  return -1
++endfunc "}}}
++
++" THE MAIN INDENT FUNCTION. Return the amount of indent for v:lnum.
++func! HtmlIndent()
++  "{{{
++  if prevnonblank(v:lnum - 1) <= 1
++    " First non-blank line has no indent.
++    return 0
++  endif
++
++  let curtext = tolower(getline(v:lnum))
++  let indentunit = s:ShiftWidth()
++
++  let b:hi_newstate = {}
++  let b:hi_newstate.lnum = v:lnum
++
++  " When syntax HL is enabled, detect we are inside a tag.  Indenting inside
++  " a tag works very differently. Do not do this when the line starts with
++  " "<", it gets the "htmlTag" ID but we are not inside a tag then.
++  if curtext !~ '^\s*<'
++    normal ^
++    let stack = synstack(v:lnum, col('.'))  " assumes there are no tabs
++    let foundHtmlString = 0
++    for synid in reverse(stack)
++      let name = synIDattr(synid, "name")
++      if index(b:hi_insideStringNames, name) >= 0
++        let foundHtmlString = 1
++      elseif index(b:hi_insideTagNames, name) >= 0
++        " Yes, we are inside a tag.
++        let indent = s:InsideTag(foundHtmlString)
++        if indent >= 0
++          " Do not keep the state. TODO: could keep the block type.
++          let b:hi_indent.lnum = 0
++          return indent
++        endif
++      endif
++    endfor
++  endif
++
++  " does the line start with a closing tag?
++  let swendtag = match(curtext, '^\s*</') >= 0
+ 
+-    if b:indent.block >= 2
+-       " within block
+-       let endtag = s:endtags[b:indent.block-2]
+-       let blockend = stridx(s:curline, endtag)
+-       if blockend >= 0
+-           " block ends here
+-           let s:newstate.block = 0
+-           " calc indent for REST OF LINE (may start more blocks):
+-           let s:curline = strpart(s:curline, blockend+strlen(endtag))
+-           call s:CountITags()
+-           if swendtag && b:indent.block != 5
+-               let indent = b:indent.blocktagind + s:curind * indentunit
+-               let s:newstate.baseindent = indent + s:nextrel * indentunit
+-           else
+-               let indent = s:Alien{b:indent.block}()
+-               let s:newstate.baseindent = b:indent.blocktagind + s:nextrel * indentunit
+-           endif
+-           call extend(b:indent, s:newstate, "force")
+-           return indent
+-       else
+-           " block continues
+-           " indent this line with alien method
+-           let indent = s:Alien{b:indent.block}()
+-           call extend(b:indent, s:newstate, "force")
+-           return indent
+-       endif
++  if prevnonblank(v:lnum - 1) == b:hi_indent.lnum && b:hi_lasttick == b:changedtick - 1
++    " use state (continue from previous line)
++  else
++    " start over (know nothing)
++    let b:hi_indent = s:FreshState(v:lnum)
++  endif
++
++  if b:hi_indent.block >= 2
++    " within block
++    let endtag = s:endtags[b:hi_indent.block]
++    let blockend = stridx(curtext, endtag)
++    if blockend >= 0
++      " block ends here
++      let b:hi_newstate.block = 0
++      " calc indent for REST OF LINE (may start more blocks):
++      call s:CountTagsAndState(strpart(curtext, blockend + strlen(endtag)))
++      if swendtag && b:hi_indent.block != 5
++        let indent = b:hi_indent.blocktagind + s:curind * indentunit
++        let b:hi_newstate.baseindent = indent + s:nextrel * indentunit
++      else
++        let indent = s:Alien{b:hi_indent.block}()
++        let b:hi_newstate.baseindent = b:hi_indent.blocktagind + s:nextrel * indentunit
++      endif
+     else
+-       " not within a block - within usual html
+-       " if < 2 then always 0
+-       let s:newstate.block = b:indent.block
+-       call s:CountITags()
+-       if swendtag
+-           let indent = b:indent.baseindent + s:curind * indentunit
+-           let s:newstate.baseindent = indent + s:nextrel * indentunit
+-       else
+-           let indent = b:indent.baseindent
+-           let s:newstate.baseindent = indent + (s:curind + s:nextrel) * indentunit
+-       endif
+-       call extend(b:indent, s:newstate, "force")
+-       return indent
++      " block continues
++      " indent this line with alien method
++      let indent = s:Alien{b:hi_indent.block}()
++    endif
++  else
++    " not within a block - within usual html
++    let b:hi_newstate.block = b:hi_indent.block
++    if swendtag
++      " The current line starts with an end tag, align with its start tag.
++      call cursor(v:lnum, 1)
++      let start_lnum = HtmlIndent_FindStartTag()
++      if start_lnum > 0
++        " check for the line starting with something inside a tag:
++        " <sometag               <- align here
++        "    attr=val><open>     not here
++        let text = getline(start_lnum)
++        let angle = matchstr(text, '[<>]')
++        if angle == '>'
++          call cursor(start_lnum, 1)
++          normal! f>%
++          let start_lnum = line('.')
++          let text = getline(start_lnum)
++        endif
++
++        let indent = indent(start_lnum)
++        if col('.') > 2
++          let swendtag = match(text, '^\s*</') >= 0
++          call s:CountITags(text[: col('.') - 2])
++          let indent += s:nextrel * s:ShiftWidth()
++          if !swendtag
++            let indent += s:curind * s:ShiftWidth()
++          endif
++        endif
++      else
++        " not sure what to do
++        let indent = b:hi_indent.baseindent
++      endif
++      let b:hi_newstate.baseindent = indent
++    else
++      call s:CountTagsAndState(curtext)
++      let indent = b:hi_indent.baseindent
++      let b:hi_newstate.baseindent = indent + (s:curind + s:nextrel) * indentunit
+     endif
++  endif
+ 
++  let b:hi_lasttick = b:changedtick
++  call extend(b:hi_indent, b:hi_newstate, "force")
++  return indent
+ endfunc "}}}
+ 
+-" check user settings (first time), clear cpo, Modeline: {{{1
+-
+-" DEBUG:
+-com! -nargs=* IndHtmlLocal <args>
+-
++" Check user settings when loading this script the first time.
+ call HtmlIndent_CheckUserSettings()
+ 
+ let &cpo = s:cpo_save
+ unlet s:cpo_save
+ 
+-" vim:set fdm=marker ts=8:
++" vim: fdm=marker ts=8 sw=2 tw=78
 diff -Naur vim74.orig/runtime/indent/j.vim vim74/runtime/indent/j.vim
 --- vim74.orig/runtime/indent/j.vim     1970-01-01 00:00:00.000000000 +0000
-+++ vim74/runtime/indent/j.vim  2014-06-01 00:42:56.970857356 +0000
++++ vim74/runtime/indent/j.vim  2014-07-21 23:33:19.843518913 +0000
 @@ -0,0 +1,50 @@
 +" Vim indent file
@@ -25179 +27678 @@
 +  return indent
 +endfunction
+diff -Naur vim74.orig/runtime/indent/json.vim vim74/runtime/indent/json.vim
+--- vim74.orig/runtime/indent/json.vim  1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/indent/json.vim       2014-07-21 23:33:19.916852055 +0000
+@@ -0,0 +1,13 @@
++" Vim indent file
++" Language:            JSON
++" Maintainer:          David Barnett <daviebdawg+vim@gmail.com>
++" Last Change:         2014 Jul 16
++
++if exists('b:did_indent')
++   finish
++endif
++
++" JSON is a subset of JavaScript. JavaScript indenting should work fine.
++runtime! indent/javascript.vim
++
++let b:did_indent = 1
 diff -Naur vim74.orig/runtime/indent/php.vim vim74/runtime/indent/php.vim
 --- vim74.orig/runtime/indent/php.vim   2013-08-07 09:36:56.000000000 +0000
-+++ vim74/runtime/indent/php.vim        2014-06-01 00:42:57.737522071 +0000
++++ vim74/runtime/indent/php.vim        2014-07-21 23:33:20.656850124 +0000
 @@ -3,8 +3,8 @@
  " Author:      John Wellesz <John.wellesz (AT) teaser (DOT) fr>
@@ -25479 +27995 @@
             if openedparent != lnum
                 let ind = indent(openedparent)
+diff -Naur vim74.orig/runtime/indent/rhelp.vim vim74/runtime/indent/rhelp.vim
+--- vim74.orig/runtime/indent/rhelp.vim 1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/indent/rhelp.vim      2014-07-21 23:33:20.750183214 +0000
+@@ -0,0 +1,111 @@
++" Vim indent file
++" Language:    R Documentation (Help), *.Rd
++" Author:      Jakson Alves de Aquino <jalvesaq@gmail.com>
++" Last Change: Wed Jul 09, 2014  07:34PM
++
++
++" Only load this indent file when no other was loaded.
++if exists("b:did_indent")
++  finish
++endif
++runtime indent/r.vim
++let s:RIndent = function(substitute(&indentexpr, "()", "", ""))
++let b:did_indent = 1
++
++setlocal indentkeys=0{,0},:,!^F,o,O,e
++setlocal indentexpr=GetRHelpIndent()
++
++" Only define the function once.
++if exists("*GetRHelpIndent")
++  finish
++endif
++
++setlocal noautoindent
++setlocal nocindent
++setlocal nosmartindent
++setlocal nolisp
++
++setlocal indentkeys=0{,0},:,!^F,o,O,e
++setlocal indentexpr=GetCorrectRHelpIndent()
++
++function s:SanitizeRHelpLine(line)
++  let newline = substitute(a:line, '\\\\', "x", "g")
++  let newline = substitute(newline, '\\{', "x", "g")
++  let newline = substitute(newline, '\\}', "x", "g")
++  let newline = substitute(newline, '\\%', "x", "g")
++  let newline = substitute(newline, '%.*', "", "")
++  let newline = substitute(newline, '\s*$', "", "")
++  return newline
++endfunction
++
++function GetRHelpIndent()
++
++  let clnum = line(".")    " current line
++  if clnum == 1
++    return 0
++  endif
++  let cline = getline(clnum)
++
++  if cline =~ '^\s*}\s*$'
++    let i = clnum
++    let bb = -1
++    while bb != 0 && i > 1
++      let i -= 1
++      let line = s:SanitizeRHelpLine(getline(i))
++      let line2 = substitute(line, "{", "", "g")
++      let openb = strlen(line) - strlen(line2)
++      let line3 = substitute(line2, "}", "", "g")
++      let closeb = strlen(line2) - strlen(line3)
++      let bb += openb - closeb
++    endwhile
++    return indent(i)
++  endif
++
++  if cline =~ '^\s*#ifdef\>' || cline =~ '^\s*#endif\>'
++    return 0
++  endif
++
++  let lnum = clnum - 1
++  let line = getline(lnum)
++  if line =~ '^\s*#ifdef\>' || line =~ '^\s*#endif\>'
++    let lnum -= 1
++    let line = getline(lnum)
++  endif
++  while lnum > 1 && (line =~ '^\s*$' || line =~ '^#ifdef' || line =~ '^#endif')
++    let lnum -= 1
++    let line = getline(lnum)
++  endwhile
++  if lnum == 1
++    return 0
++  endif
++  let line = s:SanitizeRHelpLine(line)
++  let line2 = substitute(line, "{", "", "g")
++  let openb = strlen(line) - strlen(line2)
++  let line3 = substitute(line2, "}", "", "g")
++  let closeb = strlen(line2) - strlen(line3)
++  let bb = openb - closeb
++
++  let ind = indent(lnum) + (bb * &sw)
++
++  if line =~ '^\s*}\s*$'
++    let ind = indent(lnum)
++  endif
++
++  if ind < 0
++    return 0
++  endif
++
++  return ind
++endfunction
++
++function GetCorrectRHelpIndent()
++  let lastsection = search('^\\[a-z]*{', "bncW")
++  let secname = getline(lastsection)
++  if secname =~ '^\\usage{' || secname =~ '^\\examples{' || secname =~ '^\\dontshow{' || secname =~ '^\\dontrun{' || secname =~ '^\\donttest{' || secname =~ '^\\testonly{' || secname =~ '^\\method{.*}{.*}('
++    return s:RIndent()
++  else
++    return GetRHelpIndent()
++  endif
++endfunction
++
++" vim: sw=2
+diff -Naur vim74.orig/runtime/indent/rmd.vim vim74/runtime/indent/rmd.vim
+--- vim74.orig/runtime/indent/rmd.vim   1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/indent/rmd.vim        2014-07-21 23:33:20.753516538 +0000
+@@ -0,0 +1,46 @@
++" Vim indent file
++" Language:    Rmd
++" Author:      Jakson Alves de Aquino <jalvesaq@gmail.com>
++" Last Change: Wed Jul 09, 2014  07:33PM
++
++
++" Only load this indent file when no other was loaded.
++if exists("b:did_indent")
++  finish
++endif
++runtime indent/r.vim
++let s:RIndent = function(substitute(&indentexpr, "()", "", ""))
++let b:did_indent = 1
++
++setlocal indentkeys=0{,0},:,!^F,o,O,e
++setlocal indentexpr=GetRmdIndent()
++
++if exists("*GetRmdIndent")
++  finish
++endif
++
++function GetMdIndent()
++  let pline = getline(v:lnum - 1)
++  let cline = getline(v:lnum)
++  if prevnonblank(v:lnum - 1) < v:lnum - 1 || cline =~ '^\s*[-\+\*]\s' || cline =~ '^\s*\d\+\.\s\+'
++    return indent(v:lnum)
++  elseif pline =~ '^\s*[-\+\*]\s'
++    return indent(v:lnum - 1) + 2
++  elseif pline =~ '^\s*\d\+\.\s\+'
++    return indent(v:lnum - 1) + 3
++  endif
++  return indent(prevnonblank(v:lnum - 1))
++endfunction
++
++function GetRmdIndent()
++  if getline(".") =~ '^```{r .*}$' || getline(".") =~ '^```$'
++    return 0
++  endif
++  if search('^```{r', "bncW") > search('^```$', "bncW")
++    return s:RIndent()
++  else
++    return GetMdIndent()
++  endif
++endfunction
++
++" vim: sw=2
+diff -Naur vim74.orig/runtime/indent/rnoweb.vim vim74/runtime/indent/rnoweb.vim
+--- vim74.orig/runtime/indent/rnoweb.vim        1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/indent/rnoweb.vim     2014-07-21 23:33:20.756849863 +0000
+@@ -0,0 +1,35 @@
++" Vim indent file
++" Language:    Rnoweb
++" Author:      Jakson Alves de Aquino <jalvesaq@gmail.com>
++" Last Change: Wed Jul 09, 2014  07:28PM
++
++
++" Only load this indent file when no other was loaded.
++if exists("b:did_indent")
++  finish
++endif
++runtime indent/tex.vim
++let s:TeXIndent = function(substitute(&indentexpr, "()", "", ""))
++unlet b:did_indent
++runtime indent/r.vim
++let s:RIndent = function(substitute(&indentexpr, "()", "", ""))
++let b:did_indent = 1
++
++setlocal indentkeys=0{,0},!^F,o,O,e,},=\bibitem,=\item
++setlocal indentexpr=GetRnowebIndent()
++
++if exists("*GetRnowebIndent")
++  finish
++endif
++
++function GetRnowebIndent()
++  if getline(".") =~ "^<<.*>>=$"
++    return 0
++  endif
++  if search("^<<", "bncW") > search("^@", "bncW")
++    return s:RIndent()
++  endif
++  return s:TeXIndent()
++endfunction
++
++" vim: sw=2
+diff -Naur vim74.orig/runtime/indent/rrst.vim vim74/runtime/indent/rrst.vim
+--- vim74.orig/runtime/indent/rrst.vim  1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/indent/rrst.vim       2014-07-21 23:33:20.780183135 +0000
+@@ -0,0 +1,46 @@
++" Vim indent file
++" Language:    Rrst
++" Author:      Jakson Alves de Aquino <jalvesaq@gmail.com>
++" Last Change: Wed Jul 09, 2014  07:33PM
++
++
++" Only load this indent file when no other was loaded.
++if exists("b:did_indent")
++  finish
++endif
++runtime indent/r.vim
++let s:RIndent = function(substitute(&indentexpr, "()", "", ""))
++let b:did_indent = 1
++
++setlocal indentkeys=0{,0},:,!^F,o,O,e
++setlocal indentexpr=GetRrstIndent()
++
++if exists("*GetRrstIndent")
++  finish
++endif
++
++function GetRstIndent()
++  let pline = getline(v:lnum - 1)
++  let cline = getline(v:lnum)
++  if prevnonblank(v:lnum - 1) < v:lnum - 1 || cline =~ '^\s*[-\+\*]\s' || cline =~ '^\s*\d\+\.\s\+'
++    return indent(v:lnum)
++  elseif pline =~ '^\s*[-\+\*]\s'
++    return indent(v:lnum - 1) + 2
++  elseif pline =~ '^\s*\d\+\.\s\+'
++    return indent(v:lnum - 1) + 3
++  endif
++  return indent(prevnonblank(v:lnum - 1))
++endfunction
++
++function GetRrstIndent()
++  if getline(".") =~ '^\.\. {r .*}$' || getline(".") =~ '^\.\. \.\.$'
++    return 0
++  endif
++  if search('^\.\. {r', "bncW") > search('^\.\. \.\.$', "bncW")
++    return s:RIndent()
++  else
++    return GetRstIndent()
++  endif
++endfunction
++
++" vim: sw=2
 diff -Naur vim74.orig/runtime/indent/sh.vim vim74/runtime/indent/sh.vim
 --- vim74.orig/runtime/indent/sh.vim    2010-05-15 11:03:29.000000000 +0000
-+++ vim74/runtime/indent/sh.vim 2014-06-01 00:42:57.920854937 +0000
++++ vim74/runtime/indent/sh.vim 2014-07-21 23:33:20.870182901 +0000
 @@ -1,7 +1,8 @@
  " Vim indent file
@@ -25518 +28288 @@
 diff -Naur vim74.orig/runtime/indent/systemverilog.vim vim74/runtime/indent/systemverilog.vim
 --- vim74.orig/runtime/indent/systemverilog.vim 1970-01-01 00:00:00.000000000 +0000
-+++ vim74/runtime/indent/systemverilog.vim      2014-06-01 00:42:57.954188186 +0000
++++ vim74/runtime/indent/systemverilog.vim      2014-07-21 23:33:20.903516147 +0000
 @@ -0,0 +1,230 @@
 +" Vim indent file
@@ -25752 +28522 @@
 diff -Naur vim74.orig/runtime/macros/less.vim vim74/runtime/macros/less.vim
 --- vim74.orig/runtime/macros/less.vim  2012-05-18 18:58:54.000000000 +0000
-+++ vim74/runtime/macros/less.vim       2014-06-01 00:43:00.600848113 +0000
++++ vim74/runtime/macros/less.vim       2014-07-21 23:33:23.516842660 +0000
 @@ -1,6 +1,6 @@
  " Vim script to work like "less"
@@ -25837 +28607 @@
  
  " vim: sw=2
+diff -Naur vim74.orig/runtime/menu.vim vim74/runtime/menu.vim
+--- vim74.orig/runtime/menu.vim 2013-05-17 11:01:55.000000000 +0000
++++ vim74/runtime/menu.vim      2014-07-21 23:33:23.866841747 +0000
+@@ -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: 2013 May 17
++" Last Change: 2014 May 22
+ 
+ " 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.
+@@ -477,6 +477,7 @@
+   an 40.340.110 &Tools.&Folding.&Enable/Disable\ folds<Tab>zi          zi
+   an 40.340.120 &Tools.&Folding.&View\ Cursor\ Line<Tab>zv             zv
+   an 40.340.120 &Tools.&Folding.Vie&w\ Cursor\ Line\ only<Tab>zMzx     zMzx
++  inoremenu 40.340.120 &Tools.&Folding.Vie&w\ Cursor\ Line\ only<Tab>zMzx  <C-O>zM<C-O>zx
+   an 40.340.130 &Tools.&Folding.C&lose\ more\ folds<Tab>zm             zm
+   an 40.340.140 &Tools.&Folding.&Close\ all\ folds<Tab>zM              zM
+   an 40.340.150 &Tools.&Folding.O&pen\ more\ folds<Tab>zr              zr
 diff -Naur vim74.orig/runtime/optwin.vim vim74/runtime/optwin.vim
 --- vim74.orig/runtime/optwin.vim       2013-06-29 12:32:06.000000000 +0000
-+++ vim74/runtime/optwin.vim    2014-06-01 00:43:00.977513821 +0000
++++ vim74/runtime/optwin.vim    2014-07-21 23:33:23.893508344 +0000
 @@ -1,7 +1,7 @@
  " These commands create the option window.
@@ -25849 +28639 @@
  " If there already is an option window, jump to that one.
  if bufwinnr("option-window") > 0
-@@ -855,7 +855,7 @@
+@@ -324,6 +324,12 @@
+ call append("$", "linebreak\twrap long lines at a character in 'breakat'")
+ call append("$", "\t(local to window)")
+ call <SID>BinOptionL("lbr")
++call append("$", "breakindent\tpreserve indentation in wrapped text")
++call append("$", "\t(local to window)")
++call <SID>BinOptionL("bri")
++call append("$", "breakindentopt\tadjust breakindent behaviour")
++call append("$", "\t(local to window)")
++call <SID>OptionL("briopt")
+ call append("$", "breakat\twhich characters might cause a line break")
+ call <SID>OptionG("brk", &brk)
+ call append("$", "showbreak\tstring to put before wrapped screen lines")
+@@ -855,7 +861,7 @@
    call append("$", "\t(local to buffer)")
    call <SID>BinOptionL("lisp")
@@ -25860 +28663 @@
 diff -Naur vim74.orig/runtime/plugin/getscriptPlugin.vim vim74/runtime/plugin/getscriptPlugin.vim
 --- vim74.orig/runtime/plugin/getscriptPlugin.vim       2013-04-17 13:40:44.000000000 +0000
-+++ vim74/runtime/plugin/getscriptPlugin.vim    2014-06-01 00:43:01.010847069 +0000
++++ vim74/runtime/plugin/getscriptPlugin.vim    2014-07-21 23:33:23.926841590 +0000
 @@ -1,7 +1,7 @@
  " ---------------------------------------------------------------------
@@ -25889 +28692 @@
  set cpo&vim
  
+diff -Naur vim74.orig/runtime/plugin/matchparen.vim vim74/runtime/plugin/matchparen.vim
+--- vim74.orig/runtime/plugin/matchparen.vim    2013-05-08 03:15:53.000000000 +0000
++++ vim74/runtime/plugin/matchparen.vim 2014-07-21 23:33:23.963508161 +0000
+@@ -1,6 +1,6 @@
+ " Vim plugin for showing matching parens
+ " Maintainer:  Bram Moolenaar <Bram@vim.org>
+-" Last Change: 2013 May 08
++" Last Change: 2014 Jul 19
+ 
+ " Exit quickly when:
+ " - this plugin was already loaded (or disabled)
+@@ -39,7 +39,7 @@
+ function! s:Highlight_Matching_Pair()
+   " Remove any previous match.
+   if exists('w:paren_hl_on') && w:paren_hl_on
+-    3match none
++    silent! call matchdelete(3)
+     let w:paren_hl_on = 0
+   endif
+ 
+@@ -54,14 +54,15 @@
+   let c_col = col('.')
+   let before = 0
+ 
+-  let c = getline(c_lnum)[c_col - 1]
++  let text = getline(c_lnum)
++  let c = text[c_col - 1]
+   let plist = split(&matchpairs, '.\zs[:,]')
+   let i = index(plist, c)
+   if i < 0
+     " not found, in Insert mode try character before the cursor
+     if c_col > 1 && (mode() == 'i' || mode() == 'R')
+       let before = 1
+-      let c = getline(c_lnum)[c_col - 2]
++      let c = text[c_col - 2]
+       let i = index(plist, c)
+     endif
+     if i < 0
+@@ -87,7 +88,13 @@
+   " Find the match.  When it was just before the cursor move it there for a
+   " moment.
+   if before > 0
+-    let save_cursor = winsaveview()
++    let has_getcurpos = exists("*getcurpos")
++    if has_getcurpos
++      " getcurpos() is more efficient but doesn't exist before 7.4.313.
++      let save_cursor = getcurpos()
++    else
++      let save_cursor = winsaveview()
++    endif
+     call cursor(c_lnum, c_col - before)
+   endif
+ 
+@@ -147,19 +154,27 @@
+   endtry
+ 
+   if before > 0
+-    call winrestview(save_cursor)
++    if has_getcurpos
++      call setpos('.', save_cursor)
++    else
++      call winrestview(save_cursor)
++    endif
+   endif
+ 
+   " If a match is found setup match highlighting.
+   if m_lnum > 0 && m_lnum >= stoplinetop && m_lnum <= stoplinebottom 
+-    exe '3match MatchParen /\(\%' . c_lnum . 'l\%' . (c_col - before) .
+-         \ 'c\)\|\(\%' . m_lnum . 'l\%' . m_col . 'c\)/'
++    if exists('*matchaddpos')
++      call matchaddpos('MatchParen', [[c_lnum, c_col - before], [m_lnum, m_col]], 10, 3)
++    else
++      exe '3match MatchParen /\(\%' . c_lnum . 'l\%' . (c_col - before) .
++           \ 'c\)\|\(\%' . m_lnum . 'l\%' . m_col . 'c\)/'
++    endif
+     let w:paren_hl_on = 1
+   endif
+ endfunction
+ 
+ " Define commands that will disable and enable the plugin.
+-command! NoMatchParen windo 3match none | unlet! g:loaded_matchparen |
++command! NoMatchParen windo silent! call matchdelete(3) | unlet! g:loaded_matchparen |
+          \ au! matchparen
+ command! DoMatchParen runtime plugin/matchparen.vim | windo doau CursorMoved
+ 
 diff -Naur vim74.orig/runtime/plugin/netrwPlugin.vim vim74/runtime/plugin/netrwPlugin.vim
 --- vim74.orig/runtime/plugin/netrwPlugin.vim   2013-05-19 03:28:33.000000000 +0000
-+++ vim74/runtime/plugin/netrwPlugin.vim        2014-06-01 00:43:01.040846993 +0000
++++ vim74/runtime/plugin/netrwPlugin.vim        2014-07-21 23:33:23.980174785 +0000
 @@ -1,9 +1,9 @@
  " netrwPlugin.vim: Handles file transfer and remote directory listing across a network
@@ -26075 +28963 @@
 diff -Naur vim74.orig/runtime/syntax/a65.vim vim74/runtime/syntax/a65.vim
 --- vim74.orig/runtime/syntax/a65.vim   2010-05-15 11:03:57.000000000 +0000
-+++ vim74/runtime/syntax/a65.vim        2014-06-01 00:43:04.117505825 +0000
++++ vim74/runtime/syntax/a65.vim        2014-07-21 23:33:27.223499654 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -26088 +28976 @@
 diff -Naur vim74.orig/runtime/syntax/apache.vim vim74/runtime/syntax/apache.vim
 --- vim74.orig/runtime/syntax/apache.vim        2010-05-15 11:03:57.000000000 +0000
-+++ vim74/runtime/syntax/apache.vim     2014-06-01 00:43:04.257505469 +0000
++++ vim74/runtime/syntax/apache.vim     2014-07-21 23:33:27.420165808 +0000
 @@ -1,11 +1,9 @@
  " Vim syntax file
@@ -26126 +29014 @@
 diff -Naur vim74.orig/runtime/syntax/arduino.vim vim74/runtime/syntax/arduino.vim
 --- vim74.orig/runtime/syntax/arduino.vim       1970-01-01 00:00:00.000000000 +0000
-+++ vim74/runtime/syntax/arduino.vim    2014-06-01 00:43:04.297505367 +0000
++++ vim74/runtime/syntax/arduino.vim    2014-07-21 23:33:27.493498950 +0000
 @@ -0,0 +1,61 @@
 +" Vim syntax file
@@ -26191 +29079 @@
 diff -Naur vim74.orig/runtime/syntax/asm.vim vim74/runtime/syntax/asm.vim
 --- vim74.orig/runtime/syntax/asm.vim   2012-04-09 19:37:34.000000000 +0000
-+++ vim74/runtime/syntax/asm.vim        2014-06-01 00:43:04.327505291 +0000
++++ vim74/runtime/syntax/asm.vim        2014-07-21 23:33:27.513498898 +0000
 @@ -3,7 +3,7 @@
  " Maintainer:  Erik Wognsen <erik.wognsen@gmail.com>
@@ -26216 +29104 @@
 diff -Naur vim74.orig/runtime/syntax/bib.vim vim74/runtime/syntax/bib.vim
 --- vim74.orig/runtime/syntax/bib.vim   2011-12-30 11:30:00.000000000 +0000
-+++ vim74/runtime/syntax/bib.vim        2014-06-01 00:43:04.514171482 +0000
++++ vim74/runtime/syntax/bib.vim        2014-07-21 23:33:27.706831726 +0000
 @@ -2,7 +2,7 @@
  " Language:    BibTeX (bibliographic database format for (La)TeX)
@@ -26235 +29123 @@
  syn keyword bibEntryKw contained       address annote author booktitle chapter
  syn keyword bibEntryKw contained       crossref edition editor howpublished
+diff -Naur vim74.orig/runtime/syntax/c.vim vim74/runtime/syntax/c.vim
+--- vim74.orig/runtime/syntax/c.vim     2013-07-05 16:09:23.000000000 +0000
++++ vim74/runtime/syntax/c.vim  2014-07-21 23:33:27.810164790 +0000
+@@ -1,7 +1,7 @@
+ " Vim syntax file
+ " Language:    C
+ " Maintainer:  Bram Moolenaar <Bram@vim.org>
+-" Last Change: 2013 Jul 05
++" Last Change: 2014 May 26
+ 
+ " Quit when a (custom) syntax file was already loaded
+ if exists("b:current_syntax")
+@@ -322,6 +322,9 @@
+   syn keyword cConstant SEEK_CUR SEEK_END SEEK_SET
+   syn keyword cConstant TMP_MAX stderr stdin stdout
+   syn keyword cConstant EXIT_FAILURE EXIT_SUCCESS RAND_MAX
++  " POSIX 2001
++  syn keyword cConstant SIGBUS SIGPOLL SIGPROF SIGSYS SIGURG
++  syn keyword cConstant SIGVTALRM SIGXCPU SIGXFSZ
+   " Add POSIX errors as well
+   syn keyword cConstant E2BIG EACCES EAGAIN EBADF EBADMSG EBUSY
+   syn keyword cConstant ECANCELED ECHILD EDEADLK EDOM EEXIST EFAULT
 diff -Naur vim74.orig/runtime/syntax/clean.vim vim74/runtime/syntax/clean.vim
 --- vim74.orig/runtime/syntax/clean.vim 2013-06-19 19:34:33.000000000 +0000
-+++ vim74/runtime/syntax/clean.vim      2014-06-01 00:43:04.847503967 +0000
++++ vim74/runtime/syntax/clean.vim      2014-07-21 23:33:28.053497488 +0000
 @@ -2,7 +2,7 @@
  " Language:            Clean
@@ -26299 +29209 @@
 diff -Naur vim74.orig/runtime/syntax/clojure.vim vim74/runtime/syntax/clojure.vim
 --- vim74.orig/runtime/syntax/clojure.vim       2013-02-06 14:35:23.000000000 +0000
-+++ vim74/runtime/syntax/clojure.vim    2014-06-01 00:43:04.904170489 +0000
++++ vim74/runtime/syntax/clojure.vim    2014-07-21 23:33:28.110164007 +0000
 @@ -1,34 +1,37 @@
  " Vim syntax file
@@ -26567 +29477 @@
 diff -Naur vim74.orig/runtime/syntax/cpp.vim vim74/runtime/syntax/cpp.vim
 --- vim74.orig/runtime/syntax/cpp.vim   2013-03-13 17:34:49.000000000 +0000
-+++ vim74/runtime/syntax/cpp.vim        2014-06-01 00:43:05.014170209 +0000
++++ vim74/runtime/syntax/cpp.vim        2014-07-21 23:33:28.220163720 +0000
 @@ -2,7 +2,7 @@
  " Language:    C++
@@ -26596 +29506 @@
 diff -Naur vim74.orig/runtime/syntax/css.vim vim74/runtime/syntax/css.vim
 --- vim74.orig/runtime/syntax/css.vim   2013-07-23 19:08:29.000000000 +0000
-+++ vim74/runtime/syntax/css.vim        2014-06-01 00:43:05.110836629 +0000
++++ vim74/runtime/syntax/css.vim        2014-07-21 23:33:28.326830108 +0000
 @@ -6,7 +6,7 @@
  "               Nikolai Weibull (Add CSS2 support)
@@ -27349 +30259 @@
 diff -Naur vim74.orig/runtime/syntax/d.vim vim74/runtime/syntax/d.vim
 --- vim74.orig/runtime/syntax/d.vim     2013-05-23 20:52:24.000000000 +0000
-+++ vim74/runtime/syntax/d.vim  2014-06-01 00:43:05.267502897 +0000
++++ vim74/runtime/syntax/d.vim  2014-07-21 23:33:28.486829691 +0000
 @@ -2,8 +2,8 @@
  "
@@ -27442 +30352 @@
 diff -Naur vim74.orig/runtime/syntax/datascript.vim vim74/runtime/syntax/datascript.vim
 --- vim74.orig/runtime/syntax/datascript.vim    2012-04-30 10:59:58.000000000 +0000
-+++ vim74/runtime/syntax/datascript.vim 2014-06-01 00:43:05.270836222 +0000
++++ vim74/runtime/syntax/datascript.vim 2014-07-21 23:33:28.490163016 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -27491 +30401 @@
 diff -Naur vim74.orig/runtime/syntax/debchangelog.vim vim74/runtime/syntax/debchangelog.vim
 --- vim74.orig/runtime/syntax/debchangelog.vim  2013-05-17 15:25:15.000000000 +0000
-+++ vim74/runtime/syntax/debchangelog.vim       2014-06-01 00:43:05.340836044 +0000
++++ vim74/runtime/syntax/debchangelog.vim       2014-07-21 23:33:28.536829560 +0000
 @@ -3,7 +3,7 @@
  " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
@@ -27497 +30407 @@
  "                     Wichert Akkerman <wakkerma@debian.org>
 -" Last Change: 2013 May 05
-+" Last Change: 2014 Jan 20
++" Last Change: 2014 Jul 11
  " URL: http://anonscm.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debchangelog.vim
  
@@ -27506 +30416 @@
  syn match debchangelogUrgency  contained "; urgency=\(low\|medium\|high\|critical\|emergency\)\( \S.*\)\="
 -syn match debchangelogTarget   contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile)|wheezy-backports|%(lucid|precise|quantal|raring|saucy)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
-+syn match debchangelogTarget   contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile)|wheezy-backports|%(lucid|precise|quantal|saucy|trusty)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
++syn match debchangelogTarget   contained "\v %(frozen|unstable|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile)|wheezy-backports|%(devel|lucid|precise|trusty|utopic)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
  syn match debchangelogVersion  contained "(.\{-})"
  syn match debchangelogCloses   contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
@@ -27512 +30422 @@
 diff -Naur vim74.orig/runtime/syntax/debcontrol.vim vim74/runtime/syntax/debcontrol.vim
 --- vim74.orig/runtime/syntax/debcontrol.vim    2013-05-21 10:54:11.000000000 +0000
-+++ vim74/runtime/syntax/debcontrol.vim 2014-06-01 00:43:05.344169369 +0000
++++ vim74/runtime/syntax/debcontrol.vim 2014-07-21 23:33:28.540162885 +0000
 @@ -3,7 +3,7 @@
  " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
@@ -27518 +30428 @@
  "                     Wichert Akkerman <wakkerma@debian.org>
 -" Last Change: 2013 May 05
-+" Last Change: 2013 Oct 28
++" Last Change: 2014 May 01
  " URL: http://anonscm.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debcontrol.vim
  
  " Standard syntax initialization
-@@ -24,7 +24,7 @@
+@@ -13,6 +13,9 @@
+   finish
+ endif
+ 
++let s:cpo_save = &cpo
++set cpo&vim
++
+ " Should match case except for the keys of each field
+ syn case match
+ 
+@@ -23,8 +26,17 @@
+ syn match debControlComma ", *"
  syn match debControlSpace " "
  
++let s:kernels = '\%(linux\|hurd\|kfreebsd\|knetbsd\|kopensolaris\|netbsd\)'
++let s:archs = '\%(alpha\|amd64\|armeb\|armel\|armhf\|arm64\|avr32\|hppa\|i386'
++      \ . '\|ia64\|lpia\|m32r\|m68k\|mipsel\|mips\|powerpcspe\|powerpc\|ppc64el'
++      \ . '\|ppc64\|s390x\|s390\|sh3eb\|sh3\|sh4eb\|sh4\|sh\|sparc64\|sparc\|x32\)'
++let s:pairs = 'hurd-i386\|kfreebsd-i386\|kfreebsd-amd64\|knetbsd-i386\|kopensolaris-i386\|netbsd-alpha\|netbsd-i386'
++
  " Define some common expressions we can use later on
 -syn match debcontrolArchitecture contained "\%(all\|linux-any\|\%(any-\)\=\%(alpha\|amd64\|arm\%(e[bl]\|hf\)\=\|avr32\|hppa\|i386\|ia64\|lpia\|m32r\|m68k\|mips\%(el\)\=\|powerpc\|ppc64\|s390x\=\|sh[34]\(eb\)\=\|sh\|sparc\%(64\)\=\)\|hurd-\%(i386\|any\)\|kfreebsd-\%(i386\|amd64\|any\)\|knetbsd-\%(i386\|any\)\|kopensolaris-\%(i386\|any\)\|netbsd-\%(alpha\|i386\|any\)\|any\)"
-+syn match debcontrolArchitecture contained "\%(all\|linux-any\|\%(any-\)\=\%(alpha\|amd64\|arm\%(e[bl]\|hf\|64\)\=\|avr32\|hppa\|i386\|ia64\|lpia\|m32r\|m68k\|mips\%(el\)\=\|powerpc\%(spe\)\=\|ppc64\|s390x\=\|sh[34]\(eb\)\=\|sh\|sparc\%(64\)\=\)\|x32\|hurd-\%(i386\|any\)\|kfreebsd-\%(i386\|amd64\|any\)\|knetbsd-\%(i386\|any\)\|kopensolaris-\%(i386\|any\)\|netbsd-\%(alpha\|i386\|any\)\|any\)"
++exe 'syn match debcontrolArchitecture contained "\%(all\|'. s:kernels .'-any\|\%(any-\)\='. s:archs .'\|'. s:pairs .'\|any\)"'
++
++unlet s:kernels s:archs s:pairs
++
  syn match debcontrolMultiArch contained "\%(no\|foreign\|allowed\|same\)"
  syn match debcontrolName contained "[a-z0-9][a-z0-9+.-]\+"
  syn match debcontrolPriority contained "\(extra\|important\|optional\|required\|standard\)"
+@@ -108,4 +120,7 @@
+ 
+ let b:current_syntax = "debcontrol"
+ 
++let &cpo = s:cpo_save
++unlet s:cpo_save
++
+ " vim: ts=8 sw=2
 diff -Naur vim74.orig/runtime/syntax/debsources.vim vim74/runtime/syntax/debsources.vim
 --- vim74.orig/runtime/syntax/debsources.vim    2013-05-17 15:25:15.000000000 +0000
-+++ vim74/runtime/syntax/debsources.vim 2014-06-01 00:43:05.357502668 +0000
++++ vim74/runtime/syntax/debsources.vim 2014-07-21 23:33:28.560162833 +0000
 @@ -2,7 +2,7 @@
  " Language:     Debian sources.list
@@ -27539 +30477 @@
  " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
 -" Last Change: 2013 May 05
-+" Last Change: 2014 Jan 20
++" Last Change: 2014 Jul 11
  " URL: http://anonscm.debian.org/hg/pkg-vim/vim/raw-file/unstable/runtime/syntax/debsources.vim
  
@@ -27548 +30486 @@
  syn match debsourcesUri            +\(http://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^'   <>"]\++
 -syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\(squeeze\|wheezy\|\(old\)\=stable\|testing\|unstable\|sid\|rc-buggy\|experimental\|lucid\|precise\|quantal\|raring\|saucy\)\([-[:alnum:]_./]*\)+
-+syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\(squeeze\|wheezy\|\(old\)\=stable\|testing\|unstable\|sid\|rc-buggy\|experimental\|lucid\|precise\|quantal\|saucy\|trusty\)\([-[:alnum:]_./]*\)+
++syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\(squeeze\|wheezy\|jessie\|\(old\)\=stable\|testing\|unstable\|sid\|rc-buggy\|experimental\|devel\|lucid\|precise\|trusty\|utopic\)\([-[:alnum:]_./]*\)+
  
  " Associate our matches and regions with pretty colours
@@ -27554 +30492 @@
 diff -Naur vim74.orig/runtime/syntax/diff.vim vim74/runtime/syntax/diff.vim
 --- vim74.orig/runtime/syntax/diff.vim  2013-07-24 09:47:50.000000000 +0000
-+++ vim74/runtime/syntax/diff.vim       2014-06-01 00:43:05.440835789 +0000
++++ vim74/runtime/syntax/diff.vim       2014-07-21 23:33:28.650162598 +0000
 @@ -2,7 +2,7 @@
  " Language:    Diff (context or unified)
@@ -27575 +30513 @@
 diff -Naur vim74.orig/runtime/syntax/dircolors.vim vim74/runtime/syntax/dircolors.vim
 --- vim74.orig/runtime/syntax/dircolors.vim     2012-04-25 09:42:39.000000000 +0000
-+++ vim74/runtime/syntax/dircolors.vim  2014-06-01 00:43:05.454169089 +0000
++++ vim74/runtime/syntax/dircolors.vim  2014-07-21 23:33:28.660162572 +0000
 @@ -1,751 +1,213 @@
  " Vim syntax file
@@ -28522 +31460 @@
 diff -Naur vim74.orig/runtime/syntax/dnsmasq.vim vim74/runtime/syntax/dnsmasq.vim
 --- vim74.orig/runtime/syntax/dnsmasq.vim       2012-05-19 12:57:09.000000000 +0000
-+++ vim74/runtime/syntax/dnsmasq.vim    2014-06-01 00:43:05.514168936 +0000
++++ vim74/runtime/syntax/dnsmasq.vim    2014-07-21 23:33:28.723495740 +0000
 @@ -1,26 +1,19 @@
  " Vim syntax file
@@ -28661 +31599 @@
 diff -Naur vim74.orig/runtime/syntax/dts.vim vim74/runtime/syntax/dts.vim
 --- vim74.orig/runtime/syntax/dts.vim   2013-04-05 14:25:40.000000000 +0000
-+++ vim74/runtime/syntax/dts.vim        2014-06-01 00:43:05.680835178 +0000
++++ vim74/runtime/syntax/dts.vim        2014-07-21 23:33:28.863495375 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -28692 +31630 @@
 diff -Naur vim74.orig/runtime/syntax/euphoria3.vim vim74/runtime/syntax/euphoria3.vim
 --- vim74.orig/runtime/syntax/euphoria3.vim     1970-01-01 00:00:00.000000000 +0000
-+++ vim74/runtime/syntax/euphoria3.vim  2014-06-01 00:43:05.907501268 +0000
++++ vim74/runtime/syntax/euphoria3.vim  2014-07-21 23:33:29.090161450 +0000
 @@ -0,0 +1,135 @@
 +" Vim syntax file
@@ -28831 +31769 @@
 diff -Naur vim74.orig/runtime/syntax/euphoria4.vim vim74/runtime/syntax/euphoria4.vim
 --- vim74.orig/runtime/syntax/euphoria4.vim     1970-01-01 00:00:00.000000000 +0000
-+++ vim74/runtime/syntax/euphoria4.vim  2014-06-01 00:43:05.914167917 +0000
++++ vim74/runtime/syntax/euphoria4.vim  2014-07-21 23:33:29.100161424 +0000
 @@ -0,0 +1,247 @@
 +" Vim syntax file
@@ -29082 +32020 @@
 diff -Naur vim74.orig/runtime/syntax/help.vim vim74/runtime/syntax/help.vim
 --- vim74.orig/runtime/syntax/help.vim  2013-07-07 11:27:18.000000000 +0000
-+++ vim74/runtime/syntax/help.vim       2014-06-01 00:43:06.510833065 +0000
++++ vim74/runtime/syntax/help.vim       2014-07-21 23:33:29.650159989 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -29125 +32063 @@
 diff -Naur vim74.orig/runtime/syntax/j.vim vim74/runtime/syntax/j.vim
 --- vim74.orig/runtime/syntax/j.vim     1970-01-01 00:00:00.000000000 +0000
-+++ vim74/runtime/syntax/j.vim  2014-06-01 00:43:06.840832224 +0000
-@@ -0,0 +1,134 @@
++++ vim74/runtime/syntax/j.vim  2014-07-21 23:33:29.993492426 +0000
+@@ -0,0 +1,140 @@
 +" Vim syntax file
 +" Language:    J
 +" Maintainer:  David BÃŒrgin <676c7473@gmail.com>
 +" URL:         https://github.com/glts/vim-j
-+" Last Change: 2014-04-05
++" Last Change: 2014-05-25
 +
 +if exists('b:current_syntax')
@@ -29175 +32113 @@
 +" made. See http://www.jsoftware.com/help/dictionary/dcons.htm for reference.
 +syntax match jNumber /\<_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(\%(r_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%([px]_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(r_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\)\=\)\=\)\|\%(\%(j\|a[dr]\)_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%([px]_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(\%(j\|a[dr]\)_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\)\=\)\=\)\|\%([px]_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\%(\%(j\|a[dr]\|r\)_\=\d\+\%(\.\d*\)\=\%([eE]_\=\d\+\)\=\)\=\)\)\=/
-+syntax match jNumber /\<_\=\d\+\%([eE]\d\+\)\=b_\=[0-9a-z]\+/
++syntax match jNumber /\<_\=\d\+\%([eE]\d\+\)\=b_\=[0-9a-z]\+\%(\.[0-9a-z]\+\)\=/
 +syntax match jNumber /\<__\=\>/
 +syntax match jNumber /\<_\./
@@ -29193 +32131 @@
 +syntax match jConjunction /;\.\|\^:\|![.:]/
 +
-+" Explicit noun definition. The difficulty is that the define expression
-+" "0 : 0" can occur in the middle of a line but the jNounDefine region must
-+" only start on the next line. The trick is to split the problem into two
-+" regions and link them with "nextgroup=".
++" Explicit noun definition. The difficulty is that the define expression can
++" occur in the middle of a line but the jNounDefine region must only start on
++" the next line. The trick is to split the problem into two regions and link
++" them with "nextgroup=". The fold wrapper provides syntax folding.
++syntax region jNounDefineFold
++    \ matchgroup=NONE start=/\<\%(\%(0\|noun\)\s\+\%(\:\s*0\|def\s\+0\|define\)\>\)\@=/
++    \ keepend matchgroup=NONE end=/^\s*)\s*$/
++    \ contains=jNounDefineStart
++    \ fold
 +syntax region jNounDefineStart
 +    \ matchgroup=jDefineExpression start=/\<\%(0\|noun\)\s\+\%(\:\s*0\|def\s\+0\|define\)\>/
 +    \ keepend matchgroup=NONE end=/$/
 +    \ contains=@jStdlibItems,@jPrimitiveItems,jNumber,jString,jParenGroup,jParen,jComment
-+    \ oneline skipempty nextgroup=jDefineEnd,jNounDefine
++    \ contained oneline skipempty nextgroup=jDefineEnd,jNounDefine
 +" These two items must have "contained", which allows them to match only after
 +" jNounDefineStart thanks to the "nextgroup=" above.
@@ -29216 +32159 @@
 +    \ matchgroup=jDefineEnd end=/^\s*)\s*$/
 +    \ contains=jControl,@jStdlibItems,@jPrimitiveItems,jNumber,jString,jArgument,jParenGroup,jParen,jComment,jDefineMonadDyad
++    \ fold
 +syntax match jDefineMonadDyad contained /^\s*:\s*$/
 +
@@ -29261 +32205 @@
 +let &cpo = s:save_cpo
 +unlet s:save_cpo
+diff -Naur vim74.orig/runtime/syntax/json.vim vim74/runtime/syntax/json.vim
+--- vim74.orig/runtime/syntax/json.vim  1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/syntax/json.vim       2014-07-21 23:33:30.130158736 +0000
+@@ -0,0 +1,16 @@
++" Vim syntax file
++" Language:            JSON
++" Maintainer:          David Barnett <daviebdawg+vim@gmail.com>
++" Last Change:         2014 Jul 16
++
++" For version 5.x: Clear all syntax items.
++" For version 6.x and later: Quit when a syntax file was already loaded.
++if exists('b:current_syntax')
++  finish
++endif
++
++" Use JavaScript syntax. JSON is a subset of JavaScript.
++runtime! syntax/javascript.vim
++unlet b:current_syntax
++
++let b:current_syntax = 'json'
+diff -Naur vim74.orig/runtime/syntax/kivy.vim vim74/runtime/syntax/kivy.vim
+--- vim74.orig/runtime/syntax/kivy.vim  1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/syntax/kivy.vim       2014-07-21 23:33:30.163491982 +0000
+@@ -0,0 +1,36 @@
++" Vim syntax file
++" Language:    Kivy
++" Maintainer:  Corey Prophitt <prophitt.corey@gmail.com>
++" Last Change: May 29th, 2014
++" Version:     1
++" URL:         http://kivy.org/
++
++if exists("b:current_syntax")
++    finish
++endif
++
++" Load Python syntax first (Python can be used within Kivy)
++syn include @pyth $VIMRUNTIME/syntax/python.vim
++
++" Kivy language rules can be found here
++"   http://kivy.org/docs/guide/lang.html
++
++" Define Kivy syntax
++syn match kivyPreProc   /#:.*/
++syn match kivyComment   /#.*/
++syn match kivyRule      /<\I\i*\(,\s*\I\i*\)*>:/
++syn match kivyAttribute /\<\I\i*\>/ nextgroup=kivyValue
++
++syn region kivyValue start=":" end=/$/  contains=@pyth skipwhite
++
++syn region kivyAttribute matchgroup=kivyIdent start=/[\a_][\a\d_]*:/ end=/$/ contains=@pyth skipwhite
++
++hi def link kivyPreproc   PreProc
++hi def link kivyComment   Comment
++hi def link kivyRule      Function
++hi def link kivyIdent     Statement
++hi def link kivyAttribute Label
++
++let b:current_syntax = "kivy"
++
++" vim: ts=8
 diff -Naur vim74.orig/runtime/syntax/mail.vim vim74/runtime/syntax/mail.vim
 --- vim74.orig/runtime/syntax/mail.vim  2013-07-15 21:28:26.000000000 +0000
-+++ vim74/runtime/syntax/mail.vim       2014-06-01 00:43:07.424164072 +0000
++++ vim74/runtime/syntax/mail.vim       2014-07-21 23:33:30.653490704 +0000
 @@ -2,7 +2,7 @@
  " Language:            Mail file
@@ -29284 +32288 @@
 diff -Naur vim74.orig/runtime/syntax/masm.vim vim74/runtime/syntax/masm.vim
 --- vim74.orig/runtime/syntax/masm.vim  2012-02-04 19:24:10.000000000 +0000
-+++ vim74/runtime/syntax/masm.vim       2014-06-01 00:43:07.554163741 +0000
++++ vim74/runtime/syntax/masm.vim       2014-07-21 23:33:30.760157092 +0000
 @@ -2,14 +2,11 @@
  " Language:    Microsoft Macro Assembler (80x86)
@@ -29423 +32427 @@
 diff -Naur vim74.orig/runtime/syntax/mix.vim vim74/runtime/syntax/mix.vim
 --- vim74.orig/runtime/syntax/mix.vim   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/runtime/syntax/mix.vim        2014-06-01 00:43:07.694163385 +0000
++++ vim74/runtime/syntax/mix.vim        2014-07-21 23:33:30.886823428 +0000
 @@ -0,0 +1,83 @@
 +" Vim syntax file
@@ -29510 +32514 @@
 diff -Naur vim74.orig/runtime/syntax/netrw.vim vim74/runtime/syntax/netrw.vim
 --- vim74.orig/runtime/syntax/netrw.vim 2013-02-25 17:23:59.000000000 +0000
-+++ vim74/runtime/syntax/netrw.vim      2014-06-01 00:43:08.124162290 +0000
++++ vim74/runtime/syntax/netrw.vim      2014-07-21 23:33:31.230155866 +0000
 @@ -1,7 +1,7 @@
  " Language   : Netrw Remote-Directory Listing Syntax
@@ -29556 +32560 @@
   hi default link netrwHideSep  netrwComment
   hi default link netrwList     Statement
+diff -Naur vim74.orig/runtime/syntax/ninja.vim vim74/runtime/syntax/ninja.vim
+--- vim74.orig/runtime/syntax/ninja.vim 2013-04-16 20:48:25.000000000 +0000
++++ vim74/runtime/syntax/ninja.vim      2014-07-21 23:33:31.240155840 +0000
+@@ -1,10 +1,10 @@
+ " ninja build file syntax.
+ " Language: ninja build file as described at
+ "           http://martine.github.com/ninja/manual.html
+-" Version: 1.3
+-" Last Change: 2013/04/16
++" Version: 1.4
++" Last Change: 2014/05/13
+ " Maintainer: Nicolas Weber <nicolasweber@gmx.de>
+-" Version 1.3 of this script is in the upstream vim repository and will be
++" Version 1.4 of this script is in the upstream vim repository and will be
+ " included in the next vim release. If you change this, please send your change
+ " upstream.
+ 
+@@ -55,6 +55,7 @@
+ " $simple_varname -> variable
+ " ${varname} -> variable
+ 
++syn match   ninjaDollar "\$\$"
+ syn match   ninjaWrapLineOperator "\$$"
+ syn match   ninjaSimpleVar "\$[a-zA-Z0-9_-]\+"
+ syn match   ninjaVar       "\${[a-zA-Z0-9_.-]\+}"
+@@ -70,6 +71,7 @@
+ hi def link ninjaKeyword Keyword
+ hi def link ninjaRuleCommand Statement
+ hi def link ninjaPoolCommand Statement
++hi def link ninjaDollar ninjaOperator
+ hi def link ninjaWrapLineOperator ninjaOperator
+ hi def link ninjaOperator Operator
+ hi def link ninjaSimpleVar ninjaVar
 diff -Naur vim74.orig/runtime/syntax/php.vim vim74/runtime/syntax/php.vim
 --- vim74.orig/runtime/syntax/php.vim   2012-12-11 20:15:31.000000000 +0000
-+++ vim74/runtime/syntax/php.vim        2014-06-01 00:43:08.470828074 +0000
++++ vim74/runtime/syntax/php.vim        2014-07-21 23:33:31.533488407 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -29597 +32634 @@
    if exists("php_oldStyle")
    hi  phpIntVar guifg=Red ctermfg=DarkRed
+diff -Naur vim74.orig/runtime/syntax/python.vim vim74/runtime/syntax/python.vim
+--- vim74.orig/runtime/syntax/python.vim        2013-02-26 17:28:59.000000000 +0000
++++ vim74/runtime/syntax/python.vim     2014-07-21 23:33:31.893487468 +0000
+@@ -1,7 +1,7 @@
+ " Vim syntax file
+ " Language:    Python
+ " Maintainer:  Neil Schemenauer <nas@python.ca>
+-" Last Change: 2013 Feb 26
++" Last Change: 2014 Jul 16
+ " Credits:     Zvezdan Petkovic <zpetkovic@acm.org>
+ "              Neil Schemenauer <nas@python.ca>
+ "              Dmitry Vasiliev
+@@ -113,7 +113,7 @@
+ syn match   pythonEscape       "\\x\x\{2}" contained
+ syn match   pythonEscape       "\%(\\u\x\{4}\|\\U\x\{8}\)" contained
+ " Python allows case-insensitive Unicode IDs: http://www.unicode.org/charts/
+-syn match   pythonEscape       "\\N{\a\+\%(\s\a\+\)*}" contained
++syn match   pythonEscape       "\\N{.\{-}}" contained
+ syn match   pythonEscape       "\\$"
+ 
+ if exists("python_highlight_all")
+diff -Naur vim74.orig/runtime/syntax/r.vim vim74/runtime/syntax/r.vim
+--- vim74.orig/runtime/syntax/r.vim     2013-06-01 21:00:21.000000000 +0000
++++ vim74/runtime/syntax/r.vim  2014-07-21 23:33:31.916820740 +0000
+@@ -3,7 +3,7 @@
+ " Maintainer:        Jakson Aquino <jalvesaq@gmail.com>
+ " Former Maintainers: Vaidotas Zemlys <zemlys@gmail.com>
+ "                    Tom Payne <tom@tompayne.org>
+-" Last Change:       Sun May 19, 2013  05:59PM
++" Last Change:       Wed Jul 09, 2014  10:29PM
+ " Filenames:         *.R *.r *.Rhistory *.Rt
+ " 
+ " NOTE: The highlighting of R functions is defined in the
+@@ -30,14 +30,16 @@
+ syn case match
+ 
+ " Comment
+-syn match rComment contains=@Spell "#.*"
++syn match rCommentTodo contained "\(BUG\|FIXME\|NOTE\|TODO\):"
++syn match rComment contains=@Spell,rCommentTodo "#.*"
+ 
+ " Roxygen
+ syn match rOKeyword contained "@\(param\|return\|name\|rdname\|examples\|include\|docType\)"
+ syn match rOKeyword contained "@\(S3method\|TODO\|aliases\|alias\|assignee\|author\|callGraphDepth\|callGraph\)"
+ syn match rOKeyword contained "@\(callGraphPrimitives\|concept\|exportClass\|exportMethod\|exportPattern\|export\|formals\)"
+ syn match rOKeyword contained "@\(format\|importClassesFrom\|importFrom\|importMethodsFrom\|import\|keywords\)"
+-syn match rOKeyword contained "@\(method\|nord\|note\|references\|seealso\|setClass\|slot\|source\|title\|usage\)"
++syn match rOKeyword contained "@\(method\|noRd\|note\|references\|seealso\|setClass\|slot\|source\|title\|usage\)"
++syn match rOKeyword contained "@\(family\|template\|templateVar\|description\|details\|inheritsParams\)"
+ syn match rOComment contains=@Spell,rOKeyword "#'.*"
+ 
+ 
+@@ -119,7 +121,7 @@
+ else
+   syn match rOperator    "[|!<>^~`/:]"
+ endif
+-syn match rOperator    "%\{2}\|%\S*%"
++syn match rOperator    "%\{2}\|%\S\{-}%"
+ syn match rOpError  '\*\{3}'
+ syn match rOpError  '//'
+ syn match rOpError  '&&&'
+@@ -164,8 +166,8 @@
+ syn keyword rPreProc     library require attach detach source
+ 
+ if &filetype == "rhelp"
+-    syn match rHelpIdent '\\method'
+-    syn match rHelpIdent '\\S4method'
++  syn match rHelpIdent '\\method'
++  syn match rHelpIdent '\\S4method'
+ endif
+ 
+ " Type
+@@ -187,6 +189,7 @@
+ hi def link rBoolean     Boolean
+ hi def link rBraceError  Error
+ hi def link rComment     Comment
++hi def link rCommentTodo Todo
+ hi def link rOComment    Comment
+ hi def link rComplex     Number
+ hi def link rConditional Conditional
+diff -Naur vim74.orig/runtime/syntax/rhelp.vim vim74/runtime/syntax/rhelp.vim
+--- vim74.orig/runtime/syntax/rhelp.vim 2011-10-20 14:48:41.000000000 +0000
++++ vim74/runtime/syntax/rhelp.vim      2014-07-21 23:33:32.083486972 +0000
+@@ -2,9 +2,7 @@
+ " Language:    R Help File
+ " Maintainer: Jakson Aquino <jalvesaq@gmail.com>
+ " Former Maintainer: Johannes Ranke <jranke@uni-bremen.de>
+-" Last Change: Fri Oct 14, 2011  09:54PM
+-" Version:     0.7.4
+-" SVN:            $Id: rhelp.vim 90 2010-11-22 10:58:11Z ranke $
++" Last Change: Wed Jul 09, 2014  10:28PM
+ " Remarks:     - Includes R syntax highlighting in the appropriate
+ "                sections if an r.vim file is in the same directory or in the
+ "                default debian location.
+@@ -23,6 +21,8 @@
+   finish
+ endif 
+ 
++setlocal iskeyword=@,48-57,_,.
++
+ syn case match
+ 
+ " R help identifiers {{{1
+@@ -51,7 +51,12 @@
+ syn region rhelpRcode matchgroup=Delimiter start="\\usage{" matchgroup=Delimiter transparent end="}" contains=@R,rhelpIdentifier,rhelpS4method
+ syn region rhelpRcode matchgroup=Delimiter start="\\synopsis{" matchgroup=Delimiter transparent end="}" contains=@R
+ syn region rhelpRcode matchgroup=Delimiter start="\\special{" matchgroup=Delimiter transparent end="}" contains=@R
+-syn region rhelpRcode matchgroup=Delimiter start="\\code{" skip='\\\@<!{.\{-}\\\@<!}' transparent end="}" contains=@R,rhelpDots,rhelpString,rhelpSpecialChar,rhelpLink keepend
++
++if v:version > 703
++  syn region rhelpRcode matchgroup=Delimiter start="\\code{" skip='\\\@1<!{.\{-}\\\@1<!}' transparent end="}" contains=@R,rhelpDots,rhelpString,rhelpSpecialChar,rhelpLink keepend
++else
++  syn region rhelpRcode matchgroup=Delimiter start="\\code{" skip='\\\@<!{.\{-}\\\@<!}' transparent end="}" contains=@R,rhelpDots,rhelpString,rhelpSpecialChar,rhelpLink keepend
++endif
+ syn region rhelpS4method matchgroup=Delimiter start="\\S4method{.*}(" matchgroup=Delimiter transparent end=")" contains=@R,rhelpDots
+ syn region rhelpSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter transparent end="}" contains=@R
+ 
+@@ -127,8 +132,13 @@
+ syn region rhelpLink matchgroup=rhelpSection start="\\linkS4class{" end="}" contained keepend extend
+ 
+ " Verbatim like {{{1
+-syn region rhelpVerbatim matchgroup=rhelpType start="\\samp{" skip='\\\@<!{.\{-}\\\@<!}' end="}" contains=rhelpSpecialChar,rhelpComment
+-syn region rhelpVerbatim matchgroup=rhelpType start="\\verb{" skip='\\\@<!{.\{-}\\\@<!}' end="}" contains=rhelpSpecialChar,rhelpComment
++if v:version > 703
++  syn region rhelpVerbatim matchgroup=rhelpType start="\\samp{" skip='\\\@1<!{.\{-}\\\@1<!}' end="}" contains=rhelpSpecialChar,rhelpComment
++  syn region rhelpVerbatim matchgroup=rhelpType start="\\verb{" skip='\\\@1<!{.\{-}\\\@1<!}' end="}" contains=rhelpSpecialChar,rhelpComment
++else
++  syn region rhelpVerbatim matchgroup=rhelpType start="\\samp{" skip='\\\@<!{.\{-}\\\@<!}' end="}" contains=rhelpSpecialChar,rhelpComment
++  syn region rhelpVerbatim matchgroup=rhelpType start="\\verb{" skip='\\\@<!{.\{-}\\\@<!}' end="}" contains=rhelpSpecialChar,rhelpComment
++endif
+ 
+ " Type Styles {{{1
+ syn match rhelpType            "\\emph\>"
+@@ -200,6 +210,8 @@
+ syn match rhelpCurlyError /[)\]]/ contained
+ syn match rhelpParenError /[\]}]/ contained
+ 
++syntax sync match rhelpSyncRcode grouphere rhelpRcode "\\examples{"
++
+ " Define the default highlighting {{{1
+ " For version 5.7 and earlier: only when not done already
+ " For version 5.8 and later: only when an item doesn't have highlighting yet
+@@ -233,4 +245,5 @@
+ endif 
+ 
+ let   b:current_syntax = "rhelp"
+-" vim: foldmethod=marker:
++
++" vim: foldmethod=marker sw=2
+diff -Naur vim74.orig/runtime/syntax/rmd.vim vim74/runtime/syntax/rmd.vim
+--- vim74.orig/runtime/syntax/rmd.vim   1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/syntax/rmd.vim        2014-07-21 23:33:32.123486868 +0000
+@@ -0,0 +1,87 @@
++" markdown Text with R statements
++" Language: markdown with R code chunks
++" Last Change: Wed Jul 09, 2014  10:29PM
++"
++" CONFIGURATION:
++"   To highlight chunk headers as R code, put in your vimrc:
++"   let rmd_syn_hl_chunk = 1
++
++" for portability
++if version < 600
++  syntax clear
++elseif exists("b:current_syntax")
++  finish
++endif
++
++" load all of pandoc info
++runtime syntax/pandoc.vim
++if exists("b:current_syntax")
++  let rmdIsPandoc = 1
++  unlet b:current_syntax
++else
++  let rmdIsPandoc = 0
++  runtime syntax/markdown.vim
++  if exists("b:current_syntax")
++    unlet b:current_syntax
++  endif
++endif
++
++" load all of the r syntax highlighting rules into @R
++syntax include @R syntax/r.vim
++if exists("b:current_syntax")
++  unlet b:current_syntax
++endif
++
++if exists("g:rmd_syn_hl_chunk")
++  " highlight R code inside chunk header
++  syntax match rmdChunkDelim "^[ \t]*```{r" contained
++  syntax match rmdChunkDelim "}$" contained
++else
++  syntax match rmdChunkDelim "^[ \t]*```{r.*}$" contained
++endif
++syntax match rmdChunkDelim "^[ \t]*```$" contained
++syntax region rmdChunk start="^[ \t]*``` *{r.*}$" end="^[ \t]*```$" contains=@R,rmdChunkDelim keepend fold
++
++" also match and syntax highlight in-line R code
++syntax match rmdEndInline "`" contained
++syntax match rmdBeginInline "`r " contained
++syntax region rmdrInline start="`r "  end="`" contains=@R,rmdBeginInline,rmdEndInline keepend
++
++" match slidify special marker
++syntax match rmdSlidifySpecial "\*\*\*"
++
++
++if rmdIsPandoc == 0
++  syn match rmdBlockQuote /^\s*>.*\n\(.*\n\@<!\n\)*/ skipnl
++  " LaTeX
++  syntax include @LaTeX syntax/tex.vim
++  if exists("b:current_syntax")
++    unlet b:current_syntax
++  endif
++  " Inline
++  syntax match rmdLaTeXInlDelim "\$"
++  syntax match rmdLaTeXInlDelim "\\\$"
++  syn region texMathZoneX      matchgroup=Delimiter start="\$" skip="\\\\\|\\\$"       matchgroup=Delimiter end="\$" end="%stopzone\>" contains=@texMathZoneGroup
++  " Region
++  syntax match rmdLaTeXRegDelim "\$\$" contained
++  syntax match rmdLaTeXRegDelim "\$\$latex$" contained
++  syntax region rmdLaTeXRegion start="^\$\$" skip="\\\$" end="\$\$$" contains=@LaTeX,rmdLaTeXSt,rmdLaTeXRegDelim keepend
++  syntax region rmdLaTeXRegion2 start="^\\\[" end="\\\]" contains=@LaTeX,rmdLaTeXSt,rmdLaTeXRegDelim keepend
++  hi def link rmdLaTeXSt Statement
++  hi def link rmdLaTeXInlDelim Special
++  hi def link rmdLaTeXRegDelim Special
++endif
++
++setlocal iskeyword=@,48-57,_,.
++
++syn sync match rmdSyncChunk grouphere rmdChunk "^[ \t]*``` *{r"
++
++hi def link rmdChunkDelim Special
++hi def link rmdBeginInline Special
++hi def link rmdEndInline Special
++hi def link rmdBlockQuote Comment
++hi def link rmdSlidifySpecial Special
++
++let b:current_syntax = "rmd"
++
++" vim: ts=8 sw=2
+diff -Naur vim74.orig/runtime/syntax/rrst.vim vim74/runtime/syntax/rrst.vim
+--- vim74.orig/runtime/syntax/rrst.vim  1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/syntax/rrst.vim       2014-07-21 23:33:32.563485720 +0000
+@@ -0,0 +1,47 @@
++" reStructured Text with R statements
++" Language: reST with R code chunks
++" Maintainer: Alex Zvoleff, azvoleff@mail.sdsu.edu
++" Last Change: Wed Jul 09, 2014  10:29PM
++"
++" CONFIGURATION:
++"   To highlight chunk headers as R code, put in your vimrc:
++"   let rrst_syn_hl_chunk = 1
++
++" for portability
++if version < 600
++  syntax clear
++elseif exists("b:current_syntax")
++  finish
++endif
++
++" load all of the rst info
++runtime syntax/rst.vim
++unlet b:current_syntax
++
++" load all of the r syntax highlighting rules into @R
++syntax include @R syntax/r.vim
++
++setlocal iskeyword=@,48-57,_,.
++
++" highlight R chunks
++if exists("g:rrst_syn_hl_chunk")
++  " highlight R code inside chunk header
++  syntax match rrstChunkDelim "^\.\. {r" contained
++  syntax match rrstChunkDelim "}$" contained
++else
++  syntax match rrstChunkDelim "^\.\. {r .*}$" contained
++endif
++syntax match rrstChunkDelim "^\.\. \.\.$" contained
++syntax region rrstChunk start="^\.\. {r.*}$" end="^\.\. \.\.$" contains=@R,rrstChunkDelim keepend transparent fold
++
++" also highlight in-line R code
++syntax match rrstInlineDelim "`" contained
++syntax match rrstInlineDelim ":r:" contained
++syntax region rrstInline start=":r: *`" skip=/\\\\\|\\`/ end="`" contains=@R,rrstInlineDelim keepend
++
++hi def link rrstChunkDelim Special
++hi def link rrstInlineDelim Special
++
++let b:current_syntax = "rrst"
++
++" vim: ts=8 sw=2
 diff -Naur vim74.orig/runtime/syntax/rst.vim vim74/runtime/syntax/rst.vim
 --- vim74.orig/runtime/syntax/rst.vim   2013-06-04 14:41:25.000000000 +0000
-+++ vim74/runtime/syntax/rst.vim        2014-06-01 00:43:09.164159642 +0000
++++ vim74/runtime/syntax/rst.vim        2014-07-21 23:33:32.570152369 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -29620 +32948 @@
 diff -Naur vim74.orig/runtime/syntax/sh.vim vim74/runtime/syntax/sh.vim
 --- vim74.orig/runtime/syntax/sh.vim    2013-07-05 16:35:45.000000000 +0000
-+++ vim74/runtime/syntax/sh.vim 2014-06-01 00:43:09.417492330 +0000
++++ vim74/runtime/syntax/sh.vim 2014-07-21 23:33:33.180150777 +0000
 @@ -2,10 +2,10 @@
  " Language:            shell (sh) Korn shell (ksh) bash (sh)
@@ -29738 +33066 @@
 diff -Naur vim74.orig/runtime/syntax/spec.vim vim74/runtime/syntax/spec.vim
 --- vim74.orig/runtime/syntax/spec.vim  2010-05-15 11:03:57.000000000 +0000
-+++ vim74/runtime/syntax/spec.vim       2014-06-01 00:43:09.717491566 +0000
++++ vim74/runtime/syntax/spec.vim       2014-07-21 23:33:33.780149212 +0000
 @@ -1,8 +1,9 @@
  " Filename:    spec.vim
@@ -29773 +33101 @@
 diff -Naur vim74.orig/runtime/syntax/svn.vim vim74/runtime/syntax/svn.vim
 --- vim74.orig/runtime/syntax/svn.vim   2012-07-25 13:08:55.000000000 +0000
-+++ vim74/runtime/syntax/svn.vim        2014-06-01 00:43:09.984157553 +0000
++++ vim74/runtime/syntax/svn.vim        2014-07-21 23:33:34.856813069 +0000
 @@ -2,15 +2,18 @@
  " Language:     Subversion (svn) commit file
@@ -29838 +33166 @@
 diff -Naur vim74.orig/runtime/syntax/systemverilog.vim vim74/runtime/syntax/systemverilog.vim
 --- vim74.orig/runtime/syntax/systemverilog.vim 1970-01-01 00:00:00.000000000 +0000
-+++ vim74/runtime/syntax/systemverilog.vim      2014-06-01 00:43:10.054157375 +0000
++++ vim74/runtime/syntax/systemverilog.vim      2014-07-21 23:33:34.916812912 +0000
 @@ -0,0 +1,101 @@
 +" Vim syntax file
@@ -29943 +33271 @@
 diff -Naur vim74.orig/runtime/syntax/tcl.vim vim74/runtime/syntax/tcl.vim
 --- vim74.orig/runtime/syntax/tcl.vim   2010-05-15 11:03:56.000000000 +0000
-+++ vim74/runtime/syntax/tcl.vim        2014-06-01 00:43:10.170823745 +0000
++++ vim74/runtime/syntax/tcl.vim        2014-07-21 23:33:35.043479248 +0000
 @@ -6,11 +6,9 @@
  "              (previously Matt Neumann <mattneu@purpleturtle.com>)
@@ -30078 +33406 @@
 diff -Naur vim74.orig/runtime/syntax/tex.vim vim74/runtime/syntax/tex.vim
 --- vim74.orig/runtime/syntax/tex.vim   2013-07-05 16:35:45.000000000 +0000
-+++ vim74/runtime/syntax/tex.vim        2014-06-01 00:43:10.227490267 +0000
++++ vim74/runtime/syntax/tex.vim        2014-07-21 23:33:35.256812025 +0000
 @@ -1,8 +1,8 @@
  " Vim syntax file
@@ -30221 +33549 @@
 diff -Naur vim74.orig/runtime/syntax/upstreamlog.vim vim74/runtime/syntax/upstreamlog.vim
 --- vim74.orig/runtime/syntax/upstreamlog.vim   2013-08-03 15:47:26.000000000 +0000
-+++ vim74/runtime/syntax/upstreamlog.vim        2014-06-01 00:43:10.500822905 +0000
++++ vim74/runtime/syntax/upstreamlog.vim        2014-07-21 23:33:35.950143549 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -30250 +33578 @@
 diff -Naur vim74.orig/runtime/syntax/usserverlog.vim vim74/runtime/syntax/usserverlog.vim
 --- vim74.orig/runtime/syntax/usserverlog.vim   2013-08-03 15:47:26.000000000 +0000
-+++ vim74/runtime/syntax/usserverlog.vim        2014-06-01 00:43:10.510822879 +0000
++++ vim74/runtime/syntax/usserverlog.vim        2014-07-21 23:33:35.960143523 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -30279 +33607 @@
 diff -Naur vim74.orig/runtime/syntax/usw2kagtlog.vim vim74/runtime/syntax/usw2kagtlog.vim
 --- vim74.orig/runtime/syntax/usw2kagtlog.vim   2013-08-03 15:47:26.000000000 +0000
-+++ vim74/runtime/syntax/usw2kagtlog.vim        2014-06-01 00:43:10.510822879 +0000
++++ vim74/runtime/syntax/usw2kagtlog.vim        2014-07-21 23:33:35.963476848 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -30308 +33636 @@
 diff -Naur vim74.orig/runtime/syntax/vhdl.vim vim74/runtime/syntax/vhdl.vim
 --- vim74.orig/runtime/syntax/vhdl.vim  2012-06-01 16:05:47.000000000 +0000
-+++ vim74/runtime/syntax/vhdl.vim       2014-06-01 00:43:10.607489300 +0000
++++ vim74/runtime/syntax/vhdl.vim       2014-07-21 23:33:36.056809938 +0000
 @@ -1,12 +1,12 @@
  " Vim syntax file
@@ -30462 +33790 @@
 diff -Naur vim74.orig/runtime/syntax/vim.vim vim74/runtime/syntax/vim.vim
 --- vim74.orig/runtime/syntax/vim.vim   2013-07-05 16:35:45.000000000 +0000
-+++ vim74/runtime/syntax/vim.vim        2014-06-01 00:43:10.670822472 +0000
++++ vim74/runtime/syntax/vim.vim        2014-07-21 23:33:36.110143132 +0000
 @@ -1,8 +1,8 @@
  " Vim syntax file
@@ -30567 +33895 @@
 diff -Naur vim74.orig/runtime/syntax/yacc.vim vim74/runtime/syntax/yacc.vim
 --- vim74.orig/runtime/syntax/yacc.vim  2012-11-15 01:25:58.000000000 +0000
-+++ vim74/runtime/syntax/yacc.vim       2014-06-01 00:43:11.070821453 +0000
++++ vim74/runtime/syntax/yacc.vim       2014-07-21 23:33:36.570141932 +0000
 @@ -1,8 +1,8 @@
  " Vim syntax file
@@ -30590 +33918 @@
 diff -Naur vim74.orig/runtime/syntax/yaml.vim vim74/runtime/syntax/yaml.vim
 --- vim74.orig/runtime/syntax/yaml.vim  2010-10-08 13:33:39.000000000 +0000
-+++ vim74/runtime/syntax/yaml.vim       2014-06-01 00:43:11.080821428 +0000
++++ vim74/runtime/syntax/yaml.vim       2014-07-21 23:33:36.576808581 +0000
 @@ -108,9 +108,10 @@
  syn match yamlFlowMappingMerge /<<\ze\s*:/ contained nextgroup=yamlKeyValueDelimiter
@@ -30606 +33934 @@
 diff -Naur vim74.orig/runtime/tutor/tutor vim74/runtime/tutor/tutor
 --- vim74.orig/runtime/tutor/tutor      2012-10-03 13:29:40.000000000 +0000
-+++ vim74/runtime/tutor/tutor   2014-06-01 00:43:11.947485887 +0000
++++ vim74/runtime/tutor/tutor   2014-07-21 23:33:36.940140966 +0000
 @@ -55,8 +55,8 @@
    2. Type:     :q! <ENTER>.
@@ -30620 +33948 @@
 diff -Naur vim74.orig/runtime/tutor/tutor.es vim74/runtime/tutor/tutor.es
 --- vim74.orig/runtime/tutor/tutor.es   2010-05-15 11:04:02.000000000 +0000
-+++ vim74/runtime/tutor/tutor.es        2014-06-01 00:43:12.157485353 +0000
++++ vim74/runtime/tutor/tutor.es        2014-07-21 23:33:37.110140523 +0000
 @@ -121,7 +121,7 @@
          h (izquierda)     j (abajo)      k (arriba)      l (derecha)
@@ -30632 +33960 @@
 diff -Naur vim74.orig/runtime/tutor/tutor.it vim74/runtime/tutor/tutor.it
 --- vim74.orig/runtime/tutor/tutor.it   2010-05-23 09:00:00.000000000 +0000
-+++ vim74/runtime/tutor/tutor.it        2014-06-01 00:43:12.324151595 +0000
++++ vim74/runtime/tutor/tutor.it        2014-07-21 23:33:37.230140209 +0000
 @@ -638,7 +638,7 @@
  NOTA: Se esci da Vim e riesegui Vim battendo  vim TEST , il file aperto
@@ -30644 +33972 @@
 diff -Naur vim74.orig/runtime/tutor/tutor.it.utf-8 vim74/runtime/tutor/tutor.it.utf-8
 --- vim74.orig/runtime/tutor/tutor.it.utf-8     2010-05-23 10:11:46.000000000 +0000
-+++ vim74/runtime/tutor/tutor.it.utf-8  2014-06-01 00:43:12.337484894 +0000
++++ vim74/runtime/tutor/tutor.it.utf-8  2014-07-21 23:33:37.246806833 +0000
 @@ -638,7 +638,7 @@
  NOTA: Se esci da Vim e riesegui Vim battendo  vim TEST , il file aperto
@@ -30656 +33984 @@
 diff -Naur vim74.orig/runtime/tutor/tutor.pt vim74/runtime/tutor/tutor.pt
 --- vim74.orig/runtime/tutor/tutor.pt   2010-08-11 20:54:33.000000000 +0000
-+++ vim74/runtime/tutor/tutor.pt        2014-06-01 00:43:12.544151035 +0000
++++ vim74/runtime/tutor/tutor.pt        2014-07-21 23:33:37.463472934 +0000
 @@ -58,11 +58,11 @@
       Isso sai do editor SEM salvar qualquer mudança que tenha sido feita.
@@ -30683 +34011 @@
 diff -Naur vim74.orig/runtime/tutor/tutor.pt.utf-8 vim74/runtime/tutor/tutor.pt.utf-8
 --- vim74.orig/runtime/tutor/tutor.pt.utf-8     2010-08-11 20:54:33.000000000 +0000
-+++ vim74/runtime/tutor/tutor.pt.utf-8  2014-06-01 00:43:12.567484309 +0000
++++ vim74/runtime/tutor/tutor.pt.utf-8  2014-07-21 23:33:37.470139583 +0000
 @@ -58,11 +58,11 @@
       Isso sai do editor SEM salvar qualquer mudança que tenha sido feita.
@@ -30708 +34036 @@
  
    3. Agora digite  :s/aa/a/g   significando substituir globalmente na linha.
+diff -Naur vim74.orig/runtime/tutor/tutor.sr.cp1250 vim74/runtime/tutor/tutor.sr.cp1250
+--- vim74.orig/runtime/tutor/tutor.sr.cp1250    1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/tutor/tutor.sr.cp1250 2014-07-21 23:33:37.566805998 +0000
+@@ -0,0 +1,971 @@
++===============================================================================
++=    D o b r o d o š l i   u   VIM   p r i r u è n i k  -    Verzija 1.7      =
++===============================================================================
++
++     Vim je moæan editor sa mnogo komandi, suviše da bismo ih ovde sve
++     opisali.  Priruènik je zamišljen da opiše dovoljno komandi da biste
++     mogli lagodno da koristite Vim kao editor opšte namene.
++
++     Približno vreme potrebno za uspešan završetak priruènika je izmeðu
++     25 i 30 minuta, u zavisnosti od vremena potrošenog na vežbu.
++
++     UPOZORENJE:
++     Komande u lekcijama æe menjati tekst.  Iskopirajte ovaj fajl i
++     vežbajte na kopiji (ako ste pokrenuli "vimtutor" ovo je veæ kopija).
++
++     Važno je upamtiti da je ovaj priruènik zamišljen za aktivnu vežbu.
++     To znaèi da morate upotrebljavati komande o kojima èitate da biste
++     ih nauèili.  Ako samo èitate tekst, zaboraviæete komande!
++
++     Ako je Caps Lock ukljuèen ISKLJUÈITE ga.  Pritisnite taster  j  dovoljno
++     puta da lekcija 1.1 cela stane na ekran.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                     Lekcija 1.1:  POMERANJE KURSORA
++
++
++ ** Za pomeranje kursora, pritiskajte tastere h,j,k,l kako je prikazano **
++            ^
++            k              Savet: h je s leve strane i pomera kursor u levo.
++       < h      l >               l je s desne strane i pomera kursor u desno.
++            j                     j izgleda kao strelica naniže.
++            v
++  1. Pomerajte kursor po ekranu dok se ne naviknete na komande.
++
++  2. Pritisnite taster (j) dok ne poène da se ponavlja.
++     Sada znate kako da doðete do naredne lekcije.
++
++  3. Koristeæi taster j preðite na lekciju 1.2.
++
++NAPOMENA:  Ako niste sigurni šta ste zapravo pritisnuli, pritisnite <ESC>
++           za prelazak u Normal mod i pokušajte ponovo.
++
++NAPOMENA:  Strelice takoðe pomeraju kursor, ali korišæenje tastera hjkl je
++           znatno brže, kad se jednom naviknete na njih.  Zaista!
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                          Lekcija 1.2: IZLAZAK IZ VIM-a
++
++
++  !! UPOZORENJE: Pre izvoðenja bilo kog koraka, proèitajte celu lekciju!!
++
++  1. Pritisnite <ESC> (editor je sada u Normal modu).
++
++  2. Otkucajte:        :q! <ENTER>.
++     Ovime se izlazi iz editora, sa GUBITKOM svih izmena.
++
++  3. Kada se pojavi komandni prompt, unesite komandu koja je pokrenula
++     ovaj priruènik:           vimtutor <ENTER>
++
++  4. Ako ste upamtili ove korake, izvršite ih redom od 1 do 3 da biste
++     izašli iz editora i ponovo ga pokrenuli.
++
++NAPOMENA:  :q! <ENTER>  poništava sve izmene koje ste napravili.
++           U narednim lekcijama nauèiæete kako da saèuvate izmene.
++
++  5. Pomerite kursor na lekciju 1.3.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                   Lekcija 1.3: IZMENA TEKSTA - BRISANJE
++
++
++             ** Pritisnite  x  za brisanje znaka pod kursorom. **
++
++  1. Pomerite kursor na red oznaèen sa --->.
++
++  2. Da biste ispravili greške, pomerajte kursor dok se
++     ne naðe na slovu koje treba izbrisati.
++
++  3. Pritisnite taster  x  da izbrišete neželjeno slovo.
++
++  4. Ponavljajte korake od 2 do 4 dok ne ispravite sve greške.
++
++---> RRRibaa riibi grizzze rrreepp.
++
++  5. Kad ispravite red, preðite na lekciju 1.4.
++
++NAPOMENA:  Dok koristite priruènik, nemojte uèiti komande napamet,
++           veæ vežbajte njihovu primenu.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                Lekcija 1.4: IZMENA TEKSTA - UBACIVANJE
++
++
++         ** Pritisnite  i  za ubacivanje teksta ispred kursora. **
++
++  1. Pomerite kursor na prvi sledeæi red oznaèen sa --->.
++
++  2. Da biste tekst prvog reda izjednaèili s tekstom drugog, namestite
++     kursor na prvi znak POSLE kog æete ubaciti potreban tekst.
++
++  3. Pritisnite  i  pa unesite potrebne dopune.
++
++  4. Po ispravci svake greške pritisnite <ESC> da se vratite u Normal mod.
++     Ponovite korake od 2 do 4 da biste ispravili celu reèenicu.
++
++---> Do teka neoje v red.
++---> Deo teksta nedostaje iz ovog reda.
++
++  5. Preðite na sledeæu lekciju.
++
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                   Lekcija 1.5: IZMENA TEKSTA - DODAVANJE
++
++
++                  ** Pritisnite  A  za dodavanje teksta. **
++
++  1. Pomerite kursor na prvi sledeæi red oznaèen sa --->.
++     Nije važno gde se nalazi kursor u tom redu.
++
++  2. Pritisnite  A  i unesite dodatni tekst.
++
++  3. Pošto ste dodali tekst, pritisnite <ESC> za povratak u
++     Normal mod.
++
++  4. Pomerite kursor na drugi red oznaèen sa ---> i ponavljajte
++     korake 2 i 3 dok ne ispravite tekst.
++
++---> Deo teksta nedostaje u
++     Deo teksta nedostaje u ovom redu.
++---> Deo teksta nedostaje
++     Deo teksta nedostaje i ovde.
++
++  5. Preðite na lekciju 1.6.
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                    Lekcija 1.6: IZMENA FAJLA
++
++
++     ** Upotrebite  :wq  za snimanje teksta i izlazak iz editora. **
++
++  !! UPOZORENJE: Pre izvoðenja bilo kog koraka, proèitajte celu lekciju!!
++
++  1. Izaðite iz editora kao u lekciji 1.2:  :q!
++
++  2. Na komandnom promptu unesite sledeæu komandu:  vim tutor <ENTER>
++     'vim' je komanda za pokretanja Vim editora, 'tutor' je ime fajla koji
++     želite da menjate.  Koristite fajl koji imate pravo da menjate.
++
++  3. Ubacujte i brišite tekst kao u prethodnim lekcijama.
++
++  4. Snimite izmenjeni tekst i izaðite iz Vim-a:  :wq <ENTER>
++
++  5. Ponovo pokrenite vimtutor i proèitajte rezime koji sledi.
++
++  6. Pošto proèitate korake iznad i u potpunosti ih razumete:
++     izvršite ih.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                             REZIME lekcije 1 
++
++
++  1. Kursor se pomera strelicama ili pomoæu tastera hjkl .
++       h (levo)        j (dole)        k (gore)        l (desno)
++
++  2. Za pokretanje Vim-a iz shell-a:  vim IME_FAJLA <ENTER>
++
++  3. Izlaz:    <ESC>   :q! <ENTER>     sve promene su izgubljene.
++       ILI:    <ESC>   :wq <ENTER>     promene su saèuvane.
++
++  4. Brisanje znaka na kome se nalazi kursor:  x
++
++  5. Ubacivanja ili dodavanje teksta:
++        i   unesite tekst <ESC>        unos ispred kursora
++        A   unesite tekst <ESC>        dodavanje na kraju reda
++
++NAPOMENA:  Pritiskom na <ESC> prebacujete Vim u Normal mod i
++           prekidate neželjenu ili delimièno izvršenu komandu.
++
++Nastavite sa lekcijom 2.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                       Lekcija 2.1: NAREDBE BRISANJA
++
++
++                ** Otkucajte  dw  za brisanje reèi. **
++
++  1. Pritisnite  <ESC>  da biste bili sigurni da ste u Normal modu.
++
++  2. Pomerite kursor na red oznaèen sa --->.
++
++  3. Pomerite kursor na poèetak reèi koju treba izbrisati.
++
++  4. Otkucajte  dw  da biste uklonili reè.
++
++NAPOMENA:  Slovo  d  æe se pojaviti na dnu ekrana kad ga otkucate.  Vim èeka
++          da otkucate  w .  Ako je prikazano neko drugo slovo, pogrešili ste u
++          kucanju; pritisnite <ESC> i pokušajte ponovo.  (Ako se ne pojavi
++          ništa, možda je iskljuèena opcija 'showcmd': vidi lekciju 6.5.)
++
++---> Neke reèi smešno ne pripadaju na papir ovoj reèenici.
++
++  5. Ponavljajte korake 3 i 4 dok ne ispravite reèenicu, pa
++     preðite na lekciju 2.2.
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                     Lekcija 2.2: JOŠ BRISANJA
++
++
++       ** Otkucajte  d$  za brisanje znakova do kraja reda. **
++
++  1. Pritisnite  <ESC>  da biste bili sigurni da ste u Normal modu.
++
++  2. Pomerite kursor na red oznaèen sa  --->.
++
++  3. Pomerite kursor do kraja ispravnog dela reèenice
++     (POSLE prve . ).
++
++  4. Otkucajte  d$  za brisanje ostatka reda.
++
++---> Neko je uneo kraj ovog reda dvaput. kraj ovog reda dvaput.
++
++  5. Preðite na lekciju 2.3 za podrobnije objašnjenje.
++
++
++
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++             Lekcija 2.3: O OPERATORIMA I POKRETIMA
++
++
++  Mnoge komande za izmenu teksta sastoje se od operatora i pokreta.
++  Oblik komande brisanja sa  d  operatorom je sledeæi:
++
++       d   pokret
++
++  Pri èemu je:
++    d      - operator brisanja.
++    pokret - ono na èemu æe se operacija izvršavati (opisano u nastavku).
++
++  Kratak spisak pokreta:
++    w - sve do poèetka sledeæe reèi, NE UKLJUÈUJUÆI prvo slovo.
++    e - sve do kraja tekuæe reèi, UKLJUÈUJUÆI poslednje slovo.
++    $ - sve do kraje reda, UKLJUÈUJUÆI poslednje slovo.
++
++  Kucanjem  de  brisaæe se tekst od kursora do kraja reèi.
++
++NAPOMENA:  Pritiskom samo na taster pokreta dok ste u Normal modu, bez
++           operatora, kursor se pomera kao što je opisano.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                 Lekcija 2.4: KORIŠÆENJE BROJANJA ZA POKRETE
++
++
++  ** Unošenjem nekog broja pre pokreta, pokret se izvršava taj broj puta. **
++
++  1. Pomerite kursor na red oznaèen sa --->.
++
++  2. Otkucajte  2w  da pomerite kursor dve reèi napred.
++
++  3. Otkucajte  3e  da pomerite kursor na kraj treæe reèi napred.
++
++  4. Otkucajte  0  (nulu) da pomerite kursor na poèetak reda.
++
++  5. Ponovite korake 2 i 3 s nekim drugim brojevima.
++
++---> Reèenica sa reèima po kojoj možete pomerati kursor.
++
++  6. Preðite na lekciju 2.5.
++
++
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++             Lekcija 2.5: KORIŠÆENJE BROJANJA ZA VEÆE BRISANJE
++
++
++  ** Unošenje nekog broja s operatorom ponavlja operator taj broj puta. **
++
++  U kombinaciji operatora brisanja s pokretima spomenutim iznad
++  možete uneti broj pre pokreta da biste izbrisali više znakova:
++
++        d   broj   pokret
++
++  1. Pomerite kursor na prvo slovo u reèi s VELIKIM SLOVIMA u redu
++     oznaèenom sa --->.
++
++  2. Otkucajte  d2w  da izbrišete dve reèi sa VELIKIM SLOVIMA
++
++  3. Ponovite korake 1 i 2 sa razlièitim brojevima da izbrišete
++     uzastopne reèi sa VELIKIM SLOVIMA korišæenjem samo jedne komande.
++
++---> ovaj ABCÈÆ DÐE red FGHI JK LMN OP s reèima je RSŠ TUVZŽ ispravljen.
++
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                    Lekcija 2.6: OPERACIJE NAD REDOVIMA
++
++
++              ** Otkucajte  dd  za brisanje celog reda. **
++
++  Zbog uèestalosti brisanja celih redova, autori Vi-ja odluèili su da
++  je lakše brisati redove ako se otkuca  d  dvaput.
++
++  1. Pomerite kursor na drugi red u donjoj strofi.
++  2. Otkucajte  dd  da ga izbrišete.
++  3. Pomerite kursor na èetvrti red.
++  4. Otkucajte   2dd   da biste izbrisali dva reda.
++
++--->  1)  Sedlo mi je od marame,
++--->  2)  blato na sve strane,
++--->  3)  uzda od kanapa,
++--->  4)  auto mi je ovde,
++--->  5)  satovi pokazuju vreme,
++--->  6)  a biè mi je od oèina
++--->  7)  prebijena štapa.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                     Lekcija 2.7: PONIŠTAVANJE PROMENA
++
++
++  ** Pritisnite  u  za poništavanje poslednje komande,  U  za ceo red. **
++
++  1. Pomerite kursor na red oznaèen sa ---> i postavite ga na mesto
++     prve greške.
++  2. Otkucajte  x  da izbrišete prvi neželjeni znak.
++  3. Otkucajte  u  da poništite poslednju izvršenu komandu.
++  4. Sad ispravite sve greške u redu koristeæi komandu  x  .
++  5. Otkucajte veliko  U  da biste vratili sadržaj reda u prvobitno
++     stanje.
++  6. Onda otkucajte  u  nekoliko puta da biste poništili  U
++     i prethodne komande.
++  7. Sad otkucajte CTRL-R (držeæi  CTRL  dok pritiskate R)
++     nekoliko puta da biste vratili izmene (poništili poništavanja).
++
++---> Iiisspravite greške uu ovvom redu ii pooništiteee ih.
++
++  8. Ovo su veoma korisne komande.  Preðite na rezime lekcije 2.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                             REZIME lekcije 2
++
++
++  1. Brisanje od kursora do sledeæe reèi:      dw
++  2. Brisanje od kursora do kraja reda:                d$
++  3. Brisanje celog reda:                      dd
++
++  4. Za ponavljanje pokreta prethodno unesite broj:  2w
++  5. Oblik komande za izmenu:
++               operator   [broj]   pokret
++     gde je:
++       operator - šta uraditi, recimo  d  za brisanje
++       [broj]   - neobavezan broj ponavljanja pokreta
++       pokret   - kretanje po tekstu na kome se radi,
++                  kao što je: w (reè), $ (kraj reda), itd.
++
++  6. Pomeranje kursora na poèetak reda:  0
++
++  7. Za poništavanje prethodnih izmena, pritisnite:    u  (malo u)
++     Za poništavanje svih promena u redu, pritisnite:  U  (veliko U)
++     Za vraæanja promena, otkucajte:                   CTRL-R
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                      Lekcija 3.1: KOMANDA POSTAVLJANJA
++
++
++  ** Otkucajte  p  da postavite prethodno izbrisan tekst iza kursora. **
++
++  1. Pomerite kursor na prvi sledeæi red oznaèen sa --->.
++
++  2. Otkucajte  dd  da izbrišete red i smestite ga u Vim registar.
++
++  3. Pomerite kursor na red c), IZNAD mesta gde treba postaviti izbrisan red.
++
++  4. Otkucajte  p  da postavite red ispod kursora.
++
++  5. Ponavljajte korake 2 do 4 da biste postavili sve linije u pravilnom
++     redosledu.
++
++---> d) prebijena štapa.
++---> b) uzda od kanapa,
++---> c) a biè mi je od oèina
++---> a) Sedlo mi je od marame,
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                      Lekcija 3.2: KOMANDA ZAMENE
++
++
++      ** Otkucajte  rx  da zamenite znak ispod kursora slovom  x . **
++
++  1. Pomerite kursor na prvi sledeæi red oznaèen sa --->.
++
++  2. Pomerite kursor tako da se nalazi na prvoj grešci.
++
++  3. Otkucajte  r  i onda znak koji treba da tu stoji.
++
++  4. Ponavljajte korake 2 i 3 sve dok prvi red ne bude
++     isti kao drugi.
++
++--->  Kedi ju ovej red ugašen, nako je protresao pustašne testere!
++--->  Kada je ovaj red unošen, neko je pritiskao pogrešne tastere!
++
++  5. Preðite na lekciju 3.2.
++
++NAPOMENA:  Setite se da treba da uèite vežbanjem, ne pamæenjem.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                   Lekcija 3.3: OPERATOR IZMENE
++
++
++         ** Za izmenu teksta do kraja reèi, otkucajte  ce  .**
++
++  1. Pomerite kursor na prvi sledeæi red oznaèen sa --->.
++
++  2. Postavite kursor na  a  u  rakdur.
++
++  3. Otkucajte  ce  i ispravite reè (u ovom sluèaju otkucajte  ed  ).
++
++  4. Pritisnite <ESC> i pomerite kursor na sledeæi znak koji
++     treba ispraviti.
++
++  5. Ponavljajte korake 3 i 4 sve dok prva reèenica ne bude ista
++     kao druga.
++
++---> Ovaj rakdur ima nekoliko rejga koje treflja isprpikati operagrom izmene.
++---> Ovaj red ima nekoliko reèi koje treba ispraviti operatorom izmene.
++
++Uoèite da  ce  briše reè i postavlja editor u Insert mod.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                Lekcija 3.4: DALJE IZMENE UPOTREBOM c
++
++
++    ** Komanda izmene se koristi sa istim pokretima kao i brisanje. **
++
++  1. Operator izmene se koristi na isti naèin kao i operator brisanja:
++
++         c    [broj]   pokret
++
++  2. Pokreti su isti, recimo:   w (reè) i  $ (kraj reda).
++
++  3. Pomerite kursor na prvi sledeæi red oznaèen sa --->.
++
++  4. Pomerite kursor na prvu grešku.
++
++  5. Otkucajte  c$  i unesite ostatak reda tako da bude isti kao
++     drugi red, pa pritisnite <ESC>.
++
++---> Kraj ovog reda treba izmeniti tako da izgleda kao red ispod.
++---> Kraj ovog reda treba ispraviti korišæenjem c$ komande.
++
++NAPOMENA:  Za ispravljanje grešaka možete koristiti Backspace .
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                             REZIME lekcije 3
++
++
++  1. Za postavljanje teksta koji ste upravo izbrisali, pritisnite  p . Ovo
++     postavlja tekst IZA kursora (ako je bio izbrisan jedan ili više redova
++     sadržaj æe doæi na red ispod kursora).
++
++  2. Za zamenu znaka na kome se nalazi kursor, pritisnite  r  i onda
++     željeni znak.
++
++  3. Operator izmene dozvoljava promenu teksta od kursora do pozicije gde
++     se završava pokret.  Primera radi, kucajte  ce  za izmenu od kursora do
++     kraja reèi, ili  c$  za izmenu od kursora do kraja reda.
++
++  4. Oblik operacije izmene je:
++
++        c   [broj]   pokret
++
++Preðite na narednu lekciju.
++
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++             Lekcija 4.1: POZICIJA KURSORA I STATUS FAJLA
++
++  ** Pritisnite CTRL-G za prikaz pozicije kursora u tekstu i status fajla.
++     Pritisnite  G  za pomeranje kursora na neki red u tekstu. **
++
++NAPOMENA:  Proèitajte celu lekciju pre izvoðenja bilo kog koraka!!
++
++  1. Držite taster CTRL i pritisnite  g .  Ovo zovemo CTRL-G.
++     Editor æe na dnu ekrana ispisati poruku sa imenom fajla i pozicijom
++     kursora u tekstu.  Zapamtite broj reda za 3. korak.
++
++NAPOMENA:  U donjem desnom uglu može se videti poziciju kursora ako je
++           ukljuèena opcija 'ruler' (vidi  :help ruler  ili lekciju 6.5.)
++
++  2. Pritisnite  G  za pomeranje kursora na kraj teksta.
++     Pritisnite  1G  ili  gg  za pomranje kursora na poèetak teksta.
++
++  3. Otkucajte broj reda na kome ste malopre bili i onda  G .  Kursor
++     æe se vratiti na red na kome je bio kad ste otkucali CTRL-G.
++
++  4. Ako ste spremni, izvršite korake od 1 do 3.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                   Lekcija 4.2: KOMANDE PRETRAŽIVANJA
++
++       ** Otkucajte  /  i onda izraz koji želite da potražite. **
++
++  1. U Normal modu otkucajte znak  / .  Primietite da se znak pojavio
++     zajedno sa kursorom na dnu ekrana kao i kod komande  : .
++
++  2. Sada otkucajte 'grrreška' <ENTER>.  (Bez razmaka i navodnika.)
++     To je reè koju tražite.
++
++  3. Za ponovno traženje istog izraza, otkucajte  n .
++     Za traženje istog izraza u suprotnom smeru, otkucajte  N .
++
++  4. Za traženje izraza unatrag, koristite  ?  umesto  / .
++
++  5. Za povratak na prethodnu poziciju otkucajte CTRL-O (držite CTRL dok
++     pritiskate O ).  Ponavljajte za ranije pozicije.  CTRL-I ide napred.
++
++---> "grrreška" je pogrešno; umesto grrreška treba da stoji greška.
++
++NAPOMENA:  Ako pretraga doðe do kraja teksta traženje æe se nastaviti od
++          njegovog poèetka osim ako je opcija 'wrapscan' iskljuèena.
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                 Lekcija 4.3: TRAŽENJE PARA ZAGRADE
++
++
++       ** Otkucajte  %  za nalaženje para ), ] ili } . **
++
++  1. Postavite kursor na bilo koju od  ( ,  [  ili  {
++     otvorenih zagrada u redu oznaèenom sa --->.
++
++  2. Otkucajte znak  % .
++
++  3. Kursor æe se pomeriti na odgovarajuæu zatvorenu zagradu.
++
++  4. Otkucajte  %  da pomerite kursor na prvu zagradu u paru.
++
++      5. Pomerite kursor na neku od (,),[,],{ ili } i ponovite komandu  % .
++
++---> Red ( testiranja obiènih ( [ uglastih ] i { vitièastih } zagrada.))
++
++
++NAPOMENA:  Vrlo korisno u ispravljanju koda sa rasparenim zagradama!
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                     Lekcija 4.4: KOMANDA ZAMENE
++
++
++       ** Otkucajte  :s/staro/novo/g  da zamenite 'staro' za 'novo'. **
++
++  1. Pomerite kursor na red oznaèen sa --->.
++
++  2. Otkucajte  :s/rdi/ri/ <ENTER> .  Primetite da ova komanda zamenjuje
++     samo prvo "rdi" u redu.
++
++  3. Otkucajte  :s/rdi/ri/g .  Dodavanje opcije  g  znaèi da æe se komanda
++     izvršiti u celom redu, zamenom svih pojava niza "rdi".
++
++---> rdiba rdibi grdize rep.
++
++  4. Za zamenu svih izraza izmeðu neka dva reda,
++     otkucajte :#,#s/staro/novo/g   gde su #,# krajnji brojevi redova u opsegu 
++                                    u kome æe se obaviti zamena.
++     Otkucajte :%s/staro/novo/g     za zamenu svih izraza u celom tekstu.
++     Otkucajte :%s/staro/novo/gc    za nalaženje svih izraza u tekstu i
++                                   potvrdu zamene.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                             REZIME lekcije 4
++
++
++  1. CTRL-G  prikazuje poziciju kursora u tekstu i status fajla.
++             G  pomera kursor na kraj teksta.
++     broj    G  pomera kursor na navedeni red.
++            gg  pomera kursor na prvi red teksta.
++
++  2. Kucanjem  /  sa izrazom taj izraz se traži UNAPRED.
++     Kucanjem  ?  sa izrazom taj izraz se traži UNAZAD.
++     Posle komande traženja koristite  n  za nalaženje izraza u istom
++     smeru, a  N  za nalaženje u suprotnom smeru.
++     CTRL-O vraæa kursor na prethodnu poziciju, a CTRL-I na narednu.
++
++  3. Kucanjem  %  kad je kursor na zagradi on se pomera na njen par.
++
++  4. Za zamenu prvog izraza staro za izraz novo            :s/staro/novo/
++     Za zamenu svih izraza u celom redu                    :s/staro/novo/g
++     Za zamenu svih izraza u opsegu linija #,#             :#,#s/staro/novo/g
++     Za zamenu u celom tekstu                              :%s/staro/novo/g
++     Za potvrdu svake zamene dodajte 'c'                  :%s/staro/novo/gc
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++               Lekcija 5.1: IZVRŠAVANJE SPOLJAŠNJIH KOMANDI
++
++
++  ** Otkucajte  :!  pa spoljašnju komandu koju želite da izvršite. **
++
++  1. Otkucajte poznatu komandu  :  da biste namestili kursor na dno
++     ekrana.  Time omoguæavate unos komande u komandnoj liniji editora.
++
++  2. Otkucajte znak  !  (uzviènik).  Ovime omoguæavate
++     izvršavanje bilo koje spoljašnje komande.
++
++  3. Kao primer otkucajte   ls   posle ! i pritisnite <ENTER>.  Ovo æe
++     prikazati sadržaj direktorijuma, kao da ste na komandnom promptu.
++     Otkucajte   :!dir   ako   :!ls   ne radi.
++
++NAPOMENA:  Na ovaj naèin moguæe je izvršiti bilo koju spoljašnju komandu,
++           zajedno sa njenim argumentima.
++
++NAPOMENA:  Sve  :  komande se izvršavaju pošto pritisnete <ENTER> .
++          U daljem tekstu to neæemo uvek napominjati.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                  Lekcija 5.2: VIŠE O SNIMANJU FAJLOVA
++
++           ** Za snimanje promena, otkucajte  :w IME_FAJLA . **
++
++  1. Otkucajte  :!dir  ili  :!ls  za pregled sadržaja direktorijuma.
++     Veæ znate da morate pritisnuti <ENTER> posle toga.
++
++  2. Izaberite ime fajla koji još ne postoji, npr. TEST.
++
++  3. Otkucajte:         :w TEST   (gde je TEST ime koje ste izabrali.)
++
++  4. Time æete snimiti ceo fajl (Vim Tutor) pod imenom TEST.
++     Za proveru, otkucajte opet  :!dir  ili  :!ls za pregled
++     sadržaja direktorijuma.
++
++NAPOMENA:  Ako biste napustili Vim i ponovo ga pokrenuli sa vim TEST ,
++           tekst bi bio taèna kopija ovog fajla u trenutku kad ste
++          ga snimili.
++
++  5. Izbrišite fajl tako što æete otkucati (MS-DOS):   :!del TEST
++                                        ili (Unix):    :!rm TEST
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                 Lekcija 5.3: SNIMANJE OZNAÈENOG TEKSTA
++
++
++   ** Da biste snimili deo teksta, otkucajte  v  pokret  :w IME_FAJLA **
++
++  1. Pomerite kursor na ovu liniju.
++
++  2. Pritisnite  v  i pomerite kursor pet redova ispod.  Primetite da je
++     tekst oznaèen inverzno.
++
++  3. Pritisnite  : .  Na dnu ekrana pojaviæe se  :'<,'> .
++
++  4. Otkucajte  w TEST  , gde je TEST ime fajla koji još ne postoji.
++     Proverite da zaista piše  :'<,'>w TEST  pre nego što pritisnete <ENTER>.
++
++  5. Vim æe snimiti oznaèeni tekst u TEST.  Proverite sa  :!dir  ili  !ls .
++     Nemojte još brisati fajl!  Koristiæemo ga u narednoj lekciji.
++
++NAPOMENA:  Komanda  v  zapoèinje vizuelno oznaèavanje.  Možete pomerati kursor
++           i tako menjati velièinu oznaèenog teksta.  Onda možete upotrebiti
++           operatore nad tekstom.  Na primer,  d  æe izbrisati oznaèeni tekst.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                  Lekcija 5.4: UÈITAVANJE FAJLA U TEKST
++
++
++       ** Za ubacivanje sadržaja fajla, otkucajte  :r IME_FAJLA  **
++
++  1. Postavite kursor iznad ove linije.
++
++NAPOMENA:  Pošto izvršite 2. korak videæete tekst iz lekcije 5.3.  Tada
++           pomerite kursor DOLE da biste ponovo videli ovu lekciju.
++
++  2. Uèitajte fajl TEST koristeæi komandu  :r TEST  gde je TEST ime fajla
++     koje ste koristili u prethodnoj lekciji.  Sadržaj uèitanog fajla je
++     ubaèen ispod kursora.
++
++  3. Da biste proverili da je fajl uèitan, vratite kursor unazad i
++     primetite dve kopije lekcije 5.3, originalnu i onu iz fajla.
++
++NAPOMENA:  Takoðe možete uèitati izlaz spoljašnje komande.  Na primer,
++          :r !ls  æe uèitati izlaz komande  ls  i postaviti ga ispod
++           kursora.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                             REZIME lekcije 5
++
++
++  1.  :!komanda  izvršava spoljašnju komandu.
++
++      Korisni primeri:
++        (MS-DOS)         (Unix)
++         :!dir            :!ls            -  pregled sadržaja direktorijuma.
++         :!del FAJL       :!rm FAJL       -  briše fajl FAJL.
++
++  2.  :w FAJL  zapisuje trenutni tekst na disk pod imenom FAJL.
++
++  3.  v  pokret  :w IME_FAJLA  snima vizuelno oznaèene redove u fajl
++      IME_FAJLA.
++
++  4.  :r IME_FAJLA  uèitava fajl IME_FAJLA sa diska i stavlja
++      njegov sadržaj ispod kursora.
++
++  5.  :r !dir  uèitava izlaz komande dir i postavlja ga ispod kursora.
++
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                        Lekcija 6.1: KOMANDA OTVORI
++
++
++       ** Pritisnite  o  da biste otvorili red ispod kursora
++          i prešli u Insert mod. **
++
++  1. Pomerite kursor na sledeæi red oznaèen sa --->.
++
++  2. Otkucajte malo  o  da biste otvorili novi red ISPOD kursora
++     i prešli u Insert mod.
++
++  3. Otkucajte neki tekst i onda pritisnite <ESC> da biste izašli
++     iz Insert moda.
++
++---> Kad pritisnete  o  kursor prelazi u novootvoreni red u Insert modu.
++
++  4. Za otvaranje reda IZNAD kursora, umesto malog otkucajte veliko O .
++     Isprobajte na donjem redu oznaèenom sa --->.
++
++---> Otvorite red iznad ovog kucanjem velikog  O  dok je kursor u ovom redu.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                       Lekcija 6.2: KOMANDA DODAJ
++
++
++            ** Otkucajte  a  za dodavanje teksta IZA kursora. **
++
++  1. Pomerite kursor na poèetak sledeæeg reda oznaèenog sa --->.
++  
++  2. Kucajte  e  dok kursor ne doðe na kraj reèi  re .
++
++  3. Otkucajte  a  (malo) da biste dodali tekst IZA kursora.
++
++  4. Dopunite reè kao što je u redu ispod.  Pritisnite <ESC> za izlazak
++     iz Insert moda.
++
++  5. Sa  e  preðite na narednu nepotpunu reè i ponovite korake 3 i 4.
++  
++---> Ovaj re omoguæava ve dodav teksta u nekom redu.
++---> Ovaj red omoguæava vežbanje dodavanja teksta u nekom redu.
++
++NAPOMENA:  Komande a, i, i  A  aktiviraju isti Insert mod, jedina
++           razlika je u poziciji od koje æe se tekst ubacivati.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                   Lekcija 6.3: DRUGI NAÈIN ZAMENE
++
++
++      ** Otkucajte veliko  R  da biste zamenili više od jednog znaka. **
++
++  1. Pomerite kursor na prvi sledeæi red oznaèen sa --->.
++     Pomerite kursor na poèetak prvog  xxx .
++
++  2. Pritisnite  R  i otkucajte broj koji je red ispod,
++     tako da zameni xxx .
++
++  3. Pritisnite <ESC> za izlazak iz Replace moda.
++     Primetite da je ostatak reda ostao nepromenjen.
++
++  4. Ponovite korake da biste zamenili drugo xxx.
++
++---> Dodavanje 123 na xxx daje xxx.
++---> Dodavanje 123 na 456 daje 579.
++
++NAPOMENA:  Replace mod je kao Insert mod, s tom razlikom što svaki
++           uneti znak briše veæ postojeæi.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++               Lekcija 6.4: KOPIRANJE I LEPLJENJE TEKSTA
++
++
++    ** Koristite operator  y  za kopiranje a  p  za lepljenje teksta. **
++
++  1. Pomerite kursor na red sa --->  i postavite kursor posle "a)".
++  
++  2. Aktivirajte Visual mod sa  v  i pomerite kursor sve do ispred "prvi".
++  
++  3. Pritisnite  y  da biste kopirali oznaèeni tekst u interni bafer.
++
++  4. Pomerite kursor do kraja sledeæeg reda:  j$
++
++  5. Pritisnite  p  da biste zalepili tekst.  Onda otkucajte:  a drugi <ESC> .
++
++  6. Upotrebite Visual mod da oznaèite " red.", kopirajte sa  y , kursor
++     pomerite na kraj sledeæeg reda sa  j$  i tamo zalepite tekst sa  p .
++
++--->  a) ovo je prvi red.
++      b)
++
++NAPOMENA:  takoðe možete koristiti  y  kao operator;  yw  kopira jednu reè.
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                   Lekcija 6.5: POSTAVLJANJE OPCIJA
++
++
++ ** Postavite opciju tako da traženje i zamena ignorišu velièinu slova **
++
++  1. Potražite reè 'razlika':  /razlika <ENTER>
++     Ponovite nekoliko puta pritiskom na  n .
++
++  2. Aktivirajte opciju 'ic' (Ignore case):  :set ic
++
++  3. Ponovo potražite reè 'razlika' pritiskom na  n
++     Primetite da su sada pronaðeni i RAZLIKA i Razlika.
++
++  4. Aktivirajte opcije 'hlsearch' i 'incsearch':  :set hls is
++
++  5. Ponovo otkucajte komandu traženja i uoèite razlike:  /razlika <ENTER>
++
++  6. Za deaktiviranje opcije  ic  kucajte:  :set noic
++
++NAPOMENA:  Za neoznaèavanje pronaðenih izraza otkucajte:  :nohlsearch
++NAPOMENA:  Ako želite da ne razlikujete velièinu slova u samo jednoj komandi
++          traženja, dodajte  \c  u izraz:  /razlika\c <ENTER>
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                             REZIME lekcije 6
++
++  1. Pritisnite  o  za otvaranje reda ISPOD kursora i prelazak u Insert mod.
++     Pritisnite  O  za otvaranje reda IZNAD kursora.
++
++  2. Pritisnite  a  za unos teksta IZA kursora.
++     Pritisnite  A  za unos teksta na kraju reda.
++
++  3. Komanda  e  pomera kursor na kraj reèi.
++
++  4. Operator  y  kopira tekst,  p  ga lepi.
++
++  5. Kucanje velikog  R  aktivira Replace mod dok ne pritisnete <ESC> .
++
++  6. Kucanje ":set xxx" aktivira opciju "xxx".  Neke opcije su:
++       'ic' 'ignorecase'       ne razlikuje velika/mala slova pri traženju
++       'is' 'incsearch'        prikazuje pronaðen tekst dok kucate izraz
++       'hls' 'hlsearch'        oznaèava inverzno sve pronaðene izraze
++     Možete koristite dugo ili kratko ime opcije.
++
++  7. Ispred imena opcije stavite "no" da je deaktivirate:  :set noic
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                      Lekcija 7.1: DOBIJANJE POMOÆI
++
++
++                  ** Koristite on-line sistem za pomoæ **
++
++  Vim ima detaljan on-line sistem za pomoæ.  Za poèetak, pokušajte nešto
++  od sledeæeg:
++       - pritisnite taster <HELP> (ako ga imate na tastaturi)
++       - pritisnite taster <F1> (ako ga imate na tastaturi)
++       - otkucajte  :help <ENTER>
++
++  Proèitajte tekst u prozoru pomoæi da biste nauèili pomoæ radi.
++  Kucanjem  CTRL-W CTRL-W  prelazite iz jednog prozora u drugi.
++  Otkucajte  :q <ENTER>  da zatvorite prozor pomoæi.
++
++  Pomoæ o praktièno bilo kojoj temi možete dobiti dodavanjem argumenta
++  komandi ":help".  Pokušajte ovo (ne zaboravite <ENTER> na kraju):
++
++       :help w
++       :help c_CTRL-D
++       :help insert-index
++       :help user-manual
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++               Lekcija 7.2: PRAVLJENJE STARTNOG SKRIPTA
++
++
++                  ** Aktivirajte moguænosti editora **
++
++  Vim ima mnogo više moguænosti nego Vi, ali veæina nije automatski
++  aktivirana.  Za dodatne moguænosti napravite "vimrc" fajl.
++
++  1. Otvorite "vimrc" fajl.  Ovo zavisi od vašeg sistema:
++       :e ~/.vimrc             za Unix
++       :e $VIM/_vimrc          za MS-Windows
++
++  2. Onda uèitajte primer sadržaja "vimrc" fajla:
++       :r $VIMRUNTIME/vimrc_example.vim
++
++  3. Snimite fajl sa:
++       :w
++
++  Sledeæi put kada pokrenete Vim, bojenje sintakse teksta biæe
++  aktivirano. Sva svoja podešavanja možete dodati u "vimrc" fajl.
++  Za više informacija otkucajte  :help vimrc-intro
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                    Lekcija 7.3: AUTOMATSKO DOVRŠAVANJE
++
++
++       ** Dovršavanje komandne linije sa CTRL-D i <TAB> **
++
++  1. Podesite Vim da ne bude u Vi-kompatibilnom modu:  :set nocp
++
++  2. Pogledajte koji fajlovi postoje u direktorijumu:  :!ls  ili  :!dir
++
++  3. Otkucajte poèetak komande:  :e
++
++  4. Otkucajte  CTRL-D  i Vim æe prikazati spisak komandi koje poèinju sa "e".
++
++  5. Pritisnite <TAB>  i Vim æe dopuniti ime komande u ":edit".
++
++  6. Dodajte razmak i poèetak imena postojeæeg fajla:  :edit FA
++
++  7. Pritisnite <TAB>.  Vim æe dopuniti ime fajla (ako je jedinstveno).
++
++NAPOMENA:  Moguæe je dopuniti mnoge komande.  Samo probajte CTRL-D i <TAB>.
++           Naroèito je korisno za  :help  komande.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                             REZIME lekcije 7
++
++
++  1. Otkucajte  :help  ili pritisnite <F1> ili <Help>  za pomoæ.
++
++  2. Otkucajte  :help komanda  biste dobili pomoæ za tu komandu.
++
++  3. Otkucajte  CTRL-W CTRL-W  za prelazak u drugi prozor.
++
++  4. Otkucajte  :q  da zatvorite prozor pomoæi.
++
++  5. Napravite vimrc startni skript za aktiviranje podešavanja koja
++     vam odgovaraju.
++
++  6. Dok kucate neku od  :  komandi, pritisnite CTRL-D da biste videli moguæe
++     vrednosti.  Pritisnite <TAB> da odaberete jednu od njih.
++
++
++
++
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++  Ovim je priruènik završen.  Njegov cilj je bio kratak pregled Vim editora,
++  koliko da omoguæi njegovo relativno jednostavno korišæenje.  Priruènik nije
++  potpun, jer Vim ima mnogo više komandi.  Kao sledeæe, proèitajte priruènik:
++  ":help user-manual".
++
++  Za dalje èitanje i uèenje, preporuèujemo knjigu:
++       Vim - Vi Improved - by Steve Oualline
++       Izdavaè: New Riders
++  Prva knjiga potpuno posveæena Vim-u.  Naroèito korisna za poèetnike.
++  Ima mnoštvo primera i slika.
++  Vidite http://iccf-holland.org/click5.html
++
++  Sledeæa knjiga je starija i više govori o Vi-u nego o Vim-u, ali je takoðe
++  preporuèujemo:
++       Learning the Vi Editor - by Linda Lamb
++       Izdavaè: O'Reilly & Associates Inc.
++  Dobra knjiga iz koje možete saznati skoro sve što možete raditi u Vi-ju.
++  Šesto izdanje ima i informacija o Vim-u.
++
++  Ovaj priruènik su napisali: Michael C. Pierce i Robert K. Ware,
++  Colorado School of Mines koristeæi ideje Charlesa Smitha,
++  Colorado State University.  E-mail: bware@mines.colorado.edu.
++
++  Prilagoðavanje za Vim uradio je Bram Moolenaar.
++
++  Prevod na srpski: Ivan Nejgebauer <ian@uns.ac.rs>
++  Verzija 1.0, maj/juni 2014.
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+diff -Naur vim74.orig/runtime/tutor/tutor.sr.utf-8 vim74/runtime/tutor/tutor.sr.utf-8
+--- vim74.orig/runtime/tutor/tutor.sr.utf-8     1970-01-01 00:00:00.000000000 +0000
++++ vim74/runtime/tutor/tutor.sr.utf-8  2014-07-21 23:33:37.576805972 +0000
+@@ -0,0 +1,971 @@
++===============================================================================
++=    D o b r o d o š l i   u   VIM   p r i r u č n i k  -    Verzija 1.7      =
++===============================================================================
++
++     Vim je moćan editor sa mnogo komandi, suviše da bismo ih ovde sve
++     opisali.  Priručnik je zamišljen da opiše dovoljno komandi da biste
++     mogli lagodno da koristite Vim kao editor opšte namene.
++
++     PribliÅŸno vreme potrebno za uspeÅ¡an zavrÅ¡etak priručnika je između
++     25 i 30 minuta, u zavisnosti od vremena potrošenog na veşbu.
++
++     UPOZORENJE:
++     Komande u lekcijama će menjati tekst.  Iskopirajte ovaj fajl i
++     veÅŸbajte na kopiji (ako ste pokrenuli "vimtutor" ovo je već kopija).
++
++     Vaşno je upamtiti da je ovaj priručnik zamišljen za aktivnu veşbu.
++     To znači da morate upotrebljavati komande o kojima čitate da biste
++     ih naučili.  Ako samo čitate tekst, zaboravićete komande!
++
++     Ako je Caps Lock uključen ISKLJUČITE ga.  Pritisnite taster  j  dovoljno
++     puta da lekcija 1.1 cela stane na ekran.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                     Lekcija 1.1:  POMERANJE KURSORA
++
++
++ ** Za pomeranje kursora, pritiskajte tastere h,j,k,l kako je prikazano **
++            ^
++            k              Savet: h je s leve strane i pomera kursor u levo.
++       < h      l >               l je s desne strane i pomera kursor u desno.
++            j                     j izgleda kao strelica naniÅŸe.
++            v
++  1. Pomerajte kursor po ekranu dok se ne naviknete na komande.
++
++  2. Pritisnite taster (j) dok ne počne da se ponavlja.
++     Sada znate kako da dođete do naredne lekcije.
++
++  3. Koristeći taster j pređite na lekciju 1.2.
++
++NAPOMENA:  Ako niste sigurni Å¡ta ste zapravo pritisnuli, pritisnite <ESC>
++           za prelazak u Normal mod i pokušajte ponovo.
++
++NAPOMENA:  Strelice takođe pomeraju kursor, ali korišćenje tastera hjkl je
++           znatno brÅŸe, kad se jednom naviknete na njih.  Zaista!
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                          Lekcija 1.2: IZLAZAK IZ VIM-a
++
++
++  !! UPOZORENJE: Pre izvođenja bilo kog koraka, pročitajte celu lekciju!!
++
++  1. Pritisnite <ESC> (editor je sada u Normal modu).
++
++  2. Otkucajte:        :q! <ENTER>.
++     Ovime se izlazi iz editora, sa GUBITKOM svih izmena.
++
++  3. Kada se pojavi komandni prompt, unesite komandu koja je pokrenula
++     ovaj priručnik:          vimtutor <ENTER>
++
++  4. Ako ste upamtili ove korake, izvršite ih redom od 1 do 3 da biste
++     izašli iz editora i ponovo ga pokrenuli.
++
++NAPOMENA:  :q! <ENTER>  poništava sve izmene koje ste napravili.
++           U narednim lekcijama naučićete kako da sačuvate izmene.
++
++  5. Pomerite kursor na lekciju 1.3.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                   Lekcija 1.3: IZMENA TEKSTA - BRISANJE
++
++
++             ** Pritisnite  x  za brisanje znaka pod kursorom. **
++
++  1. Pomerite kursor na red označen sa --->.
++
++  2. Da biste ispravili greške, pomerajte kursor dok se
++     ne nađe na slovu koje treba izbrisati.
++
++  3. Pritisnite taster  x  da izbrišete neşeljeno slovo.
++
++  4. Ponavljajte korake od 2 do 4 dok ne ispravite sve greške.
++
++---> RRRibaa riibi grizzze rrreepp.
++
++  5. Kad ispravite red, pređite na lekciju 1.4.
++
++NAPOMENA:  Dok koristite priručnik, nemojte učiti komande napamet,
++           već veÅŸbajte njihovu primenu.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                Lekcija 1.4: IZMENA TEKSTA - UBACIVANJE
++
++
++         ** Pritisnite  i  za ubacivanje teksta ispred kursora. **
++
++  1. Pomerite kursor na prvi sledeći red označen sa --->.
++
++  2. Da biste tekst prvog reda izjednačili s tekstom drugog, namestite
++     kursor na prvi znak POSLE kog ćete ubaciti potreban tekst.
++
++  3. Pritisnite  i  pa unesite potrebne dopune.
++
++  4. Po ispravci svake greške pritisnite <ESC> da se vratite u Normal mod.
++     Ponovite korake od 2 do 4 da biste ispravili celu rečenicu.
++
++---> Do teka neoje v red.
++---> Deo teksta nedostaje iz ovog reda.
++
++  5. Pređite na sledeću lekciju.
++
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                   Lekcija 1.5: IZMENA TEKSTA - DODAVANJE
++
++
++                  ** Pritisnite  A  za dodavanje teksta. **
++
++  1. Pomerite kursor na prvi sledeći red označen sa --->.
++     Nije vaÅŸno gde se nalazi kursor u tom redu.
++
++  2. Pritisnite  A  i unesite dodatni tekst.
++
++  3. Pošto ste dodali tekst, pritisnite <ESC> za povratak u
++     Normal mod.
++
++  4. Pomerite kursor na drugi red označen sa ---> i ponavljajte
++     korake 2 i 3 dok ne ispravite tekst.
++
++---> Deo teksta nedostaje u
++     Deo teksta nedostaje u ovom redu.
++---> Deo teksta nedostaje
++     Deo teksta nedostaje i ovde.
++
++  5. Pređite na lekciju 1.6.
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                    Lekcija 1.6: IZMENA FAJLA
++
++
++     ** Upotrebite  :wq  za snimanje teksta i izlazak iz editora. **
++
++  !! UPOZORENJE: Pre izvođenja bilo kog koraka, pročitajte celu lekciju!!
++
++  1. Izađite iz editora kao u lekciji 1.2:  :q!
++
++  2. Na komandnom promptu unesite sledeću komandu:  vim tutor <ENTER>
++     'vim' je komanda za pokretanja Vim editora, 'tutor' je ime fajla koji
++     ÅŸelite da menjate.  Koristite fajl koji imate pravo da menjate.
++
++  3. Ubacujte i brišite tekst kao u prethodnim lekcijama.
++
++  4. Snimite izmenjeni tekst i izađite iz Vim-a:  :wq <ENTER>
++
++  5. Ponovo pokrenite vimtutor i pročitajte rezime koji sledi.
++
++  6. Pošto pročitate korake iznad i u potpunosti ih razumete:
++     izvršite ih.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                             REZIME lekcije 1 
++
++
++  1. Kursor se pomera strelicama ili pomoću tastera hjkl .
++       h (levo)        j (dole)        k (gore)        l (desno)
++
++  2. Za pokretanje Vim-a iz shell-a:  vim IME_FAJLA <ENTER>
++
++  3. Izlaz:    <ESC>   :q! <ENTER>     sve promene su izgubljene.
++       ILI:    <ESC>   :wq <ENTER>     promene su sačuvane.
++
++  4. Brisanje znaka na kome se nalazi kursor:  x
++
++  5. Ubacivanja ili dodavanje teksta:
++        i   unesite tekst <ESC>        unos ispred kursora
++        A   unesite tekst <ESC>        dodavanje na kraju reda
++
++NAPOMENA:  Pritiskom na <ESC> prebacujete Vim u Normal mod i
++           prekidate neşeljenu ili delimično izvršenu komandu.
++
++Nastavite sa lekcijom 2.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                       Lekcija 2.1: NAREDBE BRISANJA
++
++
++                ** Otkucajte  dw  za brisanje reči. **
++
++  1. Pritisnite  <ESC>  da biste bili sigurni da ste u Normal modu.
++
++  2. Pomerite kursor na red označen sa --->.
++
++  3. Pomerite kursor na početak reči koju treba izbrisati.
++
++  4. Otkucajte  dw  da biste uklonili reč.
++
++NAPOMENA:  Slovo  d  će se pojaviti na dnu ekrana kad ga otkucate.  Vim čeka
++          da otkucate  w .  Ako je prikazano neko drugo slovo, pogrešili ste u
++          kucanju; pritisnite <ESC> i pokušajte ponovo.  (Ako se ne pojavi
++          ništa, moşda je isključena opcija 'showcmd': vidi lekciju 6.5.)
++
++---> Neke reči smešno ne pripadaju na papir ovoj rečenici.
++
++  5. Ponavljajte korake 3 i 4 dok ne ispravite rečenicu, pa
++     pređite na lekciju 2.2.
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                     Lekcija 2.2: JOÅ  BRISANJA
++
++
++       ** Otkucajte  d$  za brisanje znakova do kraja reda. **
++
++  1. Pritisnite  <ESC>  da biste bili sigurni da ste u Normal modu.
++
++  2. Pomerite kursor na red označen sa  --->.
++
++  3. Pomerite kursor do kraja ispravnog dela rečenice
++     (POSLE prve . ).
++
++  4. Otkucajte  d$  za brisanje ostatka reda.
++
++---> Neko je uneo kraj ovog reda dvaput. kraj ovog reda dvaput.
++
++  5. Pređite na lekciju 2.3 za podrobnije objašnjenje.
++
++
++
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++             Lekcija 2.3: O OPERATORIMA I POKRETIMA
++
++
++  Mnoge komande za izmenu teksta sastoje se od operatora i pokreta.
++  Oblik komande brisanja sa  d  operatorom je sledeći:
++
++       d   pokret
++
++  Pri čemu je:
++    d      - operator brisanja.
++    pokret - ono na čemu će se operacija izvršavati (opisano u nastavku).
++
++  Kratak spisak pokreta:
++    w - sve do početka sledeće reči, NE UKLJUČUJUĆI prvo slovo.
++    e - sve do kraja tekuće reči, UKLJUČUJUĆI poslednje slovo.
++    $ - sve do kraje reda, UKLJUČUJUĆI poslednje slovo.
++
++  Kucanjem  de  brisaće se tekst od kursora do kraja reči.
++
++NAPOMENA:  Pritiskom samo na taster pokreta dok ste u Normal modu, bez
++           operatora, kursor se pomera kao Å¡to je opisano.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                 Lekcija 2.4: KORIŠĆENJE BROJANJA ZA POKRETE
++
++
++  ** Unošenjem nekog broja pre pokreta, pokret se izvršava taj broj puta. **
++
++  1. Pomerite kursor na red označen sa --->.
++
++  2. Otkucajte  2w  da pomerite kursor dve reči napred.
++
++  3. Otkucajte  3e  da pomerite kursor na kraj treće reči napred.
++
++  4. Otkucajte  0  (nulu) da pomerite kursor na početak reda.
++
++  5. Ponovite korake 2 i 3 s nekim drugim brojevima.
++
++---> Rečenica sa rečima po kojoj moşete pomerati kursor.
++
++  6. Pređite na lekciju 2.5.
++
++
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++             Lekcija 2.5: KORIŠĆENJE BROJANJA ZA VEĆE BRISANJE
++
++
++  ** Unošenje nekog broja s operatorom ponavlja operator taj broj puta. **
++
++  U kombinaciji operatora brisanja s pokretima spomenutim iznad
++  moşete uneti broj pre pokreta da biste izbrisali više znakova:
++
++        d   broj   pokret
++
++  1. Pomerite kursor na prvo slovo u reči s VELIKIM SLOVIMA u redu
++     označenom sa --->.
++
++  2. Otkucajte  d2w  da izbrišete dve reči sa VELIKIM SLOVIMA
++
++  3. Ponovite korake 1 i 2 sa različitim brojevima da izbrišete
++     uzastopne reči sa VELIKIM SLOVIMA korišćenjem samo jedne komande.
++
++---> ovaj ABCČĆ DĐE red FGHI JK LMN OP s rečima je RSÅ  TUVZÅœ ispravljen.
++
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                    Lekcija 2.6: OPERACIJE NAD REDOVIMA
++
++
++              ** Otkucajte  dd  za brisanje celog reda. **
++
++  Zbog učestalosti brisanja celih redova, autori Vi-ja odlučili su da
++  je lakše brisati redove ako se otkuca  d  dvaput.
++
++  1. Pomerite kursor na drugi red u donjoj strofi.
++  2. Otkucajte  dd  da ga izbrišete.
++  3. Pomerite kursor na četvrti red.
++  4. Otkucajte   2dd   da biste izbrisali dva reda.
++
++--->  1)  Sedlo mi je od marame,
++--->  2)  blato na sve strane,
++--->  3)  uzda od kanapa,
++--->  4)  auto mi je ovde,
++--->  5)  satovi pokazuju vreme,
++--->  6)  a bič mi je od očina
++--->  7)  prebijena Å¡tapa.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                     Lekcija 2.7: PONIÅ TAVANJE PROMENA
++
++
++  ** Pritisnite  u  za poništavanje poslednje komande,  U  za ceo red. **
++
++  1. Pomerite kursor na red označen sa ---> i postavite ga na mesto
++     prve greške.
++  2. Otkucajte  x  da izbrišete prvi neşeljeni znak.
++  3. Otkucajte  u  da poništite poslednju izvršenu komandu.
++  4. Sad ispravite sve greške u redu koristeći komandu  x  .
++  5. Otkucajte veliko  U  da biste vratili sadrÅŸaj reda u prvobitno
++     stanje.
++  6. Onda otkucajte  u  nekoliko puta da biste poništili  U
++     i prethodne komande.
++  7. Sad otkucajte CTRL-R (drÅŸeći  CTRL  dok pritiskate R)
++     nekoliko puta da biste vratili izmene (poništili poništavanja).
++
++---> Iiisspravite greške uu ovvom redu ii pooništiteee ih.
++
++  8. Ovo su veoma korisne komande.  Pređite na rezime lekcije 2.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                             REZIME lekcije 2
++
++
++  1. Brisanje od kursora do sledeće reči:    dw
++  2. Brisanje od kursora do kraja reda:                d$
++  3. Brisanje celog reda:                      dd
++
++  4. Za ponavljanje pokreta prethodno unesite broj:  2w
++  5. Oblik komande za izmenu:
++               operator   [broj]   pokret
++     gde je:
++       operator - Å¡ta uraditi, recimo  d  za brisanje
++       [broj]   - neobavezan broj ponavljanja pokreta
++       pokret   - kretanje po tekstu na kome se radi,
++                  kao što je: w (reč), $ (kraj reda), itd.
++
++  6. Pomeranje kursora na početak reda:  0
++
++  7. Za poništavanje prethodnih izmena, pritisnite:   u  (malo u)
++     Za poništavanje svih promena u redu, pritisnite: U  (veliko U)
++     Za vraćanja promena, otkucajte:                  CTRL-R
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                      Lekcija 3.1: KOMANDA POSTAVLJANJA
++
++
++  ** Otkucajte  p  da postavite prethodno izbrisan tekst iza kursora. **
++
++  1. Pomerite kursor na prvi sledeći red označen sa --->.
++
++  2. Otkucajte  dd  da izbrišete red i smestite ga u Vim registar.
++
++  3. Pomerite kursor na red c), IZNAD mesta gde treba postaviti izbrisan red.
++
++  4. Otkucajte  p  da postavite red ispod kursora.
++
++  5. Ponavljajte korake 2 do 4 da biste postavili sve linije u pravilnom
++     redosledu.
++
++---> d) prebijena Å¡tapa.
++---> b) uzda od kanapa,
++---> c) a bič mi je od očina
++---> a) Sedlo mi je od marame,
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                      Lekcija 3.2: KOMANDA ZAMENE
++
++
++      ** Otkucajte  rx  da zamenite znak ispod kursora slovom  x . **
++
++  1. Pomerite kursor na prvi sledeći red označen sa --->.
++
++  2. Pomerite kursor tako da se nalazi na prvoj grešci.
++
++  3. Otkucajte  r  i onda znak koji treba da tu stoji.
++
++  4. Ponavljajte korake 2 i 3 sve dok prvi red ne bude
++     isti kao drugi.
++
++--->  Kedi ju ovej red ugašen, nako je protresao pustašne testere!
++--->  Kada je ovaj red unošen, neko je pritiskao pogrešne tastere!
++
++  5. Pređite na lekciju 3.2.
++
++NAPOMENA:  Setite se da treba da učite veÅŸbanjem, ne pamćenjem.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                   Lekcija 3.3: OPERATOR IZMENE
++
++
++         ** Za izmenu teksta do kraja reči, otkucajte  ce  .**
++
++  1. Pomerite kursor na prvi sledeći red označen sa --->.
++
++  2. Postavite kursor na  a  u  rakdur.
++
++  3. Otkucajte  ce  i ispravite reč (u ovom slučaju otkucajte  ed  ).
++
++  4. Pritisnite <ESC> i pomerite kursor na sledeći znak koji
++     treba ispraviti.
++
++  5. Ponavljajte korake 3 i 4 sve dok prva rečenica ne bude ista
++     kao druga.
++
++---> Ovaj rakdur ima nekoliko rejga koje treflja isprpikati operagrom izmene.
++---> Ovaj red ima nekoliko reči koje treba ispraviti operatorom izmene.
++
++Uočite da  ce  briše reč i postavlja editor u Insert mod.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                Lekcija 3.4: DALJE IZMENE UPOTREBOM c
++
++
++    ** Komanda izmene se koristi sa istim pokretima kao i brisanje. **
++
++  1. Operator izmene se koristi na isti način kao i operator brisanja:
++
++         c    [broj]   pokret
++
++  2. Pokreti su isti, recimo:   w (reč) i  $ (kraj reda).
++
++  3. Pomerite kursor na prvi sledeći red označen sa --->.
++
++  4. Pomerite kursor na prvu grešku.
++
++  5. Otkucajte  c$  i unesite ostatak reda tako da bude isti kao
++     drugi red, pa pritisnite <ESC>.
++
++---> Kraj ovog reda treba izmeniti tako da izgleda kao red ispod.
++---> Kraj ovog reda treba ispraviti korišćenjem c$ komande.
++
++NAPOMENA:  Za ispravljanje grešaka moşete koristiti Backspace .
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                             REZIME lekcije 3
++
++
++  1. Za postavljanje teksta koji ste upravo izbrisali, pritisnite  p . Ovo
++     postavlja tekst IZA kursora (ako je bio izbrisan jedan ili više redova
++     sadrÅŸaj će doći na red ispod kursora).
++
++  2. Za zamenu znaka na kome se nalazi kursor, pritisnite  r  i onda
++     ÅŸeljeni znak.
++
++  3. Operator izmene dozvoljava promenu teksta od kursora do pozicije gde
++     se završava pokret.  Primera radi, kucajte  ce  za izmenu od kursora do
++     kraja reči, ili  c$  za izmenu od kursora do kraja reda.
++
++  4. Oblik operacije izmene je:
++
++        c   [broj]   pokret
++
++Pređite na narednu lekciju.
++
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++             Lekcija 4.1: POZICIJA KURSORA I STATUS FAJLA
++
++  ** Pritisnite CTRL-G za prikaz pozicije kursora u tekstu i status fajla.
++     Pritisnite  G  za pomeranje kursora na neki red u tekstu. **
++
++NAPOMENA:  Pročitajte celu lekciju pre izvođenja bilo kog koraka!!
++
++  1. DrÅŸite taster CTRL i pritisnite  g .  Ovo zovemo CTRL-G.
++     Editor će na dnu ekrana ispisati poruku sa imenom fajla i pozicijom
++     kursora u tekstu.  Zapamtite broj reda za 3. korak.
++
++NAPOMENA:  U donjem desnom uglu moÅŸe se videti poziciju kursora ako je
++           uključena opcija 'ruler' (vidi  :help ruler  ili lekciju 6.5.)
++
++  2. Pritisnite  G  za pomeranje kursora na kraj teksta.
++     Pritisnite  1G  ili  gg  za pomranje kursora na početak teksta.
++
++  3. Otkucajte broj reda na kome ste malopre bili i onda  G .  Kursor
++     će se vratiti na red na kome je bio kad ste otkucali CTRL-G.
++
++  4. Ako ste spremni, izvršite korake od 1 do 3.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                   Lekcija 4.2: KOMANDE PRETRAÅœIVANJA
++
++       ** Otkucajte  /  i onda izraz koji ÅŸelite da potraÅŸite. **
++
++  1. U Normal modu otkucajte znak  / .  Primietite da se znak pojavio
++     zajedno sa kursorom na dnu ekrana kao i kod komande  : .
++
++  2. Sada otkucajte 'grrreška' <ENTER>.  (Bez razmaka i navodnika.)
++     To je reč koju traşite.
++
++  3. Za ponovno traÅŸenje istog izraza, otkucajte  n .
++     Za traÅŸenje istog izraza u suprotnom smeru, otkucajte  N .
++
++  4. Za traÅŸenje izraza unatrag, koristite  ?  umesto  / .
++
++  5. Za povratak na prethodnu poziciju otkucajte CTRL-O (drÅŸite CTRL dok
++     pritiskate O ).  Ponavljajte za ranije pozicije.  CTRL-I ide napred.
++
++---> "grrreška" je pogrešno; umesto grrreška treba da stoji greška.
++
++NAPOMENA:  Ako pretraga dođe do kraja teksta traÅŸenje će se nastaviti od
++          njegovog početka osim ako je opcija 'wrapscan' isključena.
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                 Lekcija 4.3: TRAÅœENJE PARA ZAGRADE
++
++
++       ** Otkucajte  %  za nalaÅŸenje para ), ] ili } . **
++
++  1. Postavite kursor na bilo koju od  ( ,  [  ili  {
++     otvorenih zagrada u redu označenom sa --->.
++
++  2. Otkucajte znak  % .
++
++  3. Kursor će se pomeriti na odgovarajuću zatvorenu zagradu.
++
++  4. Otkucajte  %  da pomerite kursor na prvu zagradu u paru.
++
++      5. Pomerite kursor na neku od (,),[,],{ ili } i ponovite komandu  % .
++
++---> Red ( testiranja običnih ( [ uglastih ] i { vitičastih } zagrada.))
++
++
++NAPOMENA:  Vrlo korisno u ispravljanju koda sa rasparenim zagradama!
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                     Lekcija 4.4: KOMANDA ZAMENE
++
++
++       ** Otkucajte  :s/staro/novo/g  da zamenite 'staro' za 'novo'. **
++
++  1. Pomerite kursor na red označen sa --->.
++
++  2. Otkucajte  :s/rdi/ri/ <ENTER> .  Primetite da ova komanda zamenjuje
++     samo prvo "rdi" u redu.
++
++  3. Otkucajte  :s/rdi/ri/g .  Dodavanje opcije  g  znači da će se komanda
++     izvršiti u celom redu, zamenom svih pojava niza "rdi".
++
++---> rdiba rdibi grdize rep.
++
++  4. Za zamenu svih izraza između neka dva reda,
++     otkucajte :#,#s/staro/novo/g   gde su #,# krajnji brojevi redova u opsegu 
++                                    u kome će se obaviti zamena.
++     Otkucajte :%s/staro/novo/g     za zamenu svih izraza u celom tekstu.
++     Otkucajte :%s/staro/novo/gc    za nalaÅŸenje svih izraza u tekstu i
++                                   potvrdu zamene.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                             REZIME lekcije 4
++
++
++  1. CTRL-G  prikazuje poziciju kursora u tekstu i status fajla.
++             G  pomera kursor na kraj teksta.
++     broj    G  pomera kursor na navedeni red.
++            gg  pomera kursor na prvi red teksta.
++
++  2. Kucanjem  /  sa izrazom taj izraz se traÅŸi UNAPRED.
++     Kucanjem  ?  sa izrazom taj izraz se traÅŸi UNAZAD.
++     Posle komande traÅŸenja koristite  n  za nalaÅŸenje izraza u istom
++     smeru, a  N  za nalaÅŸenje u suprotnom smeru.
++     CTRL-O vraća kursor na prethodnu poziciju, a CTRL-I na narednu.
++
++  3. Kucanjem  %  kad je kursor na zagradi on se pomera na njen par.
++
++  4. Za zamenu prvog izraza staro za izraz novo            :s/staro/novo/
++     Za zamenu svih izraza u celom redu                    :s/staro/novo/g
++     Za zamenu svih izraza u opsegu linija #,#             :#,#s/staro/novo/g
++     Za zamenu u celom tekstu                              :%s/staro/novo/g
++     Za potvrdu svake zamene dodajte 'c'                  :%s/staro/novo/gc
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++               Lekcija 5.1: IZVRÅ AVANJE SPOLJAÅ NJIH KOMANDI
++
++
++  ** Otkucajte  :!  pa spoljašnju komandu koju şelite da izvršite. **
++
++  1. Otkucajte poznatu komandu  :  da biste namestili kursor na dno
++     ekrana.  Time omogućavate unos komande u komandnoj liniji editora.
++
++  2. Otkucajte znak  !  (uzvičnik).  Ovime omogućavate
++     izvršavanje bilo koje spoljašnje komande.
++
++  3. Kao primer otkucajte   ls   posle ! i pritisnite <ENTER>.  Ovo će
++     prikazati sadrÅŸaj direktorijuma, kao da ste na komandnom promptu.
++     Otkucajte   :!dir   ako   :!ls   ne radi.
++
++NAPOMENA:  Na ovaj način moguće je izvršiti bilo koju spoljašnju komandu,
++           zajedno sa njenim argumentima.
++
++NAPOMENA:  Sve  :  komande se izvršavaju pošto pritisnete <ENTER> .
++          U daljem tekstu to nećemo uvek napominjati.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                  Lekcija 5.2: VIÅ E O SNIMANJU FAJLOVA
++
++           ** Za snimanje promena, otkucajte  :w IME_FAJLA . **
++
++  1. Otkucajte  :!dir  ili  :!ls  za pregled sadrÅŸaja direktorijuma.
++     Već znate da morate pritisnuti <ENTER> posle toga.
++
++  2. Izaberite ime fajla koji još ne postoji, npr. TEST.
++
++  3. Otkucajte:         :w TEST   (gde je TEST ime koje ste izabrali.)
++
++  4. Time ćete snimiti ceo fajl (Vim Tutor) pod imenom TEST.
++     Za proveru, otkucajte opet  :!dir  ili  :!ls za pregled
++     sadrÅŸaja direktorijuma.
++
++NAPOMENA:  Ako biste napustili Vim i ponovo ga pokrenuli sa vim TEST ,
++           tekst bi bio tačna kopija ovog fajla u trenutku kad ste
++          ga snimili.
++
++  5. Izbrišite fajl tako što ćete otkucati (MS-DOS):        :!del TEST
++                                        ili (Unix):    :!rm TEST
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                 Lekcija 5.3: SNIMANJE OZNAČENOG TEKSTA
++
++
++   ** Da biste snimili deo teksta, otkucajte  v  pokret  :w IME_FAJLA **
++
++  1. Pomerite kursor na ovu liniju.
++
++  2. Pritisnite  v  i pomerite kursor pet redova ispod.  Primetite da je
++     tekst označen inverzno.
++
++  3. Pritisnite  : .  Na dnu ekrana pojaviće se  :'<,'> .
++
++  4. Otkucajte  w TEST  , gde je TEST ime fajla koji još ne postoji.
++     Proverite da zaista piše  :'<,'>w TEST  pre nego što pritisnete <ENTER>.
++
++  5. Vim će snimiti označeni tekst u TEST.  Proverite sa  :!dir  ili  !ls .
++     Nemojte još brisati fajl!  Koristićemo ga u narednoj lekciji.
++
++NAPOMENA:  Komanda  v  započinje vizuelno označavanje.  Moşete pomerati kursor
++           i tako menjati veličinu označenog teksta.  Onda moşete upotrebiti
++           operatore nad tekstom.  Na primer,  d  će izbrisati označeni tekst.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                  Lekcija 5.4: UČITAVANJE FAJLA U TEKST
++
++
++       ** Za ubacivanje sadrÅŸaja fajla, otkucajte  :r IME_FAJLA  **
++
++  1. Postavite kursor iznad ove linije.
++
++NAPOMENA:  Pošto izvršite 2. korak videćete tekst iz lekcije 5.3.  Tada
++           pomerite kursor DOLE da biste ponovo videli ovu lekciju.
++
++  2. Učitajte fajl TEST koristeći komandu  :r TEST  gde je TEST ime fajla
++     koje ste koristili u prethodnoj lekciji.  Sadrşaj učitanog fajla je
++     ubačen ispod kursora.
++
++  3. Da biste proverili da je fajl učitan, vratite kursor unazad i
++     primetite dve kopije lekcije 5.3, originalnu i onu iz fajla.
++
++NAPOMENA:  Takođe moÅŸete učitati izlaz spoljaÅ¡nje komande.  Na primer,
++          :r !ls  će učitati izlaz komande  ls  i postaviti ga ispod
++           kursora.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                             REZIME lekcije 5
++
++
++  1.  :!komanda  izvršava spoljašnju komandu.
++
++      Korisni primeri:
++        (MS-DOS)         (Unix)
++         :!dir            :!ls            -  pregled sadrÅŸaja direktorijuma.
++         :!del FAJL       :!rm FAJL       -  briše fajl FAJL.
++
++  2.  :w FAJL  zapisuje trenutni tekst na disk pod imenom FAJL.
++
++  3.  v  pokret  :w IME_FAJLA  snima vizuelno označene redove u fajl
++      IME_FAJLA.
++
++  4.  :r IME_FAJLA  učitava fajl IME_FAJLA sa diska i stavlja
++      njegov sadrÅŸaj ispod kursora.
++
++  5.  :r !dir  učitava izlaz komande dir i postavlja ga ispod kursora.
++
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                        Lekcija 6.1: KOMANDA OTVORI
++
++
++       ** Pritisnite  o  da biste otvorili red ispod kursora
++          i prešli u Insert mod. **
++
++  1. Pomerite kursor na sledeći red označen sa --->.
++
++  2. Otkucajte malo  o  da biste otvorili novi red ISPOD kursora
++     i prešli u Insert mod.
++
++  3. Otkucajte neki tekst i onda pritisnite <ESC> da biste izašli
++     iz Insert moda.
++
++---> Kad pritisnete  o  kursor prelazi u novootvoreni red u Insert modu.
++
++  4. Za otvaranje reda IZNAD kursora, umesto malog otkucajte veliko O .
++     Isprobajte na donjem redu označenom sa --->.
++
++---> Otvorite red iznad ovog kucanjem velikog  O  dok je kursor u ovom redu.
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                       Lekcija 6.2: KOMANDA DODAJ
++
++
++            ** Otkucajte  a  za dodavanje teksta IZA kursora. **
++
++  1. Pomerite kursor na početak sledećeg reda označenog sa --->.
++  
++  2. Kucajte  e  dok kursor ne dođe na kraj reči  re .
++
++  3. Otkucajte  a  (malo) da biste dodali tekst IZA kursora.
++
++  4. Dopunite reč kao što je u redu ispod.  Pritisnite <ESC> za izlazak
++     iz Insert moda.
++
++  5. Sa  e  pređite na narednu nepotpunu reč i ponovite korake 3 i 4.
++  
++---> Ovaj re omogućava ve dodav teksta u nekom redu.
++---> Ovaj red omogućava veÅŸbanje dodavanja teksta u nekom redu.
++
++NAPOMENA:  Komande a, i, i  A  aktiviraju isti Insert mod, jedina
++           razlika je u poziciji od koje će se tekst ubacivati.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                   Lekcija 6.3: DRUGI NAČIN ZAMENE
++
++
++      ** Otkucajte veliko  R  da biste zamenili više od jednog znaka. **
++
++  1. Pomerite kursor na prvi sledeći red označen sa --->.
++     Pomerite kursor na početak prvog  xxx .
++
++  2. Pritisnite  R  i otkucajte broj koji je red ispod,
++     tako da zameni xxx .
++
++  3. Pritisnite <ESC> za izlazak iz Replace moda.
++     Primetite da je ostatak reda ostao nepromenjen.
++
++  4. Ponovite korake da biste zamenili drugo xxx.
++
++---> Dodavanje 123 na xxx daje xxx.
++---> Dodavanje 123 na 456 daje 579.
++
++NAPOMENA:  Replace mod je kao Insert mod, s tom razlikom Å¡to svaki
++           uneti znak briše već postojeći.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++               Lekcija 6.4: KOPIRANJE I LEPLJENJE TEKSTA
++
++
++    ** Koristite operator  y  za kopiranje a  p  za lepljenje teksta. **
++
++  1. Pomerite kursor na red sa --->  i postavite kursor posle "a)".
++  
++  2. Aktivirajte Visual mod sa  v  i pomerite kursor sve do ispred "prvi".
++  
++  3. Pritisnite  y  da biste kopirali označeni tekst u interni bafer.
++
++  4. Pomerite kursor do kraja sledećeg reda:  j$
++
++  5. Pritisnite  p  da biste zalepili tekst.  Onda otkucajte:  a drugi <ESC> .
++
++  6. Upotrebite Visual mod da označite " red.", kopirajte sa  y , kursor
++     pomerite na kraj sledećeg reda sa  j$  i tamo zalepite tekst sa  p .
++
++--->  a) ovo je prvi red.
++      b)
++
++NAPOMENA:  takođe moÅŸete koristiti  y  kao operator;  yw  kopira jednu reč.
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                   Lekcija 6.5: POSTAVLJANJE OPCIJA
++
++
++ ** Postavite opciju tako da traşenje i zamena ignorišu veličinu slova **
++
++  1. Potraşite reč 'razlika':  /razlika <ENTER>
++     Ponovite nekoliko puta pritiskom na  n .
++
++  2. Aktivirajte opciju 'ic' (Ignore case):  :set ic
++
++  3. Ponovo potraşite reč 'razlika' pritiskom na  n
++     Primetite da su sada pronađeni i RAZLIKA i Razlika.
++
++  4. Aktivirajte opcije 'hlsearch' i 'incsearch':  :set hls is
++
++  5. Ponovo otkucajte komandu traşenja i uočite razlike:  /razlika <ENTER>
++
++  6. Za deaktiviranje opcije  ic  kucajte:  :set noic
++
++NAPOMENA:  Za neoznačavanje pronađenih izraza otkucajte:  :nohlsearch
++NAPOMENA:  Ako şelite da ne razlikujete veličinu slova u samo jednoj komandi
++          traÅŸenja, dodajte  \c  u izraz:  /razlika\c <ENTER>
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                             REZIME lekcije 6
++
++  1. Pritisnite  o  za otvaranje reda ISPOD kursora i prelazak u Insert mod.
++     Pritisnite  O  za otvaranje reda IZNAD kursora.
++
++  2. Pritisnite  a  za unos teksta IZA kursora.
++     Pritisnite  A  za unos teksta na kraju reda.
++
++  3. Komanda  e  pomera kursor na kraj reči.
++
++  4. Operator  y  kopira tekst,  p  ga lepi.
++
++  5. Kucanje velikog  R  aktivira Replace mod dok ne pritisnete <ESC> .
++
++  6. Kucanje ":set xxx" aktivira opciju "xxx".  Neke opcije su:
++       'ic' 'ignorecase'       ne razlikuje velika/mala slova pri traÅŸenju
++       'is' 'incsearch'        prikazuje pronađen tekst dok kucate izraz
++       'hls' 'hlsearch'        označava inverzno sve pronađene izraze
++     MoÅŸete koristite dugo ili kratko ime opcije.
++
++  7. Ispred imena opcije stavite "no" da je deaktivirate:  :set noic
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                      Lekcija 7.1: DOBIJANJE POMOĆI
++
++
++                  ** Koristite on-line sistem za pomoć **
++
++  Vim ima detaljan on-line sistem za pomoć.  Za početak, pokušajte nešto
++  od sledećeg:
++       - pritisnite taster <HELP> (ako ga imate na tastaturi)
++       - pritisnite taster <F1> (ako ga imate na tastaturi)
++       - otkucajte  :help <ENTER>
++
++  Pročitajte tekst u prozoru pomoći da biste naučili pomoć radi.
++  Kucanjem  CTRL-W CTRL-W  prelazite iz jednog prozora u drugi.
++  Otkucajte  :q <ENTER>  da zatvorite prozor pomoći.
++
++  Pomoć o praktično bilo kojoj temi moÅŸete dobiti dodavanjem argumenta
++  komandi ":help".  Pokušajte ovo (ne zaboravite <ENTER> na kraju):
++
++       :help w
++       :help c_CTRL-D
++       :help insert-index
++       :help user-manual
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++               Lekcija 7.2: PRAVLJENJE STARTNOG SKRIPTA
++
++
++                  ** Aktivirajte mogućnosti editora **
++
++  Vim ima mnogo više mogućnosti nego Vi, ali većina nije automatski
++  aktivirana.  Za dodatne mogućnosti napravite "vimrc" fajl.
++
++  1. Otvorite "vimrc" fajl.  Ovo zavisi od vašeg sistema:
++       :e ~/.vimrc             za Unix
++       :e $VIM/_vimrc          za MS-Windows
++
++  2. Onda učitajte primer sadrşaja "vimrc" fajla:
++       :r $VIMRUNTIME/vimrc_example.vim
++
++  3. Snimite fajl sa:
++       :w
++
++  Sledeći put kada pokrenete Vim, bojenje sintakse teksta biće
++  aktivirano. Sva svoja podešavanja moşete dodati u "vimrc" fajl.
++  Za više informacija otkucajte  :help vimrc-intro
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                    Lekcija 7.3: AUTOMATSKO DOVRÅ AVANJE
++
++
++       ** Dovršavanje komandne linije sa CTRL-D i <TAB> **
++
++  1. Podesite Vim da ne bude u Vi-kompatibilnom modu:  :set nocp
++
++  2. Pogledajte koji fajlovi postoje u direktorijumu:  :!ls  ili  :!dir
++
++  3. Otkucajte početak komande:  :e
++
++  4. Otkucajte  CTRL-D  i Vim će prikazati spisak komandi koje počinju sa "e".
++
++  5. Pritisnite <TAB>  i Vim će dopuniti ime komande u ":edit".
++
++  6. Dodajte razmak i početak imena postojećeg fajla:  :edit FA
++
++  7. Pritisnite <TAB>.  Vim će dopuniti ime fajla (ako je jedinstveno).
++
++NAPOMENA:  Moguće je dopuniti mnoge komande.  Samo probajte CTRL-D i <TAB>.
++           Naročito je korisno za  :help  komande.
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++                             REZIME lekcije 7
++
++
++  1. Otkucajte  :help  ili pritisnite <F1> ili <Help>  za pomoć.
++
++  2. Otkucajte  :help komanda  biste dobili pomoć za tu komandu.
++
++  3. Otkucajte  CTRL-W CTRL-W  za prelazak u drugi prozor.
++
++  4. Otkucajte  :q  da zatvorite prozor pomoći.
++
++  5. Napravite vimrc startni skript za aktiviranje podešavanja koja
++     vam odgovaraju.
++
++  6. Dok kucate neku od  :  komandi, pritisnite CTRL-D da biste videli moguće
++     vrednosti.  Pritisnite <TAB> da odaberete jednu od njih.
++
++
++
++
++
++
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++  Ovim je priručnik završen.  Njegov cilj je bio kratak pregled Vim editora,
++  koliko da omogući njegovo relativno jednostavno korišćenje.  Priručnik nije
++  potpun, jer Vim ima mnogo više komandi.  Kao sledeće, pročitajte priručnik:
++  ":help user-manual".
++
++  Za dalje čitanje i učenje, preporučujemo knjigu:
++       Vim - Vi Improved - by Steve Oualline
++       Izdavač: New Riders
++  Prva knjiga potpuno posvećena Vim-u.  Naročito korisna za početnike.
++  Ima mnoštvo primera i slika.
++  Vidite http://iccf-holland.org/click5.html
++
++  Sledeća knjiga je starija i više govori o Vi-u nego o Vim-u, ali je takođe
++  preporučujemo:
++       Learning the Vi Editor - by Linda Lamb
++       Izdavač: O'Reilly & Associates Inc.
++  Dobra knjiga iz koje moÅŸete saznati skoro sve Å¡to moÅŸete raditi u Vi-ju.
++  Å esto izdanje ima i informacija o Vim-u.
++
++  Ovaj priručnik su napisali: Michael C. Pierce i Robert K. Ware,
++  Colorado School of Mines koristeći ideje Charlesa Smitha,
++  Colorado State University.  E-mail: bware@mines.colorado.edu.
++
++  Prilagođavanje za Vim uradio je Bram Moolenaar.
++
++  Prevod na srpski: Ivan Nejgebauer <ian@uns.ac.rs>
++  Verzija 1.0, maj/juni 2014.
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+diff -Naur vim74.orig/runtime/tutor/tutor.vim vim74/runtime/tutor/tutor.vim
+--- vim74.orig/runtime/tutor/tutor.vim  2012-09-21 12:23:48.000000000 +0000
++++ vim74/runtime/tutor/tutor.vim       2014-07-21 23:33:37.640139140 +0000
+@@ -1,7 +1,7 @@
+ " Vim tutor support file
+ " Author: Eduardo F. Amatria <eferna1@platea.pntic.mec.es>
+ " Maintainer: Bram Moolenaar
+-" Last Change: 2012 Sep 21
++" Last Change: 2014 Jun 25
+ 
+ " This Vim script is used for detecting if a translation of the
+ " tutor file exist, i.e., a tutor.xx file, where xx is the language.
+@@ -36,6 +36,8 @@
+       let s:ext = ".pl"
+     elseif s:lang =~ "Slovak"
+       let s:ext = ".sk"
++    elseif s:lang =~ "Serbian"
++      let s:ext = ".sr"
+     elseif s:lang =~ "Czech"
+       let s:ext = ".cs"
+     elseif s:lang =~ "Dutch"
+@@ -122,6 +124,15 @@
+   endif
+ endif
+ 
++" The Slovak tutor is available in two encodings, guess which one to use
++" Note that the utf-8 version is the original, the cp1250 version is created
++" from it.
++if s:ext =~? '\.sr'
++  if &enc =~ 1250
++    let s:ext = ".sr.cp1250"
++  endif
++endif
++
+ " The Czech tutor is available in three encodings, guess which one to use
+ if s:ext =~? '\.cs'
+   if &enc =~ 1250
 diff -Naur vim74.orig/runtime/vimlogo.eps vim74/runtime/vimlogo.eps
 --- vim74.orig/runtime/vimlogo.eps      2010-05-15 11:03:57.000000000 +0000
-+++ vim74/runtime/vimlogo.eps   2014-06-01 00:43:12.880816844 +0000
++++ vim74/runtime/vimlogo.eps   2014-07-21 23:33:37.830138644 +0000
 @@ -1,791 +1,803 @@
 -%!PS-Adobe-3.0 EPSF-3.0
@@ -32307 +37622 @@
 diff -Naur vim74.orig/runtime/vimrc_example.vim vim74/runtime/vimrc_example.vim
 --- vim74.orig/runtime/vimrc_example.vim        2011-04-15 18:58:36.000000000 +0000
-+++ vim74/runtime/vimrc_example.vim     2014-06-01 00:43:12.944150016 +0000
++++ vim74/runtime/vimrc_example.vim     2014-07-21 23:33:37.886805163 +0000
 @@ -1,7 +1,7 @@
  " An example for a vimrc file.
@@ -32329 +37644 @@
 diff -Naur vim74.orig/src/GvimExt/Make_cyg.mak vim74/src/GvimExt/Make_cyg.mak
 --- vim74.orig/src/GvimExt/Make_cyg.mak 2011-09-30 14:45:49.000000000 +0000
-+++ vim74/src/GvimExt/Make_cyg.mak      2014-06-01 00:43:13.007483188 +0000
++++ vim74/src/GvimExt/Make_cyg.mak      2014-07-21 23:33:37.970138279 +0000
 @@ -31,12 +31,12 @@
  ifeq ($(CROSS),yes)
@@ -32348 +37663 @@
 diff -Naur vim74.orig/src/Make_bc5.mak vim74/src/Make_bc5.mak
 --- vim74.orig/src/Make_bc5.mak 2013-06-03 18:09:58.000000000 +0000
-+++ vim74/src/Make_bc5.mak      2014-06-01 00:43:13.324149048 +0000
++++ vim74/src/Make_bc5.mak      2014-07-21 23:33:38.200137678 +0000
 @@ -419,7 +419,7 @@
  ALIGNARG = -a$(ALIGN)
@@ -32360 +37675 @@
 diff -Naur vim74.orig/src/Make_cyg.mak vim74/src/Make_cyg.mak
 --- vim74.orig/src/Make_cyg.mak 2013-07-06 11:32:11.000000000 +0000
-+++ vim74/src/Make_cyg.mak      2014-06-01 00:43:13.337482348 +0000
++++ vim74/src/Make_cyg.mak      2014-07-21 23:33:38.213470977 +0000
 @@ -1,6 +1,6 @@
  #
@@ -32398 +37713 @@
 diff -Naur vim74.orig/src/Make_ming.mak vim74/src/Make_ming.mak
 --- vim74.orig/src/Make_ming.mak        2013-07-06 11:32:11.000000000 +0000
-+++ vim74/src/Make_ming.mak     2014-06-01 00:43:13.407482170 +0000
++++ vim74/src/Make_ming.mak     2014-07-21 23:33:38.293470768 +0000
 @@ -359,6 +359,7 @@
  
@@ -32439 +37754 @@
 diff -Naur vim74.orig/src/Make_mvc.mak vim74/src/Make_mvc.mak
 --- vim74.orig/src/Make_mvc.mak 2013-07-09 11:13:12.000000000 +0000
-+++ vim74/src/Make_mvc.mak      2014-06-01 00:43:13.444148743 +0000
++++ vim74/src/Make_mvc.mak      2014-07-21 23:33:38.343470638 +0000
 @@ -424,6 +424,12 @@
  !if "$(_NMAKE_VER)" == "11.00.60610.1"
@@ -32512 +37827 @@
 diff -Naur vim74.orig/src/Make_vms.mms vim74/src/Make_vms.mms
 --- vim74.orig/src/Make_vms.mms 2013-05-06 02:06:04.000000000 +0000
-+++ vim74/src/Make_vms.mms      2014-06-01 00:43:13.494148616 +0000
++++ vim74/src/Make_vms.mms      2014-07-21 23:33:38.380137209 +0000
 @@ -2,7 +2,7 @@
  # Makefile for Vim on OpenVMS
@@ -32628 +37943 @@
 diff -Naur vim74.orig/src/Makefile vim74/src/Makefile
 --- vim74.orig/src/Makefile     2013-08-10 12:21:15.000000000 +0000
-+++ vim74/src/Makefile  2014-06-01 00:43:13.524148539 +0000
++++ vim74/src/Makefile  2014-07-21 23:33:38.420137104 +0000
 @@ -546,6 +546,7 @@
  # again.
@@ -32739 +38054 @@
 diff -Naur vim74.orig/src/auto/configure vim74/src/auto/configure
 --- vim74.orig/src/auto/configure       2013-08-04 18:01:06.000000000 +0000
-+++ vim74/src/auto/configure    2014-06-01 00:43:13.910814221 +0000
++++ vim74/src/auto/configure    2014-07-21 23:33:38.890135878 +0000
 @@ -1,11 +1,9 @@
  #! /bin/sh
@@ -36762 +42077 @@
 diff -Naur vim74.orig/src/blowfish.c vim74/src/blowfish.c
 --- vim74.orig/src/blowfish.c   2010-12-17 18:58:18.000000000 +0000
-+++ vim74/src/blowfish.c        2014-06-01 00:43:13.954147444 +0000
++++ vim74/src/blowfish.c        2014-07-21 23:33:38.936802423 +0000
 @@ -6,7 +6,7 @@
   * Do ":help credits" in Vim to see a list of people who contributed.
@@ -36890 +42205 @@
 diff -Naur vim74.orig/src/buffer.c vim74/src/buffer.c
 --- vim74.orig/src/buffer.c     2013-07-17 14:39:00.000000000 +0000
-+++ vim74/src/buffer.c  2014-06-01 00:43:13.980814043 +0000
++++ vim74/src/buffer.c  2014-07-21 23:33:38.956802371 +0000
 @@ -211,7 +211,12 @@
  
@@ -36904 +42219 @@
      /*
       * Set/reset the Changed flag first, autocmds may change the buffer.
-@@ -671,8 +676,16 @@
+@@ -366,7 +371,11 @@
+        unload_buf = TRUE;
+ #endif
+ 
+-    if (win != NULL)
++    if (win != NULL
++#ifdef FEAT_WINDOWS
++       && win_valid(win)       /* in case autocommands closed the window */
++#endif
++           )
+     {
+        /* Set b_last_cursor when closing the last window for the buffer.
+         * Remember the last cursor position and window options of the buffer.
+@@ -671,8 +680,16 @@
  #endif
  #ifdef FEAT_AUTOCMD
@@ -36922 +42250 @@
  
  /*
-@@ -989,6 +1002,50 @@
+@@ -989,6 +1006,50 @@
  #if defined(FEAT_LISTCMDS) || defined(FEAT_PYTHON) \
         || defined(FEAT_PYTHON3) || defined(PROTO)
@@ -36973 +42301 @@
   * Implementation of the commands for the buffer list.
   *
-@@ -1109,7 +1166,6 @@
+@@ -1109,7 +1170,6 @@
      if (unload)
      {
@@ -36981 +42309 @@
         /* When unloading or deleting a buffer that's already unloaded and
          * unlisted: fail silently. */
-@@ -1150,30 +1206,7 @@
+@@ -1150,30 +1210,7 @@
             if (bp->b_p_bl && bp != buf)
                 break;
@@ -37013 +42341 @@
  #ifdef FEAT_WINDOWS
         /*
-@@ -1186,7 +1219,10 @@
+@@ -1186,7 +1223,10 @@
                    && !(curwin->w_closing || curwin->w_buffer->b_closing)
  # endif
@@ -37025 +42353 @@
  
         /*
-@@ -1204,7 +1240,8 @@
+@@ -1204,7 +1244,8 @@
  
         /*
@@ -37035 +42363 @@
          * Then prefer the buffer we most recently visited.
          * Else try to find one that is loaded, after the current buffer,
-@@ -1303,6 +1340,13 @@
+@@ -1303,6 +1344,13 @@
         }
      }
@@ -37049 +42377 @@
       * make buf current buffer
       */
-@@ -1396,10 +1440,8 @@
+@@ -1396,10 +1444,8 @@
         curwin->w_alt_fnum = curbuf->b_fnum; /* remember alternate file */
      buflist_altfpos(curwin);                    /* remember curpos */
@@ -37060 +42388 @@
      /* close_windows() or apply_autocmds() may change curbuf */
      prevbuf = curbuf;
-@@ -1647,7 +1689,11 @@
+@@ -1647,7 +1693,11 @@
             buf->b_p_bl = TRUE;
  #ifdef FEAT_AUTOCMD
@@ -37072 +42400 @@
         }
         return buf;
-@@ -1823,8 +1869,14 @@
+@@ -1823,8 +1873,14 @@
      if (!(flags & BLN_DUMMY))
      {
@@ -37087 +42415 @@
         if (aborting())         /* autocmds may abort script processing */
             return NULL;
-@@ -1941,6 +1993,10 @@
+@@ -1941,6 +1997,10 @@
      clear_string_option(&buf->b_p_qe);
  #endif
@@ -37098 +42426 @@
  
  /*
-@@ -4059,7 +4115,8 @@
+@@ -4059,7 +4119,8 @@
                 item[curitem].minwid = -syn_namen2id(t, (int)(s - t));
                 curitem++;
@@ -37108 +42436 @@
         }
  
-@@ -5468,6 +5525,10 @@
+@@ -5468,6 +5529,10 @@
      return;
  }
@@ -37119 +42447 @@
  buf_change_sign_type(buf, markId, typenr)
      buf_T      *buf;           /* buffer to store sign in */
-@@ -5636,6 +5697,14 @@
+@@ -5636,6 +5701,14 @@
  {
      signlist_T *next;
  
 +    /* When deleting the last sign need to redraw the windows to remove the
-+     * sign column. */
-+    if (buf->b_signlist != NULL)
++     * sign column. Not when curwin is NULL (this means we're exiting). */
++    if (buf->b_signlist != NULL && curwin != NULL)
 +    {
 +       redraw_buf_later(buf, NOT_VALID);
@@ -37134 +42462 @@
      {
         next = buf->b_signlist->next;
-@@ -5654,11 +5723,7 @@
+@@ -5654,11 +5727,7 @@
  
      for (buf = firstbuf; buf != NULL; buf = buf->b_next)
@@ -37148 +42476 @@
 diff -Naur vim74.orig/src/charset.c vim74/src/charset.c
 --- vim74.orig/src/charset.c    2013-02-06 15:20:01.000000000 +0000
-+++ vim74/src/charset.c 2014-06-01 00:43:14.000813992 +0000
-@@ -1380,10 +1380,7 @@
++++ vim74/src/charset.c 2014-07-21 23:33:38.990135617 +0000
+@@ -867,9 +867,10 @@
+     char_u     *s;
+ {
+     colnr_T    col = startcol;
++    char_u     *line = s; /* pointer to start of line, for breakindent */
+ 
+     while (*s != NUL)
+-       col += lbr_chartabsize_adv(&s, col);
++       col += lbr_chartabsize_adv(line, &s, col);
+     return (int)col;
+ }
+ 
+@@ -877,16 +878,17 @@
+  * Like linetabsize(), but for a given window instead of the current one.
+  */
+     int
+-win_linetabsize(wp, p, len)
++win_linetabsize(wp, line, len)
+     win_T      *wp;
+-    char_u     *p;
++    char_u     *line;
+     colnr_T    len;
+ {
+     colnr_T    col = 0;
+     char_u     *s;
+ 
+-    for (s = p; *s != NUL && (len == MAXCOL || s < p + len); mb_ptr_adv(s))
+-       col += win_lbr_chartabsize(wp, s, col, NULL);
++    for (s = line; *s != NUL && (len == MAXCOL || s < line + len);
++                                                               mb_ptr_adv(s))
++       col += win_lbr_chartabsize(wp, line, s, col, NULL);
+     return (int)col;
+ }
+ 
+@@ -1021,12 +1023,13 @@
+  * like chartabsize(), but also check for line breaks on the screen
+  */
+     int
+-lbr_chartabsize(s, col)
++lbr_chartabsize(line, s, col)
++    char_u             *line UNUSED; /* start of the line */
+     unsigned char      *s;
+     colnr_T            col;
+ {
+ #ifdef FEAT_LINEBREAK
+-    if (!curwin->w_p_lbr && *p_sbr == NUL)
++    if (!curwin->w_p_lbr && *p_sbr == NUL && !curwin->w_p_bri)
+     {
+ #endif
+ #ifdef FEAT_MBYTE
+@@ -1036,7 +1039,7 @@
+        RET_WIN_BUF_CHARTABSIZE(curwin, curbuf, s, col)
+ #ifdef FEAT_LINEBREAK
+     }
+-    return win_lbr_chartabsize(curwin, s, col, NULL);
++    return win_lbr_chartabsize(curwin, line == NULL ? s : line, s, col, NULL);
+ #endif
+ }
+ 
+@@ -1044,13 +1047,14 @@
+  * Call lbr_chartabsize() and advance the pointer.
+  */
+     int
+-lbr_chartabsize_adv(s, col)
++lbr_chartabsize_adv(line, s, col)
++    char_u     *line; /* start of the line */
+     char_u     **s;
+     colnr_T    col;
+ {
+     int                retval;
+ 
+-    retval = lbr_chartabsize(*s, col);
++    retval = lbr_chartabsize(line, *s, col);
+     mb_ptr_adv(*s);
+     return retval;
+ }
+@@ -1063,8 +1067,9 @@
+  * value, init to 0 before calling.
+  */
+     int
+-win_lbr_chartabsize(wp, s, col, headp)
++win_lbr_chartabsize(wp, line, s, col, headp)
+     win_T      *wp;
++    char_u     *line UNUSED; /* start of the line */
+     char_u     *s;
+     colnr_T    col;
+     int                *headp UNUSED;
+@@ -1073,6 +1078,7 @@
+     int                c;
+     int                size;
+     colnr_T    col2;
++    colnr_T    col_adj = 0; /* col + screen size of tab */
+     colnr_T    colmax;
+     int                added;
+ # ifdef FEAT_MBYTE
+@@ -1086,9 +1092,9 @@
+     int                n;
+ 
+     /*
+-     * No 'linebreak' and 'showbreak': return quickly.
++     * No 'linebreak', 'showbreak' and 'breakindent': return quickly.
+      */
+-    if (!wp->w_p_lbr && *p_sbr == NUL)
++    if (!wp->w_p_lbr && !wp->w_p_bri && *p_sbr == NUL)
+ #endif
+     {
+ #ifdef FEAT_MBYTE
+@@ -1104,6 +1110,8 @@
+      */
+     size = win_chartabsize(wp, s, col);
+     c = *s;
++    if (tab_corr)
++       col_adj = size - 1;
+ 
+     /*
+      * If 'linebreak' set check at a blank before a non-blank if the line
+@@ -1112,7 +1120,6 @@
+     if (wp->w_p_lbr
+            && vim_isbreak(c)
+            && !vim_isbreak(s[1])
+-           && !wp->w_p_list
+            && wp->w_p_wrap
+ # ifdef FEAT_VERTSPLIT
+            && wp->w_width != 0
+@@ -1125,12 +1132,13 @@
+         */
+        numberextra = win_col_off(wp);
+        col2 = col;
+-       colmax = (colnr_T)(W_WIDTH(wp) - numberextra);
++       colmax = (colnr_T)(W_WIDTH(wp) - numberextra - col_adj);
+        if (col >= colmax)
+        {
+-           n = colmax + win_col_off2(wp);
++           colmax += col_adj;
++           n = colmax +  win_col_off2(wp);
+            if (n > 0)
+-               colmax += (((col - colmax) / n) + 1) * n;
++               colmax += (((col - colmax) / n) + 1) * n - col_adj;
+        }
+ 
+        for (;;)
+@@ -1147,7 +1155,7 @@
+            col2 += win_chartabsize(wp, s, col2);
+            if (col2 >= colmax)         /* doesn't fit */
+            {
+-               size = colmax - col;
++               size = colmax - col + col_adj;
+                tab_corr = FALSE;
+                break;
+            }
+@@ -1163,11 +1171,12 @@
+ # endif
+ 
+     /*
+-     * May have to add something for 'showbreak' string at start of line
++     * May have to add something for 'breakindent' and/or 'showbreak'
++     * string at start of line.
+      * Set *headp to the size of what we add.
+      */
+     added = 0;
+-    if (*p_sbr != NUL && wp->w_p_wrap && col != 0)
++    if ((*p_sbr != NUL || wp->w_p_bri) && wp->w_p_wrap && col != 0)
+     {
+        numberextra = win_col_off(wp);
+        col += numberextra + mb_added;
+@@ -1180,7 +1189,12 @@
+        }
+        if (col == 0 || col + size > (colnr_T)W_WIDTH(wp))
+        {
+-           added = vim_strsize(p_sbr);
++           added = 0;
++           if (*p_sbr != NUL)
++               added += vim_strsize(p_sbr);
++           if (wp->w_p_bri)
++               added += get_breakindent_win(wp, line);
++
+            if (tab_corr)
+                size += (added / wp->w_buffer->b_p_ts) * wp->w_buffer->b_p_ts;
+            else
+@@ -1274,13 +1288,14 @@
+     colnr_T    vcol;
+     char_u     *ptr;           /* points to current char */
+     char_u     *posptr;        /* points to char at pos->col */
++    char_u     *line;          /* start of the line */
+     int                incr;
+     int                head;
+     int                ts = wp->w_buffer->b_p_ts;
+     int                c;
+ 
+     vcol = 0;
+-    ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE);
++    line = ptr = ml_get_buf(wp->w_buffer, pos->lnum, FALSE);
+     if (pos->col == MAXCOL)
+        posptr = NULL;  /* continue until the NUL */
+     else
+@@ -1288,12 +1303,13 @@
+ 
+     /*
+      * This function is used very often, do some speed optimizations.
+-     * When 'list', 'linebreak' and 'showbreak' are not set use a simple loop.
++     * When 'list', 'linebreak', 'showbreak' and 'breakindent' are not set
++     * use a simple loop.
+      * Also use this when 'list' is set but tabs take their normal size.
+      */
+     if ((!wp->w_p_list || lcs_tab1 != NUL)
+ #ifdef FEAT_LINEBREAK
+-           && !wp->w_p_lbr && *p_sbr == NUL
++           && !wp->w_p_lbr && *p_sbr == NUL && !wp->w_p_bri
+ #endif
+        )
+     {
+@@ -1355,7 +1371,7 @@
+        {
+            /* A tab gets expanded, depending on the current column */
+            head = 0;
+-           incr = win_lbr_chartabsize(wp, ptr, vcol, &head);
++           incr = win_lbr_chartabsize(wp, line, ptr, vcol, &head);
+            /* make sure we don't go past the end of the line */
+            if (*ptr == NUL)
+            {
+@@ -1380,10 +1396,7 @@
                 && (State & NORMAL)
                 && !wp->w_p_list
@@ -37161 +42709 @@
             *cursor = vcol + incr - 1;      /* cursor at end */
         else
-@@ -1463,7 +1460,6 @@
+@@ -1463,7 +1476,6 @@
  }
  #endif
@@ -37169 +42717 @@
   * Get the leftmost and rightmost virtual column of pos1 and pos2.
   * Used for Visual block mode.
-@@ -1500,7 +1496,6 @@
+@@ -1500,7 +1512,6 @@
      else
         *right = to1;
@@ -37179 +42727 @@
 diff -Naur vim74.orig/src/config.h.in vim74/src/config.h.in
 --- vim74.orig/src/config.h.in  2013-02-26 13:18:19.000000000 +0000
-+++ vim74/src/config.h.in       2014-06-01 00:43:14.020813941 +0000
++++ vim74/src/config.h.in       2014-07-21 23:33:39.016802214 +0000
 @@ -37,10 +37,10 @@
  #undef UNIX
@@ -37208 +42756 @@
 +/* Define if we have AvailabilityMacros.h on Mac OS X */
 +#undef HAVE_AVAILABILITYMACROS_H
+diff -Naur vim74.orig/src/config.mk.in vim74/src/config.mk.in
+--- vim74.orig/src/config.mk.in 2010-11-03 21:26:24.000000000 +0000
++++ vim74/src/config.mk.in      2014-07-21 23:33:39.036802162 +0000
+@@ -164,6 +164,8 @@
+ ### If the *.po files are to be translated to *.mo files.
+ MAKEMO         = @MAKEMO@
+ 
++MSGFMT         = @MSGFMT@
++
+ # Make sure that "make first" will run "make all" once configure has done its
+ # work.  This is needed when using the Makefile in the top directory.
+ first: all
 diff -Naur vim74.orig/src/configure.in vim74/src/configure.in
 --- vim74.orig/src/configure.in 2013-08-04 18:00:50.000000000 +0000
-+++ vim74/src/configure.in      2014-06-01 00:43:14.080813788 +0000
++++ vim74/src/configure.in      2014-07-21 23:33:39.076802058 +0000
 @@ -14,6 +14,7 @@
  AC_PROG_CC     dnl required by almost everything
@@ -37733 +43293 @@
 diff -Naur vim74.orig/src/diff.c vim74/src/diff.c
 --- vim74.orig/src/diff.c       2013-07-17 11:43:15.000000000 +0000
-+++ vim74/src/diff.c    2014-06-01 00:43:14.104147062 +0000
++++ vim74/src/diff.c    2014-07-21 23:33:39.123468602 +0000
 @@ -622,6 +622,7 @@
                     wp->w_topfill = (n < 0 ? 0 : n);
@@ -37751 +43311 @@
             /* Set 'diff', 'scrollbind' off and 'wrap' on. If option values
              * were saved in diff_win_options() restore them. */
+diff -Naur vim74.orig/src/digraph.c vim74/src/digraph.c
+--- vim74.orig/src/digraph.c    2012-01-10 20:57:16.000000000 +0000
++++ vim74/src/digraph.c 2014-07-21 23:33:39.150135200 +0000
+@@ -1425,6 +1425,8 @@
+        {'W', '=', 0x20a9},
+        {'=', 'e', 0x20ac}, /* euro */
+        {'E', 'u', 0x20ac}, /* euro */
++       {'=', 'R', 0x20bd}, /* rouble */
++       {'=', 'P', 0x20bd}, /* rouble */
+        {'o', 'C', 0x2103},
+        {'c', 'o', 0x2105},
+        {'o', 'F', 0x2109},
 diff -Naur vim74.orig/src/dosinst.c vim74/src/dosinst.c
 --- vim74.orig/src/dosinst.c    2013-05-06 02:06:04.000000000 +0000
-+++ vim74/src/dosinst.c 2014-06-01 00:43:14.177480209 +0000
++++ vim74/src/dosinst.c 2014-07-21 23:33:39.196801744 +0000
 @@ -1192,23 +1192,29 @@
         fprintf(fd, "  if arg3 =~ ' ' | let arg3 = '\"' . arg3 . '\"' | endif\n");
@@ -37806 +43378 @@
 diff -Naur vim74.orig/src/edit.c vim74/src/edit.c
 --- vim74.orig/src/edit.c       2013-07-04 18:22:25.000000000 +0000
-+++ vim74/src/edit.c    2014-06-01 00:43:14.210813457 +0000
++++ vim74/src/edit.c    2014-07-21 23:33:39.273468211 +0000
 @@ -199,7 +199,7 @@
  static void spell_back_to_badword __ARGS((void));
@@ -38019 +43591 @@
  
  /*
+@@ -1951,7 +1956,7 @@
+            else
+ #endif
+                ++new_cursor_col;
+-           vcol += lbr_chartabsize(ptr + new_cursor_col, (colnr_T)vcol);
++           vcol += lbr_chartabsize(ptr, ptr + new_cursor_col, (colnr_T)vcol);
+        }
+        vcol = last_vcol;
+ 
 @@ -3467,7 +3472,6 @@
      }
@@ -38088 +43669 @@
                 else if (first_match_pos.lnum == last_match_pos.lnum
                                  && first_match_pos.col == last_match_pos.col)
-@@ -5184,9 +5196,21 @@
+@@ -4580,7 +4592,10 @@
+      */
+     i = compl_col + (compl_cont_status & CONT_ADDING ? compl_length : 0);
+     backspace_until_column(i);
++
++    /* Not sure what is still valid, better redraw everything. */
+     changed_cline_bef_curs();
++    redraw_curbuf_later(NOT_VALID);
+ }
+ 
+ /* Insert the new text being completed. */
+@@ -5184,9 +5199,21 @@
         }
         else if (ctrl_x_mode == CTRL_X_FILES)
@@ -38113 +43705 @@
             compl_pattern = addstar(line + compl_col, compl_length,
                                                                 EXPAND_FILES);
-@@ -5262,7 +5286,8 @@
+@@ -5262,7 +5289,8 @@
             {
                 ctrl_x_mode = 0;
@@ -38123 +43715 @@
             }
  
-@@ -5521,15 +5546,18 @@
+@@ -5521,15 +5549,18 @@
  
      /* Show a message about what (completion) mode we're in. */
@@ -38149 +43741 @@
      /* Show the popup menu, unless we got interrupted. */
      if (!compl_interrupted)
-@@ -6687,7 +6715,7 @@
+@@ -6687,7 +6718,7 @@
      if (!arrow_used)       /* something has been inserted */
      {
@@ -38158 +43750 @@
      }
  #ifdef FEAT_SPELL
-@@ -6776,9 +6804,10 @@
+@@ -6776,9 +6807,10 @@
   * to another window/buffer.
   */
@@ -38170 +43762 @@
      int                cc;
      char_u     *ptr;
-@@ -6849,7 +6878,7 @@
+@@ -6849,7 +6881,7 @@
          * Do this when ESC was used or moving the cursor up/down.
          * Check for the old position still being valid, just in case the text
@@ -38179 +43771 @@
                 && end_insert_pos->lnum <= curbuf->b_ml.ml_line_count)
         {
-@@ -6872,7 +6901,6 @@
+@@ -6872,7 +6904,6 @@
             else if (cc != NUL)
                 ++curwin->w_cursor.col; /* put cursor back on the NUL */
@@ -38187 +43779 @@
              * deleted characters. */
             if (VIsual_active && VIsual.lnum == curwin->w_cursor.lnum)
-@@ -6882,12 +6910,11 @@
+@@ -6882,12 +6913,11 @@
                 if (VIsual.col > len)
                 {
@@ -38202 +43794 @@
      }
      did_ai = FALSE;
-@@ -6902,6 +6929,7 @@
+@@ -6902,6 +6932,7 @@
      if (end_insert_pos != NULL)
      {
@@ -38210 +43802 @@
      }
  }
-@@ -7845,8 +7873,7 @@
+@@ -7098,9 +7129,10 @@
+        for (;;)
+        {
+            coladvance(v - width);
+-           /* getviscol() is slow, skip it when 'showbreak' is empty and
+-            * there are no multi-byte characters */
+-           if ((*p_sbr == NUL
++           /* getviscol() is slow, skip it when 'showbreak' is empty,
++            * 'breakindent' is not set and there are no multi-byte
++            * characters */
++           if ((*p_sbr == NUL && !curwin->w_p_bri
+ #  ifdef FEAT_MBYTE
+                        && !has_mbyte
+ #  endif
+@@ -7845,8 +7877,7 @@
             if (try_match && keytyped == ':')
             {
@@ -38220 +43826 @@
                 /* Need to get the line again after cin_islabel(). */
                 p = ml_get_curline();
-@@ -7856,7 +7883,7 @@
+@@ -7856,7 +7887,7 @@
                 {
                     p[curwin->w_cursor.col - 1] = ' ';
@@ -38229 +43835 @@
                     p[curwin->w_cursor.col - 1] = ':';
                     if (i)
-@@ -8084,9 +8111,7 @@
+@@ -8084,9 +8115,7 @@
      int                need_redraw = FALSE;
      int                regname;
@@ -38239 +43845 @@
      /*
       * If we are going to wait for a character, show a '"'.
-@@ -8190,11 +8215,9 @@
+@@ -8190,11 +8219,9 @@
      if (need_redraw || stuff_empty())
         edit_unputchar();
@@ -38251 +43857 @@
  
  /*
-@@ -8237,6 +8260,7 @@
+@@ -8237,6 +8264,7 @@
  
                   /* Need to reset Insstart, esp. because a BS that joins
@@ -38259 +43865 @@
                   break;
  
-@@ -8366,7 +8390,7 @@
+@@ -8366,7 +8394,7 @@
             disabled_redraw = TRUE;
             return FALSE;       /* repeat the insert */
@@ -38268 +43874 @@
      }
  
-@@ -8390,11 +8414,7 @@
+@@ -8390,11 +8418,7 @@
  #endif
                )
@@ -38281 +43887 @@
             && !revins_on
  #endif
-@@ -8496,7 +8516,6 @@
+@@ -8496,7 +8520,6 @@
  }
  #endif
@@ -38289 +43895 @@
   * If 'keymodel' contains "startsel", may start selection.
   * Returns TRUE when a CTRL-O and other keys stuffed.
-@@ -8552,7 +8571,6 @@
+@@ -8552,7 +8575,6 @@
         }
      return FALSE;
@@ -38297 +43903 @@
  /*
   * <Insert> key in Insert mode: toggle insert/replace mode.
-@@ -8672,7 +8690,7 @@
+@@ -8672,7 +8694,7 @@
      {
         temp = curwin->w_cursor.col;
@@ -38306 +43912 @@
         else
             curwin->w_cursor.col = temp;
-@@ -8747,8 +8765,8 @@
+@@ -8747,8 +8769,8 @@
                 ((curwin->w_cursor.lnum == 1 && curwin->w_cursor.col == 0)
                     || (!can_bs(BS_START)
@@ -38317 +43923 @@
                                          && curwin->w_cursor.col <= ai_col)
                     || (!can_bs(BS_EOL) && curwin->w_cursor.col == 0))))
-@@ -8799,8 +8817,8 @@
+@@ -8799,8 +8821,8 @@
       */
      if (curwin->w_cursor.col == 0)
@@ -38328 +43934 @@
                         || revins_on
  #endif
-@@ -8809,8 +8827,8 @@
+@@ -8809,8 +8831,8 @@
             if (u_save((linenr_T)(curwin->w_cursor.lnum - 2),
                                (linenr_T)(curwin->w_cursor.lnum + 1)) == FAIL)
@@ -38339 +43945 @@
         /*
          * In replace mode:
-@@ -8853,7 +8871,7 @@
+@@ -8853,7 +8875,7 @@
                         ptr[len - 1] = NUL;
                 }
@@ -38348 +43954 @@
                     inc_cursor();
             }
-@@ -8946,7 +8964,7 @@
+@@ -8946,7 +8968,7 @@
  
             *inserted_space_p = FALSE;
@@ -38357 +43963 @@
                 ts = (int)get_sts_value();
             /* Compute the virtual column where we want to be.  Since
-@@ -8968,9 +8986,9 @@
+@@ -8968,9 +8990,9 @@
             while (vcol < want_vcol)
             {
@@ -38370 +43976 @@
  #ifdef FEAT_VREPLACE
                 if (State & VREPLACE_FLAG)
-@@ -9058,8 +9076,8 @@
+@@ -9058,8 +9080,8 @@
                 revins_on ||
  #endif
@@ -38381 +43987 @@
      }
  #ifdef FEAT_SMARTINDENT
-@@ -9077,9 +9095,9 @@
+@@ -9077,9 +9099,9 @@
      AppendCharToRedobuff(c);
  
@@ -38394 +44000 @@
      /* vi behaviour: the cursor moves backward but the character that
       *              was there remains visible
-@@ -9635,7 +9653,7 @@
+@@ -9635,7 +9657,7 @@
       * When nothing special, insert TAB like a normal character
       */
@@ -38403 +44009 @@
         return TRUE;
  
-@@ -9651,7 +9669,7 @@
+@@ -9651,7 +9673,7 @@
      AppendToRedobuff((char_u *)"\t");
  
@@ -38412 +44018 @@
         temp = (int)get_sts_value();
      else                       /* otherwise use 'tabstop' */
+@@ -9740,11 +9762,11 @@
+        getvcol(curwin, &fpos, &vcol, NULL, NULL);
+        getvcol(curwin, cursor, &want_vcol, NULL, NULL);
+ 
+-       /* Use as many TABs as possible.  Beware of 'showbreak' and
+-        * 'linebreak' adding extra virtual columns. */
++       /* Use as many TABs as possible.  Beware of 'breakindent', 'showbreak'
++        * and 'linebreak' adding extra virtual columns. */
+        while (vim_iswhite(*ptr))
+        {
+-           i = lbr_chartabsize((char_u *)"\t", vcol);
++           i = lbr_chartabsize(NULL, (char_u *)"\t", vcol);
+            if (vcol + i > want_vcol)
+                break;
+            if (*ptr != TAB)
+@@ -9766,11 +9788,12 @@
+        if (change_col >= 0)
+        {
+            int repl_off = 0;
++           char_u *line = ptr;
+ 
+            /* Skip over the spaces we need. */
+            while (vcol < want_vcol && *ptr == ' ')
+            {
+-               vcol += lbr_chartabsize(ptr, vcol);
++               vcol += lbr_chartabsize(line, ptr, vcol);
+                ++ptr;
+                ++repl_off;
+            }
+@@ -10011,6 +10034,7 @@
+     int            c;
+     int            temp;
+     char_u  *ptr, *prev_ptr;
++    char_u  *line;
+ 
+     if (lnum < 1 || lnum > curbuf->b_ml.ml_line_count)
+     {
+@@ -10020,13 +10044,13 @@
+ 
+     /* try to advance to the cursor column */
+     temp = 0;
+-    ptr = ml_get(lnum);
++    line = ptr = ml_get(lnum);
+     prev_ptr = ptr;
+     validate_virtcol();
+     while ((colnr_T)temp < curwin->w_virtcol && *ptr != NUL)
+     {
+        prev_ptr = ptr;
+-       temp += lbr_chartabsize_adv(&ptr, (colnr_T)temp);
++       temp += lbr_chartabsize_adv(line, &ptr, (colnr_T)temp);
+     }
+     if ((colnr_T)temp > curwin->w_virtcol)
+        ptr = prev_ptr;
 diff -Naur vim74.orig/src/eval.c vim74/src/eval.c
 --- vim74.orig/src/eval.c       2013-07-05 16:23:42.000000000 +0000
-+++ vim74/src/eval.c    2014-06-01 00:43:14.237480056 +0000
++++ vim74/src/eval.c    2014-07-21 23:33:39.406801197 +0000
 @@ -125,9 +125,6 @@
   */
@@ -38425 +44084 @@
   * When recursively copying lists and dicts we need to remember which ones we
   * have done to avoid endless recursiveness.  This unique ID is used for that.
-@@ -156,6 +153,11 @@
+@@ -137,6 +134,9 @@
+ #define COPYID_INC 2
+ #define COPYID_MASK (~0x1)
+ 
++/* Abort conversion to string after a recursion error. */
++static int  did_echo_string_emsg = FALSE;
++
+ /*
+  * Array to hold the hashtab with variables local to each sourced script.
+  * Each item holds a variable (nameless) that points to the dict_T.
+@@ -156,6 +156,11 @@
  /* Values for trans_function_name() argument: */
  #define TFN_INT                1       /* internal function name OK */
@@ -38437 +44106 @@
  /*
   * Structure to hold info for a user function.
-@@ -356,8 +358,10 @@
+@@ -356,8 +361,10 @@
      {VV_NAME("mouse_col",       VAR_NUMBER), 0},
      {VV_NAME("operator",        VAR_STRING), VV_RO},
@@ -38448 +44117 @@
  
  /* shorthand */
-@@ -389,7 +393,7 @@
+@@ -389,7 +396,7 @@
  static char_u *list_arg_vars __ARGS((exarg_T *eap, char_u *arg, int *first));
  static char_u *ex_let_one __ARGS((char_u *arg, typval_T *tv, int copy, char_u *endchars, char_u *op));
@@ -38457 +44126 @@
  static void set_var_lval __ARGS((lval_T *lp, char_u *endp, typval_T *rettv, int copy, char_u *op));
  static int tv_op __ARGS((typval_T *tv1, typval_T *tv2, char_u  *op));
-@@ -444,7 +448,7 @@
+@@ -444,7 +451,7 @@
  #endif
  static int get_env_tv __ARGS((char_u **arg, typval_T *rettv, int evaluate));
@@ -38466 +44135 @@
  static int call_func __ARGS((char_u *funcname, int len, typval_T *rettv, int argcount, typval_T *argvars, linenr_T firstline, linenr_T lastline, int *doesrange, int evaluate, dict_T *selfdict));
  static void emsg_funcname __ARGS((char *ermsg, char_u *name));
-@@ -459,6 +463,7 @@
+@@ -459,6 +466,7 @@
  static void f_append __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_argc __ARGS((typval_T *argvars, typval_T *rettv));
@@ -38474 +44143 @@
  #ifdef FEAT_FLOAT
  static void f_asin __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -474,7 +479,9 @@
+@@ -474,7 +482,9 @@
  static void f_bufnr __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_bufwinnr __ARGS((typval_T *argvars, typval_T *rettv));
@@ -38484 +44153 @@
  #ifdef FEAT_FLOAT
  static void f_ceil __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -508,6 +515,7 @@
+@@ -508,6 +518,7 @@
  static void f_eval __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_eventhandler __ARGS((typval_T *argvars, typval_T *rettv));
@@ -38492 +44161 @@
  #ifdef FEAT_FLOAT
  static void f_exp __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -552,6 +560,7 @@
+@@ -552,6 +563,7 @@
  static void f_getline __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_getmatches __ARGS((typval_T *argvars, typval_T *rettv));
@@ -38500 +44169 @@
  static void f_getqflist __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_getreg __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -719,6 +728,7 @@
+@@ -610,6 +622,7 @@
+ static void f_mapcheck __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_match __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_matchadd __ARGS((typval_T *argvars, typval_T *rettv));
++static void f_matchaddpos __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_matcharg __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_matchdelete __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_matchend __ARGS((typval_T *argvars, typval_T *rettv));
+@@ -719,6 +732,7 @@
  static void f_synstack __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_synconcealed __ARGS((typval_T *argvars, typval_T *rettv));
@@ -38508 +44185 @@
  static void f_tabpagenr __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_tabpagewinnr __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -739,6 +749,7 @@
+@@ -739,6 +753,7 @@
  static void f_type __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_undofile __ARGS((typval_T *argvars, typval_T *rettv));
@@ -38516 +44193 @@
  static void f_virtcol __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_visualmode __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -755,7 +766,7 @@
+@@ -755,7 +770,7 @@
  static void f_writefile __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_xor __ARGS((typval_T *argvars, typval_T *rettv));
@@ -38525 +44202 @@
  static int get_env_len __ARGS((char_u **arg));
  static int get_id_len __ARGS((char_u **arg));
-@@ -767,7 +778,7 @@
+@@ -767,7 +782,7 @@
  static char_u * make_expanded_name __ARGS((char_u *in_start, char_u *expr_start, char_u *expr_end, char_u *in_end));
  static int eval_isnamec __ARGS((int c));
@@ -38534 +44211 @@
  static typval_T *alloc_tv __ARGS((void));
  static typval_T *alloc_string_tv __ARGS((char_u *string));
-@@ -778,8 +789,8 @@
+@@ -778,8 +793,8 @@
  static char_u *get_tv_string __ARGS((typval_T *varp));
  static char_u *get_tv_string_buf __ARGS((typval_T *varp, char_u *buf));
@@ -38545 +44222 @@
  static void vars_clear_ext __ARGS((hashtab_T *ht, int free_val));
  static void delete_var __ARGS((hashtab_T *ht, hashitem_T *hi));
-@@ -799,7 +810,7 @@
+@@ -799,7 +814,7 @@
  static void list_func_head __ARGS((ufunc_T *fp, int indent));
  static ufunc_T *find_func __ARGS((char_u *name));
@@ -38554 +44231 @@
  static void func_do_profile __ARGS((ufunc_T *fp));
  static void prof_sort_list __ARGS((FILE *fd, ufunc_T **sorttab, int st_len, char *title, int prefer_self));
-@@ -828,6 +839,8 @@
+@@ -828,6 +843,8 @@
  static int searchpair_cmn __ARGS((typval_T *argvars, pos_T *match_pos));
  static int search_cmn __ARGS((typval_T *argvars, pos_T *match_pos, int *flagsp));
@@ -38563 +44240 @@
  
  #ifdef EBCDIC
-@@ -869,6 +882,7 @@
+@@ -869,6 +886,7 @@
             hash_add(&compat_hashtab, p->vv_di.di_key);
      }
@@ -38571 +44248 @@
  
  #ifdef EBCDIC
-@@ -915,12 +929,13 @@
+@@ -915,12 +933,13 @@
      /* autoloaded script names */
      ga_clear_strings(&ga_loaded);
@@ -38588 +44265 @@
  
      /* unreferenced lists and dicts */
-@@ -1054,7 +1069,7 @@
+@@ -1054,7 +1073,7 @@
      ga_init2(&redir_ga, (int)sizeof(char), 500);
  
@@ -38597 +44274 @@
      if (redir_endp == NULL || redir_lval->ll_name == NULL || *redir_endp != NUL)
      {
-@@ -1145,7 +1160,7 @@
+@@ -1145,7 +1164,7 @@
             /* Call get_lval() again, if it's inside a Dict or List it may
              * have changed. */
@@ -38606 +44283 @@
                 set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
             clear_lval(redir_lval);
-@@ -1848,8 +1863,9 @@
+@@ -1848,8 +1867,9 @@
         return;
      if (argend > arg && argend[-1] == '.')  /* for var.='str' */
@@ -38618 +44295 @@
         /*
          * ":let" without "=": list variables
-@@ -1878,12 +1894,14 @@
+@@ -1878,12 +1898,14 @@
      {
         op[0] = '=';
@@ -38637 +44314 @@
         if (eap->skip)
             ++emsg_skip;
-@@ -2234,7 +2252,7 @@
+@@ -2234,7 +2256,7 @@
             {
                 if (tofree != NULL)
@@ -38646 +44323 @@
                 else
                 {
-@@ -2445,7 +2463,7 @@
+@@ -2445,7 +2467,7 @@
             p = get_tv_string_chk(tv);
             if (p != NULL && op != NULL && *op == '.')
@@ -38655 +44332 @@
                 {
                     p = ptofree = concat_str(s, p);
-@@ -2469,7 +2487,7 @@
+@@ -2469,7 +2491,7 @@
      {
         lval_T  lv;
@@ -38664 +44341 @@
         {
             if (endchars != NULL && vim_strchr(endchars, *skipwhite(p)) == NULL)
-@@ -2514,18 +2532,22 @@
+@@ -2514,18 +2536,22 @@
   * "unlet" is TRUE for ":unlet": slightly different behavior when something is
   * wrong; must end in space or cmd separator.
@@ -38689 +44366 @@
  {
      char_u     *p;
-@@ -2539,6 +2561,7 @@
+@@ -2539,6 +2565,7 @@
      char_u     *key = NULL;
      int                len;
@@ -38697 +44374 @@
      /* Clear everything in "lp". */
      vim_memset(lp, 0, sizeof(lval_T));
-@@ -2586,7 +2609,7 @@
+@@ -2586,7 +2613,7 @@
  
      cc = *p;
@@ -38706 +44383 @@
         EMSG2(_(e_undefvar), lp->ll_name);
      *p = cc;
-@@ -2899,7 +2922,7 @@
+@@ -2899,7 +2926,7 @@
  
                 /* handle +=, -= and .= */
@@ -38715 +44392 @@
                     if (tv_op(&tv, rettv, op) == OK)
                         set_var(lp->ll_name, &tv, FALSE);
-@@ -3420,7 +3443,7 @@
+@@ -3420,7 +3447,7 @@
  
      /* If it is the name of a variable of type VAR_FUNC use its contents. */
@@ -38724 +44401 @@
      /* Skip white space to allow ":call func ()".  Not good, but required for
       * backward compatibility. */
-@@ -3551,7 +3574,7 @@
+@@ -3551,7 +3578,7 @@
      do
      {
@@ -38733 +44410 @@
         if (lv.ll_name == NULL)
             error = TRUE;           /* error but continue parsing */
-@@ -3704,7 +3727,7 @@
+@@ -3704,7 +3731,7 @@
             ret = FAIL;
         else
@@ -38742 +44419 @@
                 ret = FAIL;
             else
-@@ -4410,7 +4433,7 @@
+@@ -4410,7 +4437,7 @@
                     if (rettv->v_type != var2.v_type)
                         EMSG(_("E691: Can only compare List with List"));
@@ -38751 +44428 @@
                     clear_tv(&var2);
                     return FAIL;
-@@ -5103,7 +5126,8 @@
+@@ -5103,7 +5130,8 @@
                 if (evaluate)
                 {
@@ -38761 +44438 @@
                 if (**arg != NUL)
                     ++*arg;
-@@ -5147,7 +5171,7 @@
+@@ -5147,7 +5175,7 @@
             {
                 /* If "s" is the name of a variable of type VAR_FUNC
@@ -38770 +44447 @@
                 /* Invoke the function. */
                 ret = get_func_tv(s, len, rettv, arg,
-@@ -5174,7 +5198,7 @@
+@@ -5174,7 +5202,7 @@
                 }
             }
@@ -38779 +44456 @@
                 ret = OK;
         }
-@@ -5976,7 +6000,7 @@
+@@ -5976,7 +6004,7 @@
      list_T  *l;
      listitem_T *item;
@@ -38788 +44465 @@
  }
  
-@@ -6413,6 +6437,16 @@
+@@ -6413,6 +6441,16 @@
      if (ni == NULL)
         return FAIL;
@@ -38805 +44482 @@
         /* Append new item at end of list. */
         list_append(l, ni);
-@@ -6434,7 +6468,6 @@
+@@ -6434,7 +6472,6 @@
         item->li_prev = ni;
         ++l->lv_len;
@@ -38813 +44490 @@
  
  /*
-@@ -6546,9 +6579,11 @@
+@@ -6546,9 +6583,11 @@
  /*
   * Remove items "item" to "item2" from list "l".
@@ -38826 +44503 @@
      listitem_T *item;
      listitem_T *item2;
-@@ -7767,7 +7802,7 @@
+@@ -6651,6 +6690,8 @@
+        }
+ 
+        line_breakcheck();
++       if (did_echo_string_emsg)  /* recursion error, bail out */
++           break;
+     }
+ 
+     /* Allocate result buffer with its total size, avoid re-allocation and
+@@ -7425,8 +7466,10 @@
+            if (s != NULL)
+                ga_concat(&ga, s);
+            vim_free(tofree);
+-           if (s == NULL)
++           if (s == NULL || did_echo_string_emsg)
+                break;
++           line_breakcheck();
++
+        }
+     }
+     if (todo > 0)
+@@ -7584,9 +7627,16 @@
+ 
+     if (recurse >= DICT_MAXNEST)
+     {
+-       EMSG(_("E724: variable nested too deep for displaying"));
++       if (!did_echo_string_emsg)
++       {
++           /* Only give this message once for a recursive call to avoid
++            * flooding the user with errors.  And stop iterating over lists
++            * and dicts. */
++           did_echo_string_emsg = TRUE;
++           EMSG(_("E724: variable nested too deep for displaying"));
++       }
+        *tofree = NULL;
+-       return NULL;
++       return (char_u *)"{E724}";
+     }
+     ++recurse;
+ 
+@@ -7654,7 +7704,8 @@
+            *tofree = NULL;
+     }
+ 
+-    --recurse;
++    if (--recurse == 0)
++       did_echo_string_emsg = FALSE;
+     return r;
+ }
+ 
+@@ -7767,7 +7818,7 @@
   * Get the value of an environment variable.
   * "arg" is pointing to the '$'.  It is advanced to after the name.
@@ -38835 +44562 @@
      static int
  get_env_tv(arg, rettv, evaluate)
-@@ -7786,32 +7821,33 @@
+@@ -7786,32 +7837,33 @@
      len = get_env_len(arg);
      if (evaluate)
@@ -38891 +44618 @@
         rettv->vval.v_string = string;
      }
-@@ -7841,6 +7877,7 @@
+@@ -7841,6 +7893,7 @@
      {"append",         2, 2, f_append},
      {"argc",           0, 0, f_argc},
@@ -38899 +44626 @@
  #ifdef FEAT_FLOAT
      {"asin",           1, 1, f_asin},  /* WJMc */
-@@ -7860,6 +7897,7 @@
+@@ -7860,6 +7913,7 @@
      {"bufwinnr",       1, 1, f_bufwinnr},
      {"byte2line",      1, 1, f_byte2line},
@@ -38907 +44634 @@
  #ifdef FEAT_FLOAT
      {"ceil",           1, 1, f_ceil},
-@@ -7893,6 +7931,7 @@
+@@ -7893,6 +7947,7 @@
      {"eval",           1, 1, f_eval},
      {"eventhandler",   0, 0, f_eventhandler},
@@ -38915 +44642 @@
  #ifdef FEAT_FLOAT
      {"exp",            1, 1, f_exp},
-@@ -7929,6 +7968,7 @@
+@@ -7929,6 +7984,7 @@
      {"getcmdline",     0, 0, f_getcmdline},
      {"getcmdpos",      0, 0, f_getcmdpos},
@@ -38923 +44650 @@
      {"getfontname",    0, 1, f_getfontname},
      {"getfperm",       1, 1, f_getfperm},
-@@ -7941,7 +7981,7 @@
+@@ -7941,7 +7997,7 @@
      {"getpid",         0, 0, f_getpid},
      {"getpos",         1, 1, f_getpos},
@@ -38932 +44659 @@
      {"gettabvar",      2, 3, f_gettabvar},
      {"gettabwinvar",   3, 4, f_gettabwinvar},
-@@ -7949,7 +7989,7 @@
+@@ -7949,7 +8005,7 @@
      {"getwinposy",     0, 0, f_getwinposy},
      {"getwinvar",      2, 3, f_getwinvar},
@@ -38941 +44668 @@
      {"has_key",                2, 2, f_has_key},
      {"haslocaldir",    0, 0, f_haslocaldir},
-@@ -7992,7 +8032,7 @@
+@@ -7992,13 +8048,14 @@
      {"log10",          1, 1, f_log10},
  #endif
@@ -38950 +44677 @@
      {"map",            2, 2, f_map},
      {"maparg",         1, 4, f_maparg},
-@@ -8100,7 +8140,7 @@
+     {"mapcheck",       1, 3, f_mapcheck},
+     {"match",          2, 4, f_match},
+     {"matchadd",       2, 4, f_matchadd},
++    {"matchaddpos",    2, 4, f_matchaddpos},
+     {"matcharg",       1, 1, f_matcharg},
+     {"matchdelete",    1, 1, f_matchdelete},
+     {"matchend",       2, 4, f_matchend},
+@@ -8100,7 +8157,7 @@
      {"strridx",                2, 3, f_strridx},
      {"strtrans",       1, 1, f_strtrans},
@@ -38959 +44693 @@
      {"synID",          3, 3, f_synID},
      {"synIDattr",      2, 3, f_synIDattr},
-@@ -8108,6 +8148,7 @@
+@@ -8108,6 +8165,7 @@
      {"synconcealed",   2, 2, f_synconcealed},
      {"synstack",       2, 2, f_synstack},
@@ -38967 +44701 @@
      {"tabpagenr",      0, 1, f_tabpagenr},
      {"tabpagewinnr",   1, 2, f_tabpagewinnr},
-@@ -8128,6 +8169,7 @@
+@@ -8128,6 +8186,7 @@
      {"type",           1, 1, f_type},
      {"undofile",       1, 1, f_undofile},
@@ -38975 +44709 @@
      {"virtcol",                1, 1, f_virtcol},
      {"visualmode",     0, 1, f_visualmode},
-@@ -8269,16 +8311,17 @@
+@@ -8269,16 +8328,17 @@
   * name it contains, otherwise return "name".
   */
@@ -38995 +44729 @@
      if (v != NULL && v->di_tv.v_type == VAR_FUNC)
      {
-@@ -8449,33 +8492,39 @@
+@@ -8449,33 +8509,39 @@
      /* execute the function if no errors detected and executing */
      if (evaluate && error == ERROR_NONE)
@@ -39041 +44775 @@
  
             if (fp != NULL)
-@@ -8814,6 +8863,41 @@
+@@ -8814,6 +8880,41 @@
  }
  
@@ -39083 +44817 @@
   */
      static void
-@@ -9176,13 +9260,11 @@
+@@ -9176,13 +9277,11 @@
  #endif
  }
@@ -39099 +44833 @@
  #ifdef FEAT_MBYTE
      char_u     *t;
-@@ -9202,7 +9284,10 @@
+@@ -9202,7 +9301,10 @@
      {
         if (*t == NUL)          /* EOL reached */
@@ -39111 +44845 @@
      rettv->vval.v_number = (varnumber_T)(t - str);
  #else
-@@ -9211,6 +9296,28 @@
+@@ -9211,6 +9313,28 @@
  #endif
  }
@@ -39140 +44874 @@
  func_call(name, args, selfdict, rettv)
      char_u     *name;
-@@ -9731,14 +9838,17 @@
+@@ -9731,14 +9855,17 @@
      if (argvars[1].v_type == VAR_UNKNOWN)
      {
@@ -39159 +44893 @@
      else
      {
-@@ -9994,7 +10104,22 @@
+@@ -9994,7 +10121,22 @@
      typval_T   *argvars;
      typval_T   *rettv;
@@ -39183 +44917 @@
  
  /*
-@@ -10010,8 +10135,6 @@
+@@ -10010,8 +10152,6 @@
      int                n = FALSE;
      int                len = 0;
@@ -39192 +44926 @@
      if (*p == '$')                     /* environment variable */
      {
-@@ -10062,7 +10185,7 @@
+@@ -10062,7 +10202,7 @@
         {
             if (tofree != NULL)
@@ -39201 +44935 @@
             {
                 /* handle d.key, l[idx], f(expr) */
-@@ -10078,8 +10201,6 @@
+@@ -10078,8 +10218,6 @@
      }
  
@@ -39210 +44944 @@
  
  #ifdef FEAT_FLOAT
-@@ -11090,6 +11211,8 @@
+@@ -11090,6 +11228,8 @@
  {
      char_u     *p;
@@ -39219 +44953 @@
         return;
  
-@@ -11102,8 +11225,6 @@
+@@ -11102,8 +11242,6 @@
             p = ml_get_buf(buf, start, FALSE);
         else
@@ -39228 +44962 @@
      }
      else
-@@ -11234,13 +11355,14 @@
+@@ -11234,13 +11372,14 @@
             n = safe_vgetc();
         else if (get_tv_number_chk(&argvars[0], &error) == 1)
@@ -39245 +44979 @@
             continue;
         break;
-@@ -11660,6 +11782,19 @@
+@@ -11630,6 +11769,7 @@
+ #ifdef FEAT_SEARCH_EXTRA
+     dict_T     *dict;
+     matchitem_T        *cur = curwin->w_match_head;
++    int                i;
+ 
+     if (rettv_list_alloc(rettv) == OK)
+     {
+@@ -11638,8 +11778,36 @@
+            dict = dict_alloc();
+            if (dict == NULL)
+                return;
++           if (cur->match.regprog == NULL)
++           {
++               /* match added with matchaddpos() */
++               for (i = 0; i < MAXPOSMATCH; ++i)
++               {
++                   llpos_T     *llpos;
++                   char        buf[6];
++                   list_T      *l;
++
++                   llpos = &cur->pos.pos[i];
++                   if (llpos->lnum == 0)
++                       break;
++                   l = list_alloc();
++                   if (l == NULL)
++                       break;
++                   list_append_number(l, (varnumber_T)llpos->lnum);
++                   if (llpos->col > 0)
++                   {
++                       list_append_number(l, (varnumber_T)llpos->col);
++                       list_append_number(l, (varnumber_T)llpos->len);
++                   }
++                   sprintf(buf, "pos%d", i + 1);
++                   dict_add_list(dict, buf, l);
++               }
++           }
++           else
++           {
++               dict_add_nr_str(dict, "pattern", 0L, cur->pattern);
++           }
+            dict_add_nr_str(dict, "group", 0L, syn_id2name(cur->hlg_id));
+-           dict_add_nr_str(dict, "pattern", 0L, cur->pattern);
+            dict_add_nr_str(dict, "priority", (long)cur->priority, NULL);
+            dict_add_nr_str(dict, "id", (long)cur->id, NULL);
+            list_append_dict(rettv->vval.v_list, dict);
+@@ -11660,6 +11828,19 @@
      rettv->vval.v_number = mch_get_pid();
  }
@@ -39265 +45045 @@
   * "getpos(string)" function
   */
-@@ -11668,6 +11803,15 @@
+@@ -11668,6 +11849,15 @@
      typval_T   *argvars;
      typval_T   *rettv;
@@ -39281 +45061 @@
      list_T     *l;
      int                fnum = -1;
-@@ -11675,7 +11819,10 @@
+@@ -11675,7 +11865,10 @@
      if (rettv_list_alloc(rettv) == OK)
      {
@@ -39293 +45073 @@
             list_append_number(l, (varnumber_T)fnum);
         else
-@@ -11690,6 +11837,8 @@
+@@ -11690,6 +11883,8 @@
                                 (fp != NULL) ? (varnumber_T)fp->coladd :
  #endif
@@ -39302 +45082 @@
      else
         rettv->vval.v_number = FALSE;
-@@ -11734,6 +11883,7 @@
+@@ -11734,6 +11929,7 @@
      char_u     *strregname;
      int                regname;
@@ -39310 +45090 @@
  
      if (argvars[0].v_type != VAR_UNKNOWN)
-@@ -11741,17 +11891,34 @@
+@@ -11741,17 +11937,34 @@
         strregname = get_tv_string_chk(&argvars[0]);
         error = strregname == NULL;
@@ -39348 +45128 @@
  
  /*
-@@ -11791,12 +11958,10 @@
+@@ -11791,12 +12004,10 @@
      {
         case MLINE: buf[0] = 'V'; break;
@@ -39361 +45141 @@
      rettv->v_type = VAR_STRING;
      rettv->vval.v_string = vim_strsave(buf);
-@@ -12056,18 +12221,37 @@
+@@ -12056,18 +12267,37 @@
      char_u     buf1[NUMBUFLEN];
      char_u     *file = get_tv_string_buf_chk(&argvars[1], buf1);
@@ -39406 +45186 @@
  
  /*
-@@ -12135,6 +12319,9 @@
+@@ -12135,6 +12365,9 @@
  #ifndef CASE_INSENSITIVE_FILENAME
         "fname_case",
@@ -39416 +45196 @@
         "arabic",
  #endif
-@@ -12507,9 +12694,7 @@
+@@ -12507,9 +12740,7 @@
  #ifdef FEAT_VIRTUALEDIT
         "virtualedit",
@@ -39426 +45206 @@
         "visualextra",
  #endif
-@@ -12538,7 +12723,12 @@
+@@ -12538,7 +12769,12 @@
         "xfontset",
  #endif
@@ -39440 +45220 @@
  #ifdef USE_XSMP
         "xsmp",
-@@ -12569,7 +12759,26 @@
+@@ -12569,7 +12805,26 @@
      if (n == FALSE)
      {
@@ -39468 +45248 @@
             n = (starting != 0);
  #ifdef FEAT_MBYTE
-@@ -13045,9 +13254,18 @@
+@@ -13045,9 +13300,18 @@
         }
  
@@ -39487 +45267 @@
                 && argvars[1].v_type != VAR_UNKNOWN
                 && argvars[2].v_type != VAR_UNKNOWN)
-@@ -13298,8 +13516,8 @@
+@@ -13298,8 +13562,8 @@
      dictitem_T *di;
  
@@ -39498 +45278 @@
      {
         if (*end != NUL)
-@@ -13312,7 +13530,7 @@
+@@ -13312,7 +13576,7 @@
                     rettv->vval.v_number = 1;       /* always locked */
                 else
@@ -39507 +45287 @@
                     {
                         /* Consider a variable locked when:
-@@ -13846,6 +14064,7 @@
+@@ -13846,6 +14110,7 @@
      int                type;
  {
@@ -39515 +45295 @@
      char_u     *pat;
      regmatch_T regmatch;
-@@ -13885,7 +14104,10 @@
+@@ -13885,7 +14150,10 @@
         li = l->lv_first;
      }
@@ -39526 +45306 @@
      pat = get_tv_string_buf_chk(&argvars[1], patbuf);
      if (pat == NULL)
-@@ -13909,7 +14131,7 @@
+@@ -13909,7 +14177,7 @@
         {
             if (start < 0)
@@ -39535 +45315 @@
             /* When "count" argument is there ignore matches before "start",
              * otherwise skip part of the string.  Differs when pattern is "^"
-@@ -13917,7 +14139,10 @@
+@@ -13917,7 +14185,10 @@
             if (argvars[3].v_type != VAR_UNKNOWN)
                 startcol = start;
@@ -39546 +45326 @@
  
         if (argvars[3].v_type != VAR_UNKNOWN)
-@@ -13967,6 +14192,12 @@
+@@ -13967,6 +14238,12 @@
  #else
                 startcol = (colnr_T)(regmatch.startp[0] + 1 - str);
@@ -39559 +45339 @@
         }
  
-@@ -14095,8 +14326,8 @@
+@@ -14067,7 +14344,58 @@
+        return;
+     }
+ 
+-    rettv->vval.v_number = match_add(curwin, grp, pat, prio, id);
++    rettv->vval.v_number = match_add(curwin, grp, pat, prio, id, NULL);
++#endif
++}
++
++/*
++ * "matchaddpos()" function
++ */
++    static void
++f_matchaddpos(argvars, rettv)
++    typval_T   *argvars UNUSED;
++    typval_T   *rettv UNUSED;
++{
++#ifdef FEAT_SEARCH_EXTRA
++    char_u     buf[NUMBUFLEN];
++    char_u     *group;
++    int                prio = 10;
++    int                id = -1;
++    int                error = FALSE;
++    list_T     *l;
++
++    rettv->vval.v_number = -1;
++
++    group = get_tv_string_buf_chk(&argvars[0], buf);
++    if (group == NULL)
++       return;
++
++    if (argvars[1].v_type != VAR_LIST)
++    {
++       EMSG2(_(e_listarg), "matchaddpos()");
++       return;
++    }
++    l = argvars[1].vval.v_list;
++    if (l == NULL)
++       return;
++
++    if (argvars[2].v_type != VAR_UNKNOWN)
++    {
++       prio = get_tv_number_chk(&argvars[2], &error);
++       if (argvars[3].v_type != VAR_UNKNOWN)
++           id = get_tv_number_chk(&argvars[3], &error);
++    }
++    if (error == TRUE)
++       return;
++
++    /* id == 3 is ok because matchaddpos() is supposed to substitute :3match */
++    if (id == 1 || id == 2)
++    {
++       EMSGN("E798: ID is reserved for \":match\": %ld", id);
++       return;
++    }
++
++    rettv->vval.v_number = match_add(curwin, group, NULL, prio, id, l);
+ #endif
+ }
+ 
+@@ -14095,8 +14423,8 @@
             }
             else
@@ -39570 +45410 @@
         }
  #endif
-@@ -14292,14 +14523,23 @@
+@@ -14292,14 +14620,23 @@
         return;
  
@@ -39600 +45440 @@
  #endif
  
-@@ -14316,7 +14556,6 @@
+@@ -14316,7 +14653,6 @@
      buf[1] = NUL;
      buf[2] = NUL;
@@ -39608 +45448 @@
      {
         if (VIsual_select)
-@@ -14324,9 +14563,7 @@
+@@ -14324,9 +14660,7 @@
         else
             buf[0] = VIsual_mode;
@@ -39619 +45459 @@
      {
         buf[0] = 'r';
-@@ -15289,7 +15526,7 @@
+@@ -15289,7 +15623,7 @@
             if (argvars[2].v_type == VAR_UNKNOWN)
             {
@@ -39628 +45468 @@
                 vim_free(item);
             }
-@@ -15315,7 +15552,7 @@
+@@ -15315,7 +15649,7 @@
                         EMSG(_(e_invrange));
                     else
@@ -39637 +45477 @@
                         {
                             l = rettv->vval.v_list;
-@@ -16583,12 +16820,13 @@
+@@ -16564,7 +16898,7 @@
+            match_add(curwin, get_dict_string(d, (char_u *)"group", FALSE),
+                    get_dict_string(d, (char_u *)"pattern", FALSE),
+                    (int)get_dict_number(d, (char_u *)"priority"),
+-                   (int)get_dict_number(d, (char_u *)"id"));
++                   (int)get_dict_number(d, (char_u *)"id"), NULL);
+            li = li->li_next;
+        }
+        rettv->vval.v_number = 0;
+@@ -16583,12 +16917,13 @@
      pos_T      pos;
      int                fnum;
@@ -39652 +45501 @@
             if (--pos.col < 0)
                 pos.col = 0;
-@@ -16598,6 +16836,8 @@
+@@ -16598,6 +16933,8 @@
                 if (fnum == curbuf->b_fnum)
                 {
@@ -39661 +45510 @@
                     rettv->vval.v_number = 0;
                 }
-@@ -16655,8 +16895,6 @@
+@@ -16655,8 +16992,6 @@
      regname = *strregname;
      if (regname == 0 || regname == '@')
@@ -39670 +45519 @@
      if (argvars[2].v_type != VAR_UNKNOWN)
      {
-@@ -16675,7 +16913,6 @@
+@@ -16675,7 +17010,6 @@
                 case 'V': case 'l':     /* line-wise selection */
                     yank_type = MLINE;
@@ -39678 +45527 @@
                     yank_type = MBLOCK;
                     if (VIM_ISDIGIT(stropt[1]))
-@@ -16685,14 +16922,62 @@
+@@ -16685,20 +17019,68 @@
                         --stropt;
                     }
@@ -39688 +45537 @@
 -    strval = get_tv_string_chk(&argvars[1]);
 -    if (strval != NULL)
+-       write_reg_contents_ex(regname, strval, -1,
+-                                               append, yank_type, block_len);
+-    rettv->vval.v_number = 0;
+-}
 +    if (argvars[1].v_type == VAR_LIST)
 +    {
@@ -39697 +45550 @@
 +       int             len = argvars[1].vval.v_list->lv_len;
 +       listitem_T      *li;
-+
+ 
+-/*
+- * "settabvar()" function
+- */
 +       /* First half: use for pointers to result lines; second half: use for
 +        * pointers to allocated copies. */
@@ -39738 +45594 @@
 +       if (strval == NULL)
 +           return;
-        write_reg_contents_ex(regname, strval, -1,
-                                                append, yank_type, block_len);
++       write_reg_contents_ex(regname, strval, -1,
++                                               append, yank_type, block_len);
 +    }
-     rettv->vval.v_number = 0;
- }
- 
-@@ -16869,7 +17154,7 @@
++    rettv->vval.v_number = 0;
++}
++
++/*
++ * "settabvar()" function
++ */
+     static void
+ f_settabvar(argvars, rettv)
+     typval_T   *argvars;
+@@ -16869,7 +17251,7 @@
      typval_T   *rettv;
  {
@@ -39753 +45615 @@
  }
  
-@@ -16881,7 +17166,7 @@
+@@ -16881,7 +17263,7 @@
      typval_T   *argvars UNUSED;
      typval_T   *rettv;
@@ -39762 +45624 @@
  
  /*
-@@ -16951,10 +17236,11 @@
+@@ -16947,14 +17329,24 @@
+ #endif
+        item_compare2 __ARGS((const void *s1, const void *s2));
+ 
++/* struct used in the array that's given to qsort() */
++typedef struct
++{
++    listitem_T *item;
++    int                idx;
++} sortItem_T;
++
+ static int     item_compare_ic;
++static int     item_compare_numeric;
  static char_u  *item_compare_func;
  static dict_T  *item_compare_selfdict;
  static int     item_compare_func_err;
++static int     item_compare_keep_zero;
 +static void    do_sort_uniq __ARGS((typval_T *argvars, typval_T *rettv, int sort));
  #define ITEM_COMPARE_FAIL 999
@@ -39775 +45650 @@
      static int
  #ifdef __BORLANDC__
-@@ -17028,9 +17314,10 @@
+@@ -16964,22 +17356,41 @@
+     const void *s1;
+     const void *s2;
+ {
++    sortItem_T  *si1, *si2;
+     char_u     *p1, *p2;
+     char_u     *tofree1, *tofree2;
+     int                res;
+     char_u     numbuf1[NUMBUFLEN];
+     char_u     numbuf2[NUMBUFLEN];
+ 
+-    p1 = tv2string(&(*(listitem_T **)s1)->li_tv, &tofree1, numbuf1, 0);
+-    p2 = tv2string(&(*(listitem_T **)s2)->li_tv, &tofree2, numbuf2, 0);
++    si1 = (sortItem_T *)s1;
++    si2 = (sortItem_T *)s2;
++    p1 = tv2string(&si1->item->li_tv, &tofree1, numbuf1, 0);
++    p2 = tv2string(&si2->item->li_tv, &tofree2, numbuf2, 0);
+     if (p1 == NULL)
+        p1 = (char_u *)"";
+     if (p2 == NULL)
+        p2 = (char_u *)"";
+-    if (item_compare_ic)
+-       res = STRICMP(p1, p2);
++    if (!item_compare_numeric)
++    {
++       if (item_compare_ic)
++           res = STRICMP(p1, p2);
++       else
++           res = STRCMP(p1, p2);
++    }
+     else
+-       res = STRCMP(p1, p2);
++    {
++       double n1, n2;
++       n1 = strtod((char *)p1, (char **)&p1);
++       n2 = strtod((char *)p2, (char **)&p2);
++       res = n1 == n2 ? 0 : n1 > n2 ? 1 : -1;
++    }
++
++    /* When the result would be zero, compare the pointers themselves.  Makes
++     * the sort stable. */
++    if (res == 0 && !item_compare_keep_zero)
++       res = si1->idx > si2->idx ? 1 : -1;
++
+     vim_free(tofree1);
+     vim_free(tofree2);
+     return res;
+@@ -16993,6 +17404,7 @@
+     const void *s1;
+     const void *s2;
+ {
++    sortItem_T  *si1, *si2;
+     int                res;
+     typval_T   rettv;
+     typval_T   argv[3];
+@@ -17002,10 +17414,13 @@
+     if (item_compare_func_err)
+        return 0;
+ 
+-    /* copy the values.  This is needed to be able to set v_lock to VAR_FIXED
++    si1 = (sortItem_T *)s1;
++    si2 = (sortItem_T *)s2;
++
++    /* Copy the values.  This is needed to be able to set v_lock to VAR_FIXED
+      * in the copy without changing the original list items. */
+-    copy_tv(&(*(listitem_T **)s1)->li_tv, &argv[0]);
+-    copy_tv(&(*(listitem_T **)s2)->li_tv, &argv[1]);
++    copy_tv(&si1->item->li_tv, &argv[0]);
++    copy_tv(&si2->item->li_tv, &argv[1]);
+ 
+     rettv.v_type = VAR_UNKNOWN;                /* clear_tv() uses this */
+     res = call_func(item_compare_func, (int)STRLEN(item_compare_func),
+@@ -17021,6 +17436,12 @@
+     if (item_compare_func_err)
+        res = ITEM_COMPARE_FAIL;  /* return value has wrong type */
+     clear_tv(&rettv);
++
++    /* When the result would be zero, compare the pointers themselves.  Makes
++     * the sort stable. */
++    if (res == 0 && !item_compare_keep_zero)
++       res = si1->idx > si2->idx ? 1 : -1;
++
+     return res;
+ }
+ 
+@@ -17028,23 +17449,24 @@
   * "sort({list})" function
   */
@@ -39787 +45747 @@
      list_T     *l;
      listitem_T *li;
-@@ -17039,12 +17326,12 @@
+-    listitem_T **ptrs;
++    sortItem_T *ptrs;
+     long       len;
      long       i;
  
@@ -39802 +45764 @@
         rettv->vval.v_list = l;
         rettv->v_type = VAR_LIST;
-@@ -17091,29 +17378,72 @@
-        ptrs = (listitem_T **)alloc((int)(len * sizeof(listitem_T *)));
+@@ -17055,6 +17477,7 @@
+            return;     /* short list sorts pretty quickly */
+ 
+        item_compare_ic = FALSE;
++       item_compare_numeric = FALSE;
+        item_compare_func = NULL;
+        item_compare_selfdict = NULL;
+        if (argvars[1].v_type != VAR_UNKNOWN)
+@@ -17073,6 +17496,19 @@
+                    item_compare_ic = TRUE;
+                else
+                    item_compare_func = get_tv_string(&argvars[1]);
++               if (item_compare_func != NULL)
++               {
++                   if (STRCMP(item_compare_func, "n") == 0)
++                   {
++                       item_compare_func = NULL;
++                       item_compare_numeric = TRUE;
++                   }
++                   else if (STRCMP(item_compare_func, "i") == 0)
++                   {
++                       item_compare_func = NULL;
++                       item_compare_ic = TRUE;
++                   }
++               }
+            }
+ 
+            if (argvars[2].v_type != VAR_UNKNOWN)
+@@ -17088,32 +17524,81 @@
+        }
+ 
+        /* Make an array with each entry pointing to an item in the List. */
+-       ptrs = (listitem_T **)alloc((int)(len * sizeof(listitem_T *)));
++       ptrs = (sortItem_T *)alloc((int)(len * sizeof(sortItem_T)));
         if (ptrs == NULL)
             return;
--       i = 0;
++
+        i = 0;
 -       for (li = l->lv_first; li != NULL; li = li->li_next)
 -           ptrs[i++] = li;
++       if (sort)
++       {
++           /* sort(): ptrs will be the list to sort */
++           for (li = l->lv_first; li != NULL; li = li->li_next)
++           {
++               ptrs[i].item = li;
++               ptrs[i].idx = i;
++               ++i;
++           }
  
 -       item_compare_func_err = FALSE;
@@ -39814 +45818 @@
 -       if (item_compare_func != NULL
 -               && item_compare2((void *)&ptrs[0], (void *)&ptrs[1])
-+       i = 0;
-+       if (sort)
-+       {
-+           /* sort(): ptrs will be the list to sort */
-+           for (li = l->lv_first; li != NULL; li = li->li_next)
-+               ptrs[i++] = li;
-+
 +           item_compare_func_err = FALSE;
++           item_compare_keep_zero = FALSE;
 +           /* test the compare function */
 +           if (item_compare_func != NULL
@@ -39831 +45829 @@
 +           {
 +               /* Sort the array with item pointers. */
-+               qsort((void *)ptrs, (size_t)len, sizeof(listitem_T *),
++               qsort((void *)ptrs, (size_t)len, sizeof(sortItem_T),
 +                   item_compare_func == NULL ? item_compare : item_compare2);
 +
@@ -39840 +45838 @@
 +                   l->lv_len = 0;
 +                   for (i = 0; i < len; ++i)
-+                       list_append(l, ptrs[i]);
++                       list_append(l, ptrs[i].item);
 +               }
 +           }
@@ -39853 +45851 @@
 +           /* f_uniq(): ptrs will be a stack of items to remove */
 +           item_compare_func_err = FALSE;
++           item_compare_keep_zero = TRUE;
 +           item_compare_func_ptr = item_compare_func
 +                                              ? item_compare2 : item_compare;
@@ -39861 +45860 @@
 +               if (item_compare_func_ptr((void *)&li, (void *)&li->li_next)
 +                                                                        == 0)
-+                   ptrs[i++] = li;
++                   ptrs[i++].item = li;
 +               if (item_compare_func_err)
 +               {
@@ -39878 +45877 @@
 +               while (--i >= 0)
 +               {
-+                   li = ptrs[i]->li_next;
-+                   ptrs[i]->li_next = li->li_next;
++                   li = ptrs[i].item->li_next;
++                   ptrs[i].item->li_next = li->li_next;
 +                   if (li->li_next != NULL)
-+                       li->li_next->li_prev = ptrs[i];
++                       li->li_next->li_prev = ptrs[i].item;
 +                   else
-+                       l->lv_last = ptrs[i];
++                       l->lv_last = ptrs[i].item;
 +                   list_fix_watch(l, li);
 +                   listitem_free(li);
@@ -39891 +45890 @@
         }
  
-@@ -17122,6 +17452,28 @@
+@@ -17122,6 +17607,28 @@
  }
  
@@ -39920 +45919 @@
   */
      static void
-@@ -17709,9 +18061,29 @@
+@@ -17709,9 +18216,29 @@
      typval_T   *argvars;
      typval_T   *rettv;
@@ -39953 +45952 @@
  
  /*
-@@ -17979,13 +18351,11 @@
+@@ -17979,13 +18506,11 @@
  #endif
  }
@@ -39969 +45968 @@
      char_u     *res = NULL;
      char_u     *p;
-@@ -17993,9 +18363,12 @@
+@@ -17993,9 +18518,12 @@
      char_u     buf[NUMBUFLEN];
      int                err = FALSE;
@@ -39983 +45982 @@
      if (argvars[1].v_type != VAR_UNKNOWN)
      {
-@@ -18006,74 +18379,159 @@
+@@ -18006,74 +18534,159 @@
         if ((infile = vim_tempname('i')) == NULL)
         {
@@ -40050 +46049 @@
 +       if (res == NULL)
 +           goto errret;
-+
+ 
+-       for (s = res; *s; ++s)
 +       list = list_alloc();
 +       if (list == NULL)
 +           goto errret;
- 
--       for (s = res; *s; ++s)
++
 +       for (i = 0; i < len; ++i)
         {
@@ -40177 +46176 @@
  
  /*
-@@ -18688,7 +19146,6 @@
+@@ -18688,7 +19301,6 @@
      typval_T   *argvars UNUSED;
      typval_T   *rettv UNUSED;
@@ -40185 +46184 @@
  
      rettv->v_type = VAR_STRING;
-@@ -18699,7 +19156,6 @@
+@@ -18699,7 +19311,6 @@
      /* A non-zero number or non-empty string argument: reset mode. */
      if (non_zero_arg(&argvars[0]))
@@ -40193 +46192 @@
  
  /*
-@@ -18839,20 +19295,30 @@
+@@ -18839,20 +19450,30 @@
         EMSG(_(e_invarg));
      else
@@ -40233 +46232 @@
         check_cursor();
         win_new_height(curwin, curwin->w_height);
-@@ -18923,6 +19389,49 @@
+@@ -18923,6 +19544,49 @@
  }
  
@@ -40283 +46282 @@
   */
      static void
-@@ -18933,10 +19442,7 @@
+@@ -18933,10 +19597,7 @@
      int                binary = FALSE;
      char_u     *fname;
@@ -40294 +46293 @@
      if (check_restricted() || check_secure())
         return;
-@@ -18963,33 +19469,8 @@
+@@ -18963,33 +19624,8 @@
      }
      else
@@ -40330 +46329 @@
      }
  
-@@ -19073,14 +19554,12 @@
+@@ -19073,14 +19709,12 @@
         return NULL;
      if (name[0] == '.')                                /* cursor */
@@ -40345 +46344 @@
      {
         pp = getmark_buf_fnum(curbuf, name[1], FALSE, fnum);
-@@ -19135,21 +19614,22 @@
+@@ -19135,21 +19769,22 @@
   * validity.
   */
@@ -40372 +46371 @@
  
      if (fnump != NULL)
-@@ -19173,13 +19653,16 @@
+@@ -19173,13 +19808,16 @@
      posp->col = n;
  
@@ -40390 +46389 @@
  }
  
-@@ -19719,11 +20202,12 @@
+@@ -19719,11 +20357,12 @@
   * Return OK or FAIL.
   */
@@ -40404 +46403 @@
      int                ret = OK;
      typval_T   *tv = NULL;
-@@ -19750,7 +20234,7 @@
+@@ -19750,7 +20389,7 @@
       */
      else
@@ -40413 +46412 @@
             tv = &v->di_tv;
      }
-@@ -19790,24 +20274,30 @@
+@@ -19790,24 +20429,30 @@
      while (ret == OK
             && (**arg == '['
@@ -40450 +46449 @@
             /* Stop the expression evaluation when immediately aborting on
              * error, or when an interrupt occurred or an exception was thrown
-@@ -20094,6 +20584,9 @@
+@@ -20094,6 +20739,9 @@
      return res != NULL ? res : (char_u *)"";
  }
@@ -40460 +46459 @@
  get_tv_string_chk(varp)
      typval_T   *varp;
-@@ -20146,9 +20639,10 @@
+@@ -20146,9 +20794,10 @@
   * hashtab_T used.
   */
@@ -40472 +46471 @@
      char_u     *varname;
      hashtab_T  *ht;
-@@ -20158,7 +20652,7 @@
+@@ -20158,7 +20807,7 @@
         *htp = ht;
      if (ht == NULL)
@@ -40481 +46480 @@
  
  /*
-@@ -20166,11 +20660,11 @@
+@@ -20166,11 +20815,11 @@
   * Returns NULL if not found.
   */
@@ -40495 +46494 @@
      hashitem_T *hi;
  
-@@ -20202,7 +20696,7 @@
+@@ -20202,7 +20851,7 @@
          * worked find the variable again.  Don't auto-load a script if it was
          * loaded already, otherwise it would be loaded every time when
@@ -40504 +46503 @@
             /* Note: script_autoload() may make "hi" invalid. It must either
              * be obtained again or not used. */
-@@ -20282,7 +20776,7 @@
+@@ -20282,7 +20931,7 @@
  {
      dictitem_T *v;
@@ -40513 +46512 @@
         return NULL;
      return get_tv_string(&v->di_tv);
-@@ -20560,6 +21054,13 @@
+@@ -20560,6 +21209,13 @@
                 v->di_tv.vval.v_number = get_tv_number(tv);
                 if (STRCMP(varname, "searchforward") == 0)
@@ -40527 +46526 @@
             return;
         }
-@@ -20650,7 +21151,8 @@
+@@ -20650,7 +21306,8 @@
      char_u *name;    /* points to start of variable name */
      int    new_var;  /* TRUE when creating the variable */
@@ -40537 +46536 @@
                                                      ? name[2] : name[0]))
      {
-@@ -21206,6 +21708,8 @@
+@@ -21206,6 +21863,8 @@
       * dict.func    existing dict entry that's not a Funcref
       *             "name" == NULL, "fudi.fd_dict" set,
@@ -40546 +46545 @@
      p = eap->arg;
      name = trans_function_name(&p, eap->skip, 0, &fudi);
-@@ -21361,6 +21865,7 @@
+@@ -21361,6 +22020,7 @@
                 if (STRCMP(((char_u **)(newargs.ga_data))[i], arg) == 0)
                 {
@@ -40554 +46553 @@
                 }
  
-@@ -21604,7 +22109,7 @@
+@@ -21604,7 +22264,7 @@
       */
      if (fudi.fd_dict == NULL)
@@ -40563 +46562 @@
         {
             emsg_funcname(N_("E707: Function name conflicts with variable: %s"),
-@@ -21762,8 +22267,9 @@
+@@ -21762,8 +22422,9 @@
   * Also handles a Funcref in a List or Dictionary.
   * Returns the function name in allocated memory, or NULL for failure.
@@ -40575 +46574 @@
   */
      static char_u *
-@@ -21801,7 +22307,8 @@
+@@ -21801,7 +22462,8 @@
      if (lead > 2)
         start += lead;
@@ -40585 +46584 @@
      if (end == start)
      {
-@@ -21863,14 +22370,14 @@
+@@ -21863,14 +22525,14 @@
      if (lv.ll_exp_name != NULL)
      {
@@ -40602 +46601 @@
             name = NULL;
      }
-@@ -21878,6 +22385,14 @@
+@@ -21878,6 +22540,14 @@
      {
         name = vim_strsave(name);
@@ -40617 +46616 @@
      }
  
-@@ -21896,7 +22411,8 @@
+@@ -21896,7 +22566,8 @@
      }
      else
@@ -40627 +46626 @@
         len = (int)(end - lv.ll_name);
      }
-@@ -21924,11 +22440,23 @@
+@@ -21924,11 +22595,23 @@
             lead += (int)STRLEN(sid_buf);
         }
@@ -40653 +46652 @@
      if (name != NULL)
      {
-@@ -21941,7 +22469,7 @@
+@@ -21941,7 +22624,7 @@
                 STRCPY(name + 3, sid_buf);
         }
@@ -40662 +46661 @@
      *pp = end;
  
-@@ -22062,7 +22590,7 @@
+@@ -22062,7 +22745,7 @@
  translated_function_exists(name)
      char_u     *name;
@@ -40671 +46670 @@
      return find_func(name) != NULL;
  }
-@@ -22078,7 +22606,8 @@
+@@ -22078,7 +22761,8 @@
      char_u  *p;
      int            n = FALSE;
@@ -40681 +46680 @@
  
      /* Only accept "funcname", "funcname ", "funcname (..." and
-@@ -22109,14 +22638,20 @@
+@@ -22109,14 +22793,20 @@
  
  /*
@@ -40706 +46705 @@
  
  #if defined(FEAT_PROFILE) || defined(PROTO)
-@@ -22325,10 +22860,6 @@
+@@ -22325,10 +23015,6 @@
      int                ret = FALSE;
      int                i;
@@ -40717 +46716 @@
      p = vim_strchr(name, AUTOLOAD_CHAR);
      if (p == NULL || p == name)
-@@ -24260,6 +24791,17 @@
+@@ -22772,7 +23458,10 @@
+                        msg_outnum((long)argvars[i].vval.v_number);
+                    else
+                    {
++                       /* Do not want errors such as E724 here. */
++                       ++emsg_off;
+                        s = tv2string(&argvars[i], &tofree, numbuf2, 0);
++                       --emsg_off;
+                        if (s != NULL)
+                        {
+                            if (vim_strsize(s) > MSG_BUF_CLEN)
+@@ -22864,8 +23553,10 @@
+ 
+            /* The value may be very long.  Skip the middle part, so that we
+             * have some idea how it starts and ends. smsg() would always
+-            * truncate it at the end. */
++            * truncate it at the end. Don't want errors such as E724 here. */
++           ++emsg_off;
+            s = tv2string(fc->rettv, &tofree, numbuf2, 0);
++           --emsg_off;
+            if (s != NULL)
+            {
+                if (vim_strsize(s) > MSG_BUF_CLEN)
+@@ -24260,6 +24951,17 @@
         }
      }
@@ -40735 +46757 @@
  }
  
-@@ -24283,6 +24825,7 @@
+@@ -24283,6 +24985,7 @@
      garray_T   ga;
      char_u     *ret;
@@ -40743 +46765 @@
      /* Make 'cpoptions' empty, so that the 'l' flag doesn't work here */
      save_cpo = p_cpo;
-@@ -24299,6 +24842,19 @@
+@@ -24299,6 +25002,22 @@
         tail = str;
         while (vim_regexec_nl(&regmatch, str, (colnr_T)(tail - str)))
@@ -40753 +46775 @@
 +               {
 +                   /* avoid getting stuck on a match with an empty string */
-+                   *((char_u *)ga.ga_data + ga.ga_len) = *tail++;
-+                   ++ga.ga_len;
++                   i = MB_PTR2LEN(tail);
++                   mch_memmove((char_u *)ga.ga_data + ga.ga_len, tail,
++                                                                  (size_t)i);
++                   ga.ga_len += i;
++                   tail += i;
 +                   continue;
 +               }
@@ -40763 +46788 @@
              * Get some space for a temporary buffer to do the substitution
              * into.  It will contain:
-@@ -24321,20 +24877,9 @@
+@@ -24321,20 +25040,9 @@
             (void)vim_regsub(&regmatch, sub, (char_u *)ga.ga_data
                                           + ga.ga_len + i, TRUE, TRUE, FALSE);
@@ -40789 +46814 @@
 diff -Naur vim74.orig/src/ex_cmds.c vim74/src/ex_cmds.c
 --- vim74.orig/src/ex_cmds.c    2013-08-07 13:15:51.000000000 +0000
-+++ vim74/src/ex_cmds.c 2014-06-01 00:43:14.247480031 +0000
++++ vim74/src/ex_cmds.c 2014-07-21 23:33:39.466801040 +0000
 @@ -1012,7 +1012,18 @@
  
@@ -40853 +46878 @@
       */
      STRCPY(buf, cmd);
-@@ -3253,21 +3280,21 @@
+@@ -1977,11 +2004,14 @@
+     {
+        fclose(fp_in);
+ 
+-       /*
+-        * In case of an error keep the original viminfo file.
+-        * Otherwise rename the newly written file.
+-        */
+-       if (viminfo_errcnt || vim_rename(tempname, fname) == -1)
++       /* In case of an error keep the original viminfo file.  Otherwise
++        * rename the newly written file.  Give an error if that fails. */
++       if (viminfo_errcnt == 0 && vim_rename(tempname, fname) == -1)
++       {
++           ++viminfo_errcnt;
++           EMSG2(_("E886: Can't rename viminfo file to %s!"), fname);
++       }
++       if (viminfo_errcnt > 0)
+            mch_remove(tempname);
+ 
+ #ifdef WIN3264
+@@ -3253,21 +3283,21 @@
      if (  ((!other_file && !(flags & ECMD_OLDBUF))
             || (curbuf->b_nwindows == 1
@@ -40879 +46924 @@
  #ifdef FEAT_AUTOCMD
      if ((command != NULL || newlnum > (linenr_T)0)
-@@ -3332,6 +3359,12 @@
+@@ -3332,6 +3362,12 @@
  #endif
             buf = buflist_new(ffname, sfname, 0L,
@@ -40892 +46937 @@
         if (buf == NULL)
             goto theend;
-@@ -4097,12 +4130,12 @@
+@@ -4097,12 +4133,12 @@
       * 'scroll' */
      if (eap->forceit)
@@ -40908 +46953 @@
         bigness = 1;
  
-@@ -4298,7 +4331,7 @@
+@@ -4298,7 +4334,7 @@
      pos_T      old_cursor = curwin->w_cursor;
      int                start_nsubs;
@@ -40917 +46962 @@
  
      cmd = eap->arg;
-@@ -4409,6 +4442,31 @@
+@@ -4409,6 +4445,31 @@
         endcolumn = (curwin->w_curswant == MAXCOL);
      }
@@ -40949 +46994 @@
       * Find trailing options.  When '&' is used, keep old options.
       */
-@@ -4740,11 +4798,17 @@
+@@ -4740,11 +4801,17 @@
                             char_u      *resp;
                             colnr_T     sc, ec;
@@ -40968 +47013 @@
                             for (i = 0; i < (long)sc; ++i)
                                 msg_putchar(' ');
-@@ -5928,14 +5992,18 @@
+@@ -5928,14 +5995,18 @@
                                "?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
                                "/\\?", "/\\z(\\)", "\\=", ":s\\=",
@@ -40989 +47034 @@
  
      d = IObuff;                    /* assume IObuff is long enough! */
-@@ -5974,7 +6042,7 @@
+@@ -5974,7 +6045,7 @@
           /* Replace:
            * "[:...:]" with "\[:...:]"
@@ -40998 +47043 @@
             if ((arg[0] == '[' && (arg[1] == ':'
                          || (arg[1] == '+' && arg[2] == '+')))
-@@ -7223,7 +7291,10 @@
+@@ -7223,7 +7294,10 @@
             else
                 /* ":sign place {id} file={fname}": change sign type */
@@ -41010 +47055 @@
         else
             EMSG(_(e_invarg));
-@@ -7658,7 +7729,7 @@
+@@ -7658,7 +7732,7 @@
  # ifdef FEAT_WINDOWS
             ++emsg_off;
@@ -41021 +47066 @@
 diff -Naur vim74.orig/src/ex_cmds.h vim74/src/ex_cmds.h
 --- vim74.orig/src/ex_cmds.h    2013-06-08 13:08:20.000000000 +0000
-+++ vim74/src/ex_cmds.h 2014-06-01 00:43:14.250813355 +0000
++++ vim74/src/ex_cmds.h 2014-07-21 23:33:39.473467689 +0000
 @@ -477,6 +477,8 @@
                         NEEDARG|EXTRA|NOTRLCOM),
@@ -41059 +47104 @@
 diff -Naur vim74.orig/src/ex_cmds2.c vim74/src/ex_cmds2.c
 --- vim74.orig/src/ex_cmds2.c   2013-06-28 18:14:53.000000000 +0000
-+++ vim74/src/ex_cmds2.c        2014-06-01 00:43:14.284146604 +0000
++++ vim74/src/ex_cmds2.c        2014-07-21 23:33:39.490134312 +0000
 @@ -1436,20 +1436,20 @@
  }
@@ -41166 +47211 @@
 diff -Naur vim74.orig/src/ex_docmd.c vim74/src/ex_docmd.c
 --- vim74.orig/src/ex_docmd.c   2013-07-24 13:09:37.000000000 +0000
-+++ vim74/src/ex_docmd.c        2014-06-01 00:43:14.294146578 +0000
++++ vim74/src/ex_docmd.c        2014-07-21 23:33:39.516800909 +0000
 @@ -316,7 +316,6 @@
  static void    ex_operators __ARGS((exarg_T *eap));
@@ -41561 +47606 @@
  }
  
+@@ -11453,7 +11489,7 @@
+ 
+            c = *end;
+            *end = NUL;
+-           match_add(curwin, g, p + 1, 10, id);
++           match_add(curwin, g, p + 1, 10, id, NULL);
+            vim_free(g);
+            *end = c;
+        }
 diff -Naur vim74.orig/src/ex_eval.c vim74/src/ex_eval.c
 --- vim74.orig/src/ex_eval.c    2013-06-08 13:50:28.000000000 +0000
-+++ vim74/src/ex_eval.c 2014-06-01 00:43:14.320813177 +0000
++++ vim74/src/ex_eval.c 2014-07-21 23:33:39.536800857 +0000
 @@ -321,6 +321,17 @@
  }
@@ -41749 +47803 @@
 diff -Naur vim74.orig/src/ex_getln.c vim74/src/ex_getln.c
 --- vim74.orig/src/ex_getln.c   2013-07-05 17:44:21.000000000 +0000
-+++ vim74/src/ex_getln.c        2014-06-01 00:43:14.327479827 +0000
-@@ -2280,7 +2280,7 @@
++++ vim74/src/ex_getln.c        2014-07-21 23:33:39.570134104 +0000
+@@ -342,6 +342,13 @@
+     do_digraph(-1);            /* init digraph typeahead */
+ #endif
+ 
++    /* If something above caused an error, reset the flags, we do want to type
++     * and execute commands. Display may be messed up a bit. */
++    if (did_emsg)
++       redrawcmd();
++    did_emsg = FALSE;
++    got_int = FALSE;
++
+     /*
+      * Collect the command string, handling editing keys.
+      */
+@@ -2188,6 +2195,7 @@
+     int                vcol = 0;
+     char_u     *p;
+     int                prev_char;
++    int                len;
+ 
+     /* Switch cursor on now.  This avoids that it happens after the "\n", which
+      * confuses the system function that computes tabstops. */
+@@ -2264,7 +2272,17 @@
+            {
+                if (line_ga.ga_len > 0)
+                {
+-                   --line_ga.ga_len;
++#ifdef FEAT_MBYTE
++                   if (has_mbyte)
++                   {
++                       p = (char_u *)line_ga.ga_data;
++                       p[line_ga.ga_len] = NUL;
++                       len = (*mb_head_off)(p, p + line_ga.ga_len - 1) + 1;
++                       line_ga.ga_len -= len;
++                   }
++                   else
++#endif
++                       --line_ga.ga_len;
+                    goto redraw;
+                }
+                continue;
+@@ -2280,14 +2298,14 @@
  
             if (c1 == Ctrl_T)
             {
 -               long        sw = get_sw_value();
-+               long        sw = get_sw_value(curbuf);
++               long        sw = get_sw_value(curbuf);
  
                 p = (char_u *)line_ga.ga_data;
                 p[line_ga.ga_len] = NUL;
-@@ -2337,7 +2337,7 @@
+-               indent = get_indent_str(p, 8);
++               indent = get_indent_str(p, 8, FALSE);
+                indent += sw - indent % sw;
+ add_indent:
+-               while (get_indent_str(p, 8) < indent)
++               while (get_indent_str(p, 8, FALSE) < indent)
+                {
+                    char_u *s = skipwhite(p);
+ 
+@@ -2300,8 +2318,9 @@
+                /* redraw the line */
+                msg_col = startcol;
+                vcol = 0;
+-               for (p = (char_u *)line_ga.ga_data;
+-                         p < (char_u *)line_ga.ga_data + line_ga.ga_len; ++p)
++               p = (char_u *)line_ga.ga_data;
++               p[line_ga.ga_len] = NUL;
++               while (p < (char_u *)line_ga.ga_data + line_ga.ga_len)
+                {
+                    if (*p == TAB)
+                    {
+@@ -2309,11 +2328,14 @@
+                        {
+                            msg_putchar(' ');
+                        } while (++vcol % 8);
++                       ++p;
+                    }
+                    else
+                    {
+-                       msg_outtrans_len(p, 1);
+-                       vcol += char2cells(*p);
++                       len = MB_PTR2LEN(p);
++                       msg_outtrans_len(p, len);
++                       vcol += ptr2cells(p);
++                       p += len;
+                    }
+                }
+                msg_clr_eos();
+@@ -2335,11 +2357,11 @@
+                else
+                {
                     p[line_ga.ga_len] = NUL;
-                    indent = get_indent_str(p, 8);
+-                   indent = get_indent_str(p, 8);
++                   indent = get_indent_str(p, 8, FALSE);
                     --indent;
 -                   indent -= indent % get_sw_value();
 +                   indent -= indent % get_sw_value(curbuf);
                 }
-                while (get_indent_str(p, 8) > indent)
+-               while (get_indent_str(p, 8) > indent)
++               while (get_indent_str(p, 8, FALSE) > indent)
                 {
-@@ -3852,9 +3852,9 @@
+                    char_u *s = skipwhite(p);
+ 
+@@ -2362,7 +2384,16 @@
+ 
+        if (IS_SPECIAL(c1))
+            c1 = '?';
+-       ((char_u *)line_ga.ga_data)[line_ga.ga_len] = c1;
++#ifdef FEAT_MBYTE
++       if (has_mbyte)
++           len = (*mb_char2bytes)(c1,
++                                 (char_u *)line_ga.ga_data + line_ga.ga_len);
++       else
++#endif
++       {
++           len = 1;
++           ((char_u *)line_ga.ga_data)[line_ga.ga_len] = c1;
++       }
+        if (c1 == '\n')
+            msg_putchar('\n');
+        else if (c1 == TAB)
+@@ -2376,10 +2407,10 @@
+        else
+        {
+            msg_outtrans_len(
+-                    ((char_u *)line_ga.ga_data) + line_ga.ga_len, 1);
++                    ((char_u *)line_ga.ga_data) + line_ga.ga_len, len);
+            vcol += char2cells(c1);
+        }
+-       ++line_ga.ga_len;
++       line_ga.ga_len += len;
+        escaped = FALSE;
+ 
+        windgoto(msg_row, msg_col);
+@@ -3852,9 +3883,9 @@
      char_u     buf[20];
      int                j = 0;
@@ -41780 +47950 @@
      buf[j] = NUL;
      p = vim_strsave_escaped(fname, buf);
-@@ -4178,7 +4178,7 @@
+@@ -4178,7 +4209,7 @@
  /*
   * Prepare a string for expansion.
@@ -41789 +47959 @@
   * the name into allocated memory and prepend "^".
   */
-@@ -5095,9 +5095,9 @@
+@@ -5095,9 +5126,9 @@
      char_u     ***file;
      char       *dirnames[];
@@ -41800 +47970 @@
      int                i;
      int                pat_len;
-@@ -5116,33 +5116,27 @@
+@@ -5116,33 +5147,27 @@
             return FAIL;
         }
@@ -41851 +48021 @@
         return FAIL;
  
-@@ -5160,33 +5154,28 @@
+@@ -5160,33 +5185,28 @@
  #if defined(FEAT_CMDL_COMPL) || defined(FEAT_EVAL) || defined(PROTO)
  /*
@@ -41890 +48060 @@
      while (*path != NUL)
      {
-@@ -5207,30 +5196,23 @@
+@@ -5207,30 +5227,23 @@
                              WILD_SILENT|expand_options) != FAIL && num_p > 0)
             {
@@ -41926 +48096 @@
  
  #endif
-@@ -5498,6 +5480,9 @@
+@@ -5498,6 +5511,9 @@
      if (hislen == 0)           /* no history */
         return;
@@ -41938 +48108 @@
 diff -Naur vim74.orig/src/feature.h vim74/src/feature.h
 --- vim74.orig/src/feature.h    2013-05-18 18:18:20.000000000 +0000
-+++ vim74/src/feature.h 2014-06-01 00:43:14.384146349 +0000
++++ vim74/src/feature.h 2014-07-21 23:33:39.613467324 +0000
 @@ -211,18 +211,11 @@
  #endif
@@ -42005 +48175 @@
 diff -Naur vim74.orig/src/fileio.c vim74/src/fileio.c
 --- vim74.orig/src/fileio.c     2013-08-05 19:58:03.000000000 +0000
-+++ vim74/src/fileio.c  2014-06-01 00:43:14.407479623 +0000
++++ vim74/src/fileio.c  2014-07-21 23:33:39.653467220 +0000
 @@ -428,13 +428,13 @@
         }
@@ -42217 +48387 @@
             fname = vim_strsave(fname);
         else
-@@ -9536,13 +9549,19 @@
+@@ -9536,13 +9549,26 @@
  
      /*
       * When stopping to execute autocommands, restore the search patterns and
 -     * the redo buffer.
-+     * the redo buffer.  Free buffers in the au_pending_free_buf list.
++     * the redo buffer.  Free any buffers in the au_pending_free_buf list and
++     * free any windows in the au_pending_free_win list.
       */
      if (!autocmd_busy)
@@ -42235 +48406 @@
 +           au_pending_free_buf = b;
 +       }
++       while (au_pending_free_win != NULL)
++       {
++           win_T *w = au_pending_free_win->w_next;
++           vim_free(au_pending_free_win);
++           au_pending_free_win = w;
++       }
      }
  
@@ -42240 +48417 @@
 diff -Naur vim74.orig/src/fold.c vim74/src/fold.c
 --- vim74.orig/src/fold.c       2013-06-15 14:57:24.000000000 +0000
-+++ vim74/src/fold.c    2014-06-01 00:43:14.437479547 +0000
++++ vim74/src/fold.c    2014-07-21 23:33:39.676800492 +0000
 @@ -430,11 +430,9 @@
      }
@@ -42292 +48469 @@
 diff -Naur vim74.orig/src/getchar.c vim74/src/getchar.c
 --- vim74.orig/src/getchar.c    2013-06-29 11:43:27.000000000 +0000
-+++ vim74/src/getchar.c 2014-06-01 00:43:14.447479521 +0000
++++ vim74/src/getchar.c 2014-07-21 23:33:39.713467063 +0000
 @@ -40,13 +40,13 @@
  
@@ -42776 +48953 @@
  #ifdef FEAT_EVAL
                         /* Copy the values from *mp that are used, because
+@@ -2632,7 +2675,7 @@
+                                {
+                                    if (!vim_iswhite(ptr[col]))
+                                        curwin->w_wcol = vcol;
+-                                   vcol += lbr_chartabsize(ptr + col,
++                                   vcol += lbr_chartabsize(ptr, ptr + col,
+                                                               (colnr_T)vcol);
+ #ifdef FEAT_MBYTE
+                                    if (has_mbyte)
 diff -Naur vim74.orig/src/globals.h vim74/src/globals.h
 --- vim74.orig/src/globals.h    2013-07-04 17:53:44.000000000 +0000
-+++ vim74/src/globals.h 2014-06-01 00:43:14.474146120 +0000
-@@ -386,6 +386,11 @@
++++ vim74/src/globals.h 2014-07-21 23:33:39.756800283 +0000
+@@ -386,6 +386,13 @@
  /* When deleting the current buffer, another one must be loaded.  If we know
   * which one is preferred, au_new_curbuf is set to it */
  EXTERN buf_T   *au_new_curbuf INIT(= NULL);
 +
-+/* When deleting the buffer and autocmd_busy is TRUE, do not free the buffer
-+ * but link it in the list starting with au_pending_free_buf, using b_next.
-+ * Free the buffer when autocmd_busy is set to FALSE. */
++/* When deleting a buffer/window and autocmd_busy is TRUE, do not free the
++ * buffer/window. but link it in the list starting with
++ * au_pending_free_buf/ap_pending_free_win, using b_next/w_next.
++ * Free the buffer/window when autocmd_busy is being set to FALSE. */
 +EXTERN buf_T   *au_pending_free_buf INIT(= NULL);
++EXTERN win_T   *au_pending_free_win INIT(= NULL);
  #endif
  
  #ifdef FEAT_MOUSE
-@@ -596,6 +601,7 @@
+@@ -596,6 +603,7 @@
   * to this when the window is using the global argument list.
   */
@@ -42799 +48987 @@
                                                global_alist */
  
-@@ -662,7 +668,6 @@
+@@ -662,7 +670,6 @@
                                 /* set to TRUE when "-s" commandline argument
                                  * used for ex */
@@ -42807 +48995 @@
  EXTERN int     VIsual_active INIT(= FALSE);
                                 /* whether Visual mode is active */
-@@ -677,7 +682,6 @@
+@@ -677,7 +684,6 @@
  
  EXTERN int     redo_VIsual_busy INIT(= FALSE);
@@ -42815 +49003 @@
  #ifdef FEAT_MOUSE
  /*
-@@ -752,6 +756,12 @@
+@@ -752,6 +758,12 @@
   */
  EXTERN pos_T   Insstart;               /* This is where the latest
@@ -42828 +49016 @@
  /*
   * Stuff for VREPLACE mode.
-@@ -979,11 +989,6 @@
+@@ -979,11 +991,6 @@
  EXTERN int     readonlymode INIT(= FALSE); /* Set to TRUE for "view" */
  EXTERN int     recoverymode INIT(= FALSE); /* Set to TRUE for "-r" option */
@@ -42840 +49028 @@
  #ifdef DO_INIT
                     = {NULL, NULL, 0, 0, 0, 0, 0, 0, 0}
-@@ -1177,11 +1182,9 @@
+@@ -1177,11 +1184,9 @@
  EXTERN int     fill_diff INIT(= '-');
  #endif
@@ -42852 +49040 @@
  #ifdef FEAT_CMDWIN
  EXTERN int     cedit_key INIT(= -1);   /* key value of 'cedit' option */
-@@ -1331,6 +1334,9 @@
+@@ -1331,6 +1336,9 @@
  #if defined(UNIX) || defined(VMS)
  EXTERN int     term_is_xterm INIT(= FALSE);    /* xterm-like 'term' */
@@ -42862 +49050 @@
  #ifdef BACKSLASH_IN_FILENAME
  EXTERN char    psepc INIT(= '\\');     /* normal path separator character */
-@@ -1490,6 +1496,7 @@
+@@ -1490,6 +1498,7 @@
  EXTERN char_u e_notopen[]      INIT(= N_("E484: Can't open file %s"));
  EXTERN char_u e_notread[]      INIT(= N_("E485: Can't read file %s"));
@@ -42872 +49060 @@
 diff -Naur vim74.orig/src/gui.c vim74/src/gui.c
 --- vim74.orig/src/gui.c        2013-06-30 15:41:48.000000000 +0000
-+++ vim74/src/gui.c     2014-06-01 00:43:14.494146069 +0000
++++ vim74/src/gui.c     2014-07-21 23:33:39.796800179 +0000
 @@ -3132,11 +3132,9 @@
       */
@@ -42885 +49073 @@
         /*
          * When 'mousemodel' is "popup", shift-left is translated to right.
+diff -Naur vim74.orig/src/gui_beval.c vim74/src/gui_beval.c
+--- vim74.orig/src/gui_beval.c  2013-05-06 02:06:04.000000000 +0000
++++ vim74/src/gui_beval.c       2014-07-21 23:33:39.853466698 +0000
+@@ -1193,11 +1193,13 @@
+            XmFontList fl;
+ 
+            fl = gui_motif_fontset2fontlist(&gui.tooltip_fontset);
+-           if (fl != NULL)
++           if (fl == NULL)
+            {
+-               XmStringExtent(fl, s, &w, &h);
+-               XmFontListFree(fl);
++               XmStringFree(s);
++               return;
+            }
++           XmStringExtent(fl, s, &w, &h);
++           XmFontListFree(fl);
+        }
+        w += gui.border_offset << 1;
+        h += gui.border_offset << 1;
 diff -Naur vim74.orig/src/gui_gtk_x11.c vim74/src/gui_gtk_x11.c
 --- vim74.orig/src/gui_gtk_x11.c        2013-06-30 15:42:13.000000000 +0000
-+++ vim74/src/gui_gtk_x11.c     2014-06-01 00:43:14.634145713 +0000
++++ vim74/src/gui_gtk_x11.c     2014-07-21 23:33:39.930133164 +0000
 @@ -732,7 +732,10 @@
  gui_mch_start_blink(void)
@@ -42926 +49134 @@
      }
  #endif
+@@ -5957,27 +5965,48 @@
+         * Decide whether we need to scale.  Allow one pixel of border
+         * width to be cut off, in order to avoid excessive scaling for
+         * tiny differences in font size.
++        * Do scale to fit the height to avoid gaps because of linespacing.
+         */
+        need_scale = (width > SIGN_WIDTH + 2
+-                     || height > SIGN_HEIGHT + 2
++                     || height != SIGN_HEIGHT
+                      || (width < 3 * SIGN_WIDTH / 4
+                          && height < 3 * SIGN_HEIGHT / 4));
+        if (need_scale)
+        {
+-           double aspect;
++           double  aspect;
++           int     w = width;
++           int     h = height;
+ 
+            /* Keep the original aspect ratio */
+            aspect = (double)height / (double)width;
+            width  = (double)SIGN_WIDTH * SIGN_ASPECT / aspect;
+            width  = MIN(width, SIGN_WIDTH);
+-           height = (double)width * aspect;
++           if (((double)(MAX(height, SIGN_HEIGHT)) /
++                (double)(MIN(height, SIGN_HEIGHT))) < 1.15)
++           {
++               /* Change the aspect ratio by at most 15% to fill the
++                * available space completly. */
++               height = (double)SIGN_HEIGHT * SIGN_ASPECT / aspect;
++               height = MIN(height, SIGN_HEIGHT);
++           }
++           else
++               height = (double)width * aspect;
+ 
+-           /* This doesn't seem to be worth caching, and doing so
+-            * would complicate the code quite a bit. */
+-           sign = gdk_pixbuf_scale_simple(sign, width, height,
+-                                          GDK_INTERP_BILINEAR);
+-           if (sign == NULL)
+-               return; /* out of memory */
++           if (w == width && h == height)
++           {
++               /* no change in dimensions; don't decrease reference counter
++                * (below) */
++               need_scale = FALSE;
++           }
++           else
++           {
++               /* This doesn't seem to be worth caching, and doing so would
++                * complicate the code quite a bit. */
++               sign = gdk_pixbuf_scale_simple(sign, width, height,
++                                                        GDK_INTERP_BILINEAR);
++               if (sign == NULL)
++                   return; /* out of memory */
++           }
+        }
+ 
+        /* The origin is the upper-left corner of the pixmap.  Therefore
 diff -Naur vim74.orig/src/gui_mac.c vim74/src/gui_mac.c
 --- vim74.orig/src/gui_mac.c    2013-05-06 02:06:04.000000000 +0000
-+++ vim74/src/gui_mac.c 2014-06-01 00:43:14.654145662 +0000
++++ vim74/src/gui_mac.c 2014-07-21 23:33:39.973466385 +0000
 @@ -1068,11 +1068,7 @@
      }
@@ -42961 +49227 @@
 diff -Naur vim74.orig/src/gui_w48.c vim74/src/gui_w48.c
 --- vim74.orig/src/gui_w48.c    2013-08-10 11:36:45.000000000 +0000
-+++ vim74/src/gui_w48.c 2014-06-01 00:43:14.767478706 +0000
++++ vim74/src/gui_w48.c 2014-07-21 23:33:40.123465993 +0000
 @@ -1008,7 +1008,7 @@
      static LPARAM last_lParam = 0L;
@@ -43023 +49289 @@
 diff -Naur vim74.orig/src/if_lua.c vim74/src/if_lua.c
 --- vim74.orig/src/if_lua.c     2013-06-23 10:55:02.000000000 +0000
-+++ vim74/src/if_lua.c  2014-06-01 00:43:14.997478121 +0000
++++ vim74/src/if_lua.c  2014-07-21 23:33:40.400131938 +0000
 @@ -734,7 +734,7 @@
      if (li == NULL) return 0;
@@ -43035 +49301 @@
 diff -Naur vim74.orig/src/if_perl.xs vim74/src/if_perl.xs
 --- vim74.orig/src/if_perl.xs   2013-08-02 17:28:50.000000000 +0000
-+++ vim74/src/if_perl.xs        2014-06-01 00:43:15.084144567 +0000
++++ vim74/src/if_perl.xs        2014-07-21 23:33:40.470131755 +0000
 @@ -14,7 +14,8 @@
  #define IN_PERL_FILE   /* don't include if_perl.pro from proto.h */
@@ -43110 +49376 @@
  #  define Perl_croak_nocontext dll_Perl_croak_nocontext
  #  define Perl_call_argv dll_Perl_call_argv
-@@ -246,7 +266,9 @@
+@@ -171,6 +191,9 @@
+ # define Perl_pop_scope dll_Perl_pop_scope
+ # define Perl_push_scope dll_Perl_push_scope
+ # define Perl_save_int dll_Perl_save_int
++# if (PERL_REVISION == 5) && (PERL_VERSION >= 20)
++#  define Perl_save_strlen dll_Perl_save_strlen
++# endif
+ # define Perl_stack_grow dll_Perl_stack_grow
+ # define Perl_set_context dll_Perl_set_context
+ # if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
+@@ -246,7 +269,9 @@
  # define Perl_Iscopestack_ix_ptr dll_Perl_Iscopestack_ix_ptr
  # define Perl_Iunitcheckav_ptr dll_Perl_Iunitcheckav_ptr
@@ -43121 +49397 @@
  
  /*
-@@ -262,10 +284,13 @@
+@@ -262,10 +287,13 @@
  static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);
  static void* (*Perl_get_context)(void);
@@ -43137 +49413 @@
  static void (*Perl_croak_nocontext)(const char*, ...);
  static I32 (*Perl_dowantarray)(pTHX);
-@@ -337,7 +362,12 @@
+@@ -286,6 +314,9 @@
+ static void (*Perl_pop_scope)(pTHX);
+ static void (*Perl_push_scope)(pTHX);
+ static void (*Perl_save_int)(pTHX_ int*);
++#if (PERL_REVISION == 5) && (PERL_VERSION >= 20)
++static void (*Perl_save_strlen)(pTHX_ STRLEN* ptr);
++#endif
+ static SV** (*Perl_stack_grow)(pTHX_ SV**, SV**p, int);
+ static SV** (*Perl_set_context)(void*);
+ #if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
+@@ -337,7 +368,12 @@
  static XPV** (*Perl_TXpv_ptr)(register PerlInterpreter*);
  static STRLEN* (*Perl_Tna_ptr)(register PerlInterpreter*);
@@ -43150 +49436 @@
  static void (*Perl_sys_term)(void);
  static void (*Perl_call_list)(pTHX_ I32, AV*);
-@@ -360,7 +390,9 @@
+@@ -360,7 +396,9 @@
  #endif
  
@@ -43160 +49446 @@
  static GV** (*Perl_Idefgv_ptr)(register PerlInterpreter*);
  static GV** (*Perl_Ierrgv_ptr)(register PerlInterpreter*);
-@@ -384,12 +416,12 @@
+@@ -384,12 +422,12 @@
      {"perl_parse", (PERL_PROC*)&perl_parse},
      {"Perl_get_context", (PERL_PROC*)&Perl_get_context},
@@ -43175 +49461 @@
      {"Perl_free_tmps", (PERL_PROC*)&Perl_free_tmps},
      {"Perl_gv_stashpv", (PERL_PROC*)&Perl_gv_stashpv},
-@@ -481,7 +513,9 @@
+@@ -408,6 +446,9 @@
+     {"Perl_pop_scope", (PERL_PROC*)&Perl_pop_scope},
+     {"Perl_push_scope", (PERL_PROC*)&Perl_push_scope},
+     {"Perl_save_int", (PERL_PROC*)&Perl_save_int},
++#if (PERL_REVISION == 5) && (PERL_VERSION >= 20)
++    {"Perl_save_strlen", (PERL_PROC*)&Perl_save_strlen},
++#endif
+     {"Perl_stack_grow", (PERL_PROC*)&Perl_stack_grow},
+     {"Perl_set_context", (PERL_PROC*)&Perl_set_context},
+ #if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
+@@ -481,7 +522,9 @@
  # endif
  #endif
@@ -43185 +49481 @@
      {"Perl_Idefgv_ptr", (PERL_PROC*)&Perl_Idefgv_ptr},
      {"Perl_Ierrgv_ptr", (PERL_PROC*)&Perl_Ierrgv_ptr},
-@@ -492,6 +526,14 @@
+@@ -492,6 +535,14 @@
      {"", NULL},
  };
@@ -43202 +49498 @@
 diff -Naur vim74.orig/src/if_py_both.h vim74/src/if_py_both.h
 --- vim74.orig/src/if_py_both.h 2013-07-24 15:09:19.000000000 +0000
-+++ vim74/src/if_py_both.h      2014-06-01 00:43:15.114144490 +0000
++++ vim74/src/if_py_both.h      2014-07-21 23:33:40.640131312 +0000
 @@ -13,6 +13,11 @@
   * Common code for if_python.c and if_python3.c.
@@ -44038 +50334 @@
 diff -Naur vim74.orig/src/if_python.c vim74/src/if_python.c
 --- vim74.orig/src/if_python.c  2013-07-09 19:40:11.000000000 +0000
-+++ vim74/src/if_python.c       2014-06-01 00:43:15.180810987 +0000
++++ vim74/src/if_python.c       2014-07-21 23:33:40.713464454 +0000
 @@ -196,6 +196,7 @@
  # define PyTuple_Size dll_PyTuple_Size
@@ -44140 +50436 @@
 diff -Naur vim74.orig/src/if_python3.c vim74/src/if_python3.c
 --- vim74.orig/src/if_python3.c 2013-07-09 19:53:21.000000000 +0000
-+++ vim74/src/if_python3.c      2014-06-01 00:43:15.214144236 +0000
++++ vim74/src/if_python3.c      2014-07-21 23:33:40.770130973 +0000
 @@ -97,6 +97,19 @@
  #define Py_ssize_t_fmt "n"
@@ -44297 +50593 @@
 diff -Naur vim74.orig/src/if_ruby.c vim74/src/if_ruby.c
 --- vim74.orig/src/if_ruby.c    2013-05-20 10:47:48.000000000 +0000
-+++ vim74/src/if_ruby.c 2014-06-01 00:43:15.230810860 +0000
++++ vim74/src/if_ruby.c 2014-07-21 23:33:40.823464167 +0000
 @@ -88,14 +88,20 @@
  # define rb_int2big rb_int2big_stub
@@ -44404 +50700 @@
 diff -Naur vim74.orig/src/if_tcl.c vim74/src/if_tcl.c
 --- vim74.orig/src/if_tcl.c     2013-08-02 17:31:15.000000000 +0000
-+++ vim74/src/if_tcl.c  2014-06-01 00:43:15.274144083 +0000
++++ vim74/src/if_tcl.c  2014-07-21 23:33:40.893463984 +0000
 @@ -165,6 +165,7 @@
   */
@@ -44435 +50731 @@
                 stubs_initialized = TRUE;
             }
+diff -Naur vim74.orig/src/installman.sh vim74/src/installman.sh
+--- vim74.orig/src/installman.sh        2010-05-15 11:04:07.000000000 +0000
++++ vim74/src/installman.sh     2014-07-21 23:33:40.926797230 +0000
+@@ -43,10 +43,13 @@
+    fi
+ fi
+ 
++# Note: setting LC_ALL to C is required to avoid illegal byte errors from sed
++# on some systems.
++
+ if test $what = "install"; then
+    # vim.1
+    echo installing $destdir/$exename.1
+-   sed -e s+/usr/local/lib/vim+$vimloc+ \
++   LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
+           -e s+$vimloc/doc+$helpsubloc+ \
+           -e s+$vimloc/print+$printsubloc+ \
+           -e s+$vimloc/syntax+$synsubloc+ \
+@@ -64,7 +67,7 @@
+ 
+    # vimtutor.1
+    echo installing $destdir/$exename""tutor.1
+-   sed -e s+/usr/local/lib/vim+$vimloc+ \
++   LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
+           -e s+$vimloc/tutor+$tutorsubloc+ \
+           $helpsource/vimtutor$langadd.1 > $destdir/$exename""tutor.1
+    chmod $manmod $destdir/$exename""tutor.1
+@@ -76,7 +79,7 @@
+ 
+    # evim.1
+    echo installing $destdir/$evimname.1
+-   sed -e s+/usr/local/lib/vim+$vimloc+ \
++   LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
+           -e s+$vimloc/evim.vim+$scriptloc/evim.vim+ \
+           $helpsource/evim$langadd.1 > $destdir/$evimname.1
+    chmod $manmod $destdir/$evimname.1
 diff -Naur vim74.orig/src/macros.h vim74/src/macros.h
 --- vim74.orig/src/macros.h     2013-06-12 15:07:32.000000000 +0000
-+++ vim74/src/macros.h  2014-06-01 00:43:15.400810427 +0000
++++ vim74/src/macros.h  2014-07-21 23:33:41.010130346 +0000
 @@ -264,7 +264,7 @@
  # define mb_ptr_adv(p)     p += has_mbyte ? (*mb_ptr2len)(p) : 1
@@ -44449 +50781 @@
 diff -Naur vim74.orig/src/main.c vim74/src/main.c
 --- vim74.orig/src/main.c       2013-07-03 10:36:49.000000000 +0000
-+++ vim74/src/main.c    2014-06-01 00:43:15.424143701 +0000
++++ vim74/src/main.c    2014-07-21 23:33:41.050130242 +0000
 @@ -322,6 +322,7 @@
      init_yank();               /* init yank buffers */
@@ -44585 +50917 @@
 diff -Naur vim74.orig/src/mark.c vim74/src/mark.c
 --- vim74.orig/src/mark.c       2013-08-02 15:22:10.000000000 +0000
-+++ vim74/src/mark.c    2014-06-01 00:43:15.447476975 +0000
++++ vim74/src/mark.c    2014-07-21 23:33:41.063463541 +0000
 @@ -98,7 +98,6 @@
         return OK;
@@ -44701 +51033 @@
 diff -Naur vim74.orig/src/mbyte.c vim74/src/mbyte.c
 --- vim74.orig/src/mbyte.c      2013-07-05 18:07:21.000000000 +0000
-+++ vim74/src/mbyte.c   2014-06-01 00:43:15.490810198 +0000
++++ vim74/src/mbyte.c   2014-07-21 23:33:41.080130164 +0000
 @@ -83,10 +83,18 @@
  # ifndef WIN32_LEAN_AND_MEAN
@@ -44783 +51115 @@
 diff -Naur vim74.orig/src/memfile.c vim74/src/memfile.c
 --- vim74.orig/src/memfile.c    2013-05-23 20:22:22.000000000 +0000
-+++ vim74/src/memfile.c 2014-06-01 00:43:15.514143472 +0000
++++ vim74/src/memfile.c 2014-07-21 23:33:41.096796787 +0000
 @@ -1358,7 +1358,7 @@
         if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
@@ -44795 +51127 @@
 diff -Naur vim74.orig/src/memline.c vim74/src/memline.c
 --- vim74.orig/src/memline.c    2013-05-06 02:01:02.000000000 +0000
-+++ vim74/src/memline.c 2014-06-01 00:43:15.537476746 +0000
++++ vim74/src/memline.c 2014-07-21 23:33:41.143463332 +0000
 @@ -289,6 +289,9 @@
      buf->b_ml.ml_chunksize = NULL;
@@ -44993 +51325 @@
 diff -Naur vim74.orig/src/menu.c vim74/src/menu.c
 --- vim74.orig/src/menu.c       2011-04-11 13:17:21.000000000 +0000
-+++ vim74/src/menu.c    2014-06-01 00:43:15.557476695 +0000
++++ vim74/src/menu.c    2014-07-21 23:33:41.163463280 +0000
 @@ -1640,7 +1640,6 @@
         idx = MENU_INDEX_INSERT;
@@ -45027 +51359 @@
 diff -Naur vim74.orig/src/message.c vim74/src/message.c
 --- vim74.orig/src/message.c    2013-08-09 18:30:45.000000000 +0000
-+++ vim74/src/message.c 2014-06-01 00:43:15.597476593 +0000
++++ vim74/src/message.c 2014-07-21 23:33:41.193463201 +0000
 @@ -887,6 +887,8 @@
      int                oldState;
@@ -45070 +51402 @@
 diff -Naur vim74.orig/src/misc1.c vim74/src/misc1.c
 --- vim74.orig/src/misc1.c      2013-08-03 15:29:33.000000000 +0000
-+++ vim74/src/misc1.c   2014-06-01 00:43:15.620809867 +0000
-@@ -303,10 +303,18 @@
++++ vim74/src/misc1.c   2014-07-21 23:33:41.260129694 +0000
+@@ -32,7 +32,7 @@
+     int
+ get_indent()
+ {
+-    return get_indent_str(ml_get_curline(), (int)curbuf->b_p_ts);
++    return get_indent_str(ml_get_curline(), (int)curbuf->b_p_ts, FALSE);
+ }
+ 
+ /*
+@@ -42,7 +42,7 @@
+ get_indent_lnum(lnum)
+     linenr_T   lnum;
+ {
+-    return get_indent_str(ml_get(lnum), (int)curbuf->b_p_ts);
++    return get_indent_str(ml_get(lnum), (int)curbuf->b_p_ts, FALSE);
+ }
+ 
+ #if defined(FEAT_FOLDING) || defined(PROTO)
+@@ -55,7 +55,7 @@
+     buf_T      *buf;
+     linenr_T   lnum;
+ {
+-    return get_indent_str(ml_get_buf(buf, lnum, FALSE), (int)buf->b_p_ts);
++    return get_indent_str(ml_get_buf(buf, lnum, FALSE), (int)buf->b_p_ts, FALSE);
+ }
+ #endif
+ 
+@@ -64,16 +64,23 @@
+  * 'tabstop' at "ts"
+  */
+     int
+-get_indent_str(ptr, ts)
++get_indent_str(ptr, ts, list)
+     char_u     *ptr;
+     int                ts;
++    int                list; /* if TRUE, count only screen size for tabs */
+ {
+     int                count = 0;
+ 
+     for ( ; *ptr; ++ptr)
+     {
+-       if (*ptr == TAB)    /* count a tab for what it is worth */
+-           count += ts - (count % ts);
++       if (*ptr == TAB)
++       {
++           if (!list || lcs_tab1)    /* count a tab for what it is worth */
++               count += ts - (count % ts);
++           else
++       /* in list mode, when tab is not set, count screen char width for Tab: ^I */
++               count += ptr2cells(ptr);
++       }
+        else if (*ptr == ' ')
+            ++count;            /* count a space for one */
+        else
+@@ -303,10 +310,18 @@
         ml_replace(curwin->w_cursor.lnum, newline, FALSE);
         if (flags & SIN_CHANGED)
@@ -45094 +51480 @@
      }
      else
-@@ -1397,7 +1405,7 @@
+@@ -468,6 +483,61 @@
+     return (int)col;
+ }
+ 
++#if defined(FEAT_LINEBREAK) || defined(PROTO)
++/*
++ * Return appropriate space number for breakindent, taking influencing
++ * parameters into account. Window must be specified, since it is not
++ * necessarily always the current one.
++ */
++    int
++get_breakindent_win(wp, line)
++    win_T      *wp;
++    char_u     *line; /* start of the line */
++{
++    static int     prev_indent = 0;  /* cached indent value */
++    static long            prev_ts     = 0L; /* cached tabstop value */
++    static char_u   *prev_line = NULL; /* cached pointer to line */
++    static int     prev_tick = 0;   /* changedtick of cached value */
++    int                    bri = 0;
++    /* window width minus window margin space, i.e. what rests for text */
++    const int      eff_wwidth = W_WIDTH(wp)
++                           - ((wp->w_p_nu || wp->w_p_rnu)
++                               && (vim_strchr(p_cpo, CPO_NUMCOL) == NULL)
++                                               ? number_width(wp) + 1 : 0);
++
++    /* used cached indent, unless pointer or 'tabstop' changed */
++    if (prev_line != line || prev_ts != wp->w_buffer->b_p_ts
++                                 || prev_tick != wp->w_buffer->b_changedtick)
++    {
++       prev_line = line;
++       prev_ts = wp->w_buffer->b_p_ts;
++       prev_tick = wp->w_buffer->b_changedtick;
++       prev_indent = get_indent_str(line,
++                                    (int)wp->w_buffer->b_p_ts, wp->w_p_list);
++    }
++    bri = prev_indent + wp->w_p_brishift;
++
++    /* indent minus the length of the showbreak string */
++    if (wp->w_p_brisbr)
++       bri -= vim_strsize(p_sbr);
++
++    /* Add offset for number column, if 'n' is in 'cpoptions' */
++    bri += win_col_off2(wp);
++
++    /* never indent past left window margin */
++    if (bri < 0)
++       bri = 0;
++    /* always leave at least bri_min characters on the left,
++     * if text width is sufficient */
++    else if (bri > eff_wwidth - wp->w_p_brimin)
++       bri = (eff_wwidth - wp->w_p_brimin < 0)
++                           ? 0 : eff_wwidth - wp->w_p_brimin;
++
++    return bri;
++}
++#endif
++
++
+ #if defined(FEAT_CINDENT) || defined(FEAT_SMARTINDENT)
+ 
+ static int cin_is_cinword __ARGS((char_u *line));
+@@ -670,7 +740,7 @@
+        /*
+         * count white space on current line
+         */
+-       newindent = get_indent_str(saved_line, (int)curbuf->b_p_ts);
++       newindent = get_indent_str(saved_line, (int)curbuf->b_p_ts, FALSE);
+        if (newindent == 0 && !(flags & OPENLINE_COM_LIST))
+            newindent = second_line_indent; /* for ^^D command in insert mode */
+ 
+@@ -1193,7 +1263,7 @@
+                                        || do_si
+ #endif
+                                                           )
+-                       newindent = get_indent_str(leader, (int)curbuf->b_p_ts);
++                       newindent = get_indent_str(leader, (int)curbuf->b_p_ts, FALSE);
+ 
+                    /* Add the indent offset */
+                    if (newindent + off < 0)
+@@ -1397,7 +1467,7 @@
  #ifdef FEAT_SMARTINDENT
         if (did_si)
@@ -45103 +51569 @@
             if (p_sr)
                 newindent -= newindent % sw;
-@@ -1581,9 +1589,9 @@
+@@ -1581,9 +1651,9 @@
  
  #if defined(FEAT_COMMENTS) || defined(PROTO)
@@ -45116 +51582 @@
   * comment leader.
   * "backward" must be true for the "O" command.
-@@ -3117,6 +3125,9 @@
+@@ -1986,6 +2056,7 @@
+     char_u     *s;
+     int                lines = 0;
+     int                width;
++    char_u     *line;
+ 
+ #ifdef FEAT_DIFF
+     /* Check for filler lines above this buffer line.  When folded the result
+@@ -2001,12 +2072,12 @@
+        return lines + 1;
+ #endif
+ 
+-    s = ml_get_buf(wp->w_buffer, lnum, FALSE);
++    line = s = ml_get_buf(wp->w_buffer, lnum, FALSE);
+ 
+     col = 0;
+     while (*s != NUL && --column >= 0)
+     {
+-       col += win_lbr_chartabsize(wp, s, (colnr_T)col, NULL);
++       col += win_lbr_chartabsize(wp, line, s, (colnr_T)col, NULL);
+        mb_ptr_adv(s);
+     }
+ 
+@@ -2018,7 +2089,7 @@
+      * 'ts') -- webb.
+      */
+     if (*s == TAB && (State & NORMAL) && (!wp->w_p_list || lcs_tab1))
+-       col += win_lbr_chartabsize(wp, s, (colnr_T)col, NULL) - 1;
++       col += win_lbr_chartabsize(wp, line, s, (colnr_T)col, NULL) - 1;
+ 
+     /*
+      * Add column offset for 'number', 'relativenumber', 'foldcolumn', etc.
+@@ -3117,6 +3188,9 @@
             if (hasAnyFolding(wp))
                 set_topline(wp, wp->w_topline);
@@ -45126 +51624 @@
      }
  
-@@ -4800,9 +4811,9 @@
+@@ -4800,9 +4874,9 @@
  
      if (fname == NULL)
@@ -45138 +51636 @@
         mb_ptr_adv(p2);
      }
-@@ -4921,7 +4932,8 @@
+@@ -4921,7 +4995,8 @@
  }
  
@@ -45148 +51646 @@
      int
  vim_ispathsep(c)
-@@ -4944,6 +4956,20 @@
+@@ -4944,6 +5019,20 @@
  #endif
  }
@@ -45169 +51667 @@
  /*
   * return TRUE if 'c' is a path list separator.
-@@ -5168,11 +5194,18 @@
+@@ -5168,11 +5257,18 @@
  #if defined(FEAT_CINDENT) || defined(FEAT_SYN_HL)
  
@@ -45188 +51686 @@
  find_start_comment(ind_maxcomment)         /* XXX */
      int                ind_maxcomment;
-@@ -5290,7 +5323,7 @@
+@@ -5286,11 +5382,12 @@
+ static char_u  *cin_skipcomment __ARGS((char_u *));
+ static int     cin_nocode __ARGS((char_u *));
+ static pos_T   *find_line_comment __ARGS((void));
++static int     cin_has_js_key __ARGS((char_u *text));
+ static int     cin_islabel_skip __ARGS((char_u **));
  static int     cin_isdefault __ARGS((char_u *));
  static char_u  *after_label __ARGS((char_u *l));
@@ -45197 +51700 @@
  static int     cin_get_equal_amount __ARGS((linenr_T lnum));
  static int     cin_ispreproc __ARGS((char_u *));
-@@ -5299,28 +5332,26 @@
+@@ -5299,28 +5396,27 @@
  static int     cin_islinecomment __ARGS((char_u *));
  static int     cin_isterminated __ARGS((char_u *, int, int));
@@ -45223 +51726 @@
 +static pos_T   *find_start_brace __ARGS((void));
 +static pos_T   *find_match_paren __ARGS((int));
++static pos_T   *find_match_char __ARGS((int c, int ind_maxparen));
 +static int     corr_ind_maxparen __ARGS((pos_T *startpos));
  static int     find_last_paren __ARGS((char_u *l, int start, int end));
@@ -45234 +51738 @@
   * Skip over white space and C comments within the line.
   * Also skip over Perl/shell comments if desired.
-@@ -5337,7 +5368,7 @@
+@@ -5337,7 +5433,7 @@
  
         /* Perl/shell # comment comment continues until eol.  Require a space
@@ -45243 +51747 @@
             s += STRLEN(s);
             break;
-@@ -5423,8 +5454,7 @@
+@@ -5400,7 +5496,38 @@
+ }
+ 
+ /*
++ * Return TRUE if "text" starts with "key:".
++ */
++    static int
++cin_has_js_key(text)
++    char_u *text;
++{
++    char_u *s = skipwhite(text);
++    int            quote = 0;
++
++    if (*s == '\'' || *s == '"')
++    {
++       /* can be 'key': or "key": */
++       quote = *s;
++       ++s;
++    }
++    if (!vim_isIDc(*s))            /* need at least one ID character */
++       return FALSE;
++
++    while (vim_isIDc(*s))
++       ++s;
++    if (*s == quote)
++       ++s;
++
++    s = cin_skipcomment(s);
++
++    /* "::" is not a label, it's C++ */
++    return (*s == ':' && s[1] != ':');
++}
++
++/*
+  * Check if string matches "label:"; move to character after ':' if true.
++ * "*s" must point to the start of the label, if there is one.
+  */
+     static int
+ cin_islabel_skip(s)
+@@ -5423,8 +5550,7 @@
   * Note: curwin->w_cursor must be where we are looking for the label.
   */
@@ -45253 +51796 @@
      char_u     *s;
  
-@@ -5458,7 +5488,7 @@
+@@ -5458,7 +5584,7 @@
              * If we're in a comment now, skip to the start of the comment.
              */
@@ -45262 +51805 @@
  
             line = ml_get_curline();
-@@ -5704,10 +5734,9 @@
+@@ -5704,10 +5830,9 @@
   *             ^
   */
@@ -45274 +51817 @@
      char_u     *l;
      int                amount;
-@@ -5717,8 +5746,7 @@
+@@ -5717,8 +5842,7 @@
      curwin->w_cursor.lnum = lnum;
      l = ml_get_curline();
@@ -45284 +51827 @@
         amount = get_indent_nolabel(lnum);
         l = after_label(ml_get_curline());
-@@ -5962,12 +5990,10 @@
+@@ -5962,12 +6086,10 @@
   * "min_lnum" is the line before which we will not be looking.
   */
@@ -45298 +51841 @@
      char_u     *s;
      linenr_T   lnum = first_lnum;
-@@ -5981,7 +6007,7 @@
+@@ -5981,7 +6103,7 @@
         s = *sp;
  
@@ -45307 +51850 @@
         lnum = trypos->lnum;
         if (lnum < min_lnum)
-@@ -6089,10 +6115,9 @@
+@@ -6089,10 +6211,9 @@
   * ')' and ';'. The condition may be spread over several lines.
   */
@@ -45319 +51862 @@
      pos_T      cursor_save;
      pos_T      *trypos;
-@@ -6112,7 +6137,8 @@
+@@ -6112,7 +6233,8 @@
             ++p;
             ++curwin->w_cursor.col;
@@ -45329 +51872 @@
             retval = TRUE;
         curwin->w_cursor = cursor_save;
-@@ -6175,10 +6201,8 @@
+@@ -6175,10 +6297,8 @@
   * Adjust the cursor to the line with "while".
   */
@@ -45341 +51884 @@
      char_u     *line;
      char_u     *p;
-@@ -6202,7 +6226,7 @@
+@@ -6202,7 +6322,7 @@
                  * before the matching '('.  XXX */
                 i = (int)(p - line);
@@ -45350 +51893 @@
                 {
                     s = cin_skipcomment(ml_get(trypos->lnum));
-@@ -6394,11 +6418,8 @@
+@@ -6394,11 +6514,8 @@
  }
  
@@ -45363 +51906 @@
      int                amount;
      colnr_T    vcol;
-@@ -6408,11 +6429,10 @@
+@@ -6408,11 +6525,10 @@
      {
         amount = get_indent();
@@ -45377 +51920 @@
      else
      {
-@@ -6420,8 +6440,8 @@
+@@ -6420,8 +6536,8 @@
         getvcol(curwin, &curwin->w_cursor, &vcol, NULL, NULL);
         amount = (int)vcol;
@@ -45388 +51931 @@
  }
  
-@@ -6505,8 +6525,7 @@
+@@ -6505,8 +6621,7 @@
  /* }       */
  
@@ -45398 +51941 @@
      pos_T      cursor_save;
      pos_T      *trypos;
-@@ -6522,7 +6541,7 @@
+@@ -6522,7 +6637,7 @@
         pos = NULL;
         /* ignore the { if it's in a // or / *  * / comment */
@@ -45407 +51950 @@
         if (pos != NULL)
             curwin->w_cursor.lnum = pos->lnum;
-@@ -6536,9 +6555,8 @@
+@@ -6532,20 +6647,27 @@
+ }
+ 
+ /*
+- * Find the matching '(', failing if it is in a comment.
++ * Find the matching '(', ignoring it if it is in a comment.
   * Return NULL if no match found.
   */
@@ -45413 +51961 @@
 -find_match_paren(ind_maxparen, ind_maxcomment)     /* XXX */
 +find_match_paren(ind_maxparen)     /* XXX */
++    int                ind_maxparen;
++{
++    return find_match_char('(', ind_maxparen);
++}
++
++    static pos_T *
++find_match_char(c, ind_maxparen)           /* XXX */
++    int                c;
      int                ind_maxparen;
 -    int                ind_maxcomment;
@@ -45418 +51974 @@
      pos_T      cursor_save;
      pos_T      *trypos;
-@@ -6555,7 +6573,7 @@
+     static pos_T pos_copy;
+ 
+     cursor_save = curwin->w_cursor;
+-    if ((trypos = findmatchlimit(NULL, '(', 0, ind_maxparen)) != NULL)
++    if ((trypos = findmatchlimit(NULL, c, 0, ind_maxparen)) != NULL)
+     {
+        /* check if the ( is in a // comment */
+        if ((colnr_T)cin_skip2pos(trypos) > trypos->col)
+@@ -6555,7 +6677,7 @@
             pos_copy = *trypos;     /* copy trypos, findmatch will change it */
             trypos = &pos_copy;
@@ -45427 +51991 @@
         }
      }
-@@ -6570,15 +6588,14 @@
+@@ -6564,21 +6686,46 @@
+ }
+ 
+ /*
++ * Find the matching '(', ignoring it if it is in a comment or before an
++ * unmatched {.
++ * Return NULL if no match found.
++ */
++    static pos_T *
++find_match_paren_after_brace(ind_maxparen)         /* XXX */
++    int                ind_maxparen;
++{
++    pos_T      *trypos = find_match_paren(ind_maxparen);
++
++    if (trypos != NULL)
++    {
++       pos_T   *tryposBrace = find_start_brace();
++
++       /* If both an unmatched '(' and '{' is found.  Ignore the '('
++        * position if the '{' is further down. */
++       if (tryposBrace != NULL
++               && (trypos->lnum != tryposBrace->lnum
++                   ? trypos->lnum < tryposBrace->lnum
++                   : trypos->col < tryposBrace->col))
++           trypos = NULL;
++    }
++    return trypos;
++}
++
++/*
+  * Return ind_maxparen corrected for the difference in line number between the
+  * cursor position and "startpos".  This makes sure that searching for a
+  * matching paren above the cursor line doesn't find a match because of
   * looking a few lines further.
   */
@@ -45447 +52043 @@
  
  /*
-@@ -6616,201 +6633,229 @@
+@@ -6616,201 +6763,229 @@
      return retval;
  }
@@ -45480 +52076 @@
  
 -    int ind_level = sw;
--
++    /* Spaces from the edge of the line an open brace that's at the end of a
++     * line is imagined to be. */
++    buf->b_ind_open_imag = 0;
+ 
 -    /*
 -     * spaces from the edge of the line an open brace that's at the end of a
@@ -45486 +52085 @@
 -     */
 -    int ind_open_imag = 0;
-+    /* Spaces from the edge of the line an open brace that's at the end of a
-+     * line is imagined to be. */
-+    buf->b_ind_open_imag = 0;
++    /* Spaces from the prevailing indent for a line that is not preceded by
++     * an opening brace. */
++    buf->b_ind_no_brace = 0;
  
 -    /*
@@ -45495 +52094 @@
 -     */
 -    int ind_no_brace = 0;
-+    /* Spaces from the prevailing indent for a line that is not preceded by
-+     * an opening brace. */
-+    buf->b_ind_no_brace = 0;
++    /* Column where the first { of a function should be located }. */
++    buf->b_ind_first_open = 0;
  
 -    /*
@@ -45503 +52101 @@
 -     */
 -    int ind_first_open = 0;
-+    /* Column where the first { of a function should be located }. */
-+    buf->b_ind_first_open = 0;
++    /* Spaces from the prevailing indent a leftmost open brace should be
++     * located. */
++    buf->b_ind_open_extra = 0;
  
 -    /*
@@ -45511 +52110 @@
 -     */
 -    int ind_open_extra = 0;
-+    /* Spaces from the prevailing indent a leftmost open brace should be
-+     * located. */
-+    buf->b_ind_open_extra = 0;
- 
+-
 -    /*
 -     * spaces from the matching open brace (real location for one at the left
@@ -45746 +52342 @@
 +     * while(). */
 +    buf->b_ind_if_for_while = 0;
-+
+ 
 +    for (p = buf->b_p_cino; *p; )
 +    {
@@ -45781 +52377 @@
 +       if (l[1] == '-')
 +           n = -n;
- 
++
 +       /* When adding an entry here, also update the default 'cinoptions' in
 +        * doc/indent.txt, and add explanation for it! */
@@ -45833 +52429 @@
      int                amount;
      int                scope_amount;
-@@ -6845,10 +6890,6 @@
+@@ -6842,13 +7017,11 @@
+ #define LOOKFOR_NOBREAK                8
+ #define LOOKFOR_CPP_BASECLASS  9
+ #define LOOKFOR_ENUM_OR_INIT   10
++#define LOOKFOR_JS_KEY         11
++#define LOOKFOR_NO_COMMA       12
  
      int                whilelevel;
@@ -45844 +52445 @@
      int                iscase;
      int                lookfor_break;
-@@ -6857,83 +6898,8 @@
+@@ -6856,84 +7029,10 @@
+     int                cont_amount = 0;    /* amount for continuation line */
      int                original_line_islabel;
      int                added_to_amount = 0;
++    int                js_cur_has_key = 0;
  
 -    for (options = curbuf->b_p_cino; *options; )
@@ -45930 +52533 @@
      /* remember where the cursor was when we started */
      cur_curpos = curwin->w_cursor;
-@@ -6967,22 +6933,21 @@
+@@ -6967,22 +7066,21 @@
  
      curwin->w_cursor.col = 0;
@@ -45957 +52560 @@
         amount = 0;
      }
-@@ -7004,7 +6969,8 @@
+@@ -7004,7 +7102,8 @@
       * comment, try using the 'comments' option.
       */
@@ -45967 +52570 @@
         int     lead_start_len = 2;
         int     lead_middle_len = 1;
-@@ -7138,7 +7104,7 @@
+@@ -7138,7 +7237,7 @@
             }
             if (amount == -1)                       /* use the comment opener */
@@ -45976 +52579 @@
                     start = ml_get(trypos->lnum);
                     look = start + trypos->col + 2; /* skip / and * */
-@@ -7147,8 +7113,8 @@
+@@ -7147,18 +7246,28 @@
                 }
                 getvcol(curwin, trypos, &col, NULL, NULL);
@@ -45987 +52590 @@
         }
      }
-@@ -7156,9 +7122,9 @@
+ 
      /*
++     * Are we looking at a ']' that has a match?
++     */
++    else if (*skipwhite(theline) == ']'
++           && (trypos = find_match_char('[', curbuf->b_ind_maxparen)) != NULL)
++    {
++       /* align with the line containing the '['. */
++       amount = get_indent_lnum(trypos->lnum);
++    }
++
++    /*
       * Are we inside parentheses or braces?
       */                                                    /* XXX */
@@ -46000 +52613 @@
      {
        if (trypos != NULL && tryposBrace != NULL)
-@@ -7179,7 +7145,7 @@
+@@ -7179,7 +7288,7 @@
          * If the matching paren is more than one line away, use the indent of
          * a previous non-empty line that matches the same paren.
@@ -46009 +52622 @@
             /* Line up with the start of the matching paren line. */
             amount = get_indent_lnum(curwin->w_cursor.lnum - 1);  /* XXX */
-@@ -7198,7 +7164,7 @@
+@@ -7198,7 +7307,7 @@
                 curwin->w_cursor.lnum = lnum;
  
@@ -46018 +52631 @@
                     lnum = trypos->lnum + 1;
                     continue;
-@@ -7206,8 +7172,7 @@
+@@ -7206,8 +7315,7 @@
  
                 /* XXX */
@@ -46028 +52641 @@
                         && trypos->col == our_paren_pos.col)
                 {
-@@ -7235,7 +7200,7 @@
+@@ -7235,7 +7343,7 @@
             int     ignore_paren_col = 0;
             int     is_if_for_while = 0;
@@ -46037 +52650 @@
                 /* Look for the outermost opening parenthesis on this line
                  * and check whether it belongs to an "if", "for" or "while". */
-@@ -7250,7 +7215,7 @@
+@@ -7250,7 +7358,7 @@
                     curwin->w_cursor.lnum = outermost.lnum;
                     curwin->w_cursor.col = outermost.col;
@@ -46046 +52659 @@
  
                 curwin->w_cursor = cursor_save;
-@@ -7261,7 +7226,7 @@
+@@ -7261,7 +7369,7 @@
                     cin_is_if_for_while_before_offset(line, &outermost.col);
             }
@@ -46055 +52668 @@
             if (*look == '(')
             {
-@@ -7275,7 +7240,8 @@
+@@ -7275,7 +7383,8 @@
                 line = ml_get_curline();
                 look_col = (int)(look - line);
@@ -46065 +52678 @@
                           && trypos->lnum == our_paren_pos.lnum
                           && trypos->col < our_paren_pos.col)
-@@ -7284,24 +7250,25 @@
+@@ -7284,24 +7393,25 @@
                 curwin->w_cursor.lnum = save_lnum;
                 look = ml_get(our_paren_pos.lnum) + look_col;
@@ -46096 +52709 @@
                     {
                         /* look for opening unmatched paren, indent one level
-@@ -7323,9 +7290,9 @@
+@@ -7323,9 +7433,9 @@
                         }
  
@@ -46108 +52721 @@
                     else
                     {
-@@ -7351,12 +7318,12 @@
+@@ -7351,12 +7461,12 @@
                 }
             }
@@ -46124 +52737 @@
             {
                 if (cur_amount != MAXCOL)
-@@ -7364,39 +7331,39 @@
+@@ -7364,39 +7474,40 @@
             }
             else
@@ -46161 +52774 @@
 -                   if (find_match_paren(ind_maxparen, ind_maxcomment) != NULL)
 -                       amount += ind_unclosed2;
-+                   if (find_match_paren(curbuf->b_ind_maxparen) != NULL)
++                   if (find_match_paren_after_brace(curbuf->b_ind_maxparen)
++                                                                     != NULL)
 +                       amount += curbuf->b_ind_unclosed2;
                     else
@@ -46174 +52788 @@
                 }
                 /*
-@@ -7414,7 +7381,7 @@
+@@ -7414,16 +7525,15 @@
  
         /* add extra indent for a comment */
@@ -46181 +52795 @@
 +           amount += curbuf->b_ind_comment;
        }
- 
-       /*
-@@ -7457,8 +7424,8 @@
-             */
+-
+-      /*
+-       * Are we at least inside braces, then?
+-       */
+       else
+       {
++       /*
++        * We are inside braces, there is a { before this line at the position
++        * stored in tryposBrace.
++        */
+        trypos = tryposBrace;
+-
+        ourscope = trypos->lnum;
+        start = ml_get(ourscope);
+ 
+@@ -7445,39 +7555,40 @@
+        }
+        else
+        {
+-           /*
+-            * that opening brace might have been on a continuation
+-            * line.  if so, find the start of the line.
+-            */
++           /* That opening brace might have been on a continuation
++            * line.  if so, find the start of the line. */
+            curwin->w_cursor.lnum = ourscope;
+ 
+-           /*
+-            * position the cursor over the rightmost paren, so that
+-            * matching it will take us back to the start of the line.
+-            */
++           /* Position the cursor over the rightmost paren, so that
++            * matching it will take us back to the start of the line. */
             lnum = ourscope;
             if (find_last_paren(start, '(', ')')
@@ -46193 +52836 @@
                 lnum = trypos->lnum;
  
-            /*
-@@ -7467,11 +7434,11 @@
+-           /*
+-            * It could have been something like
++           /* It could have been something like
+             *     case 1: if (asdf &&
              *                  ldfd) {
              *              }
              */
 -           if (ind_js || (ind_keep_case_label
-+           if (curbuf->b_ind_js || (curbuf->b_ind_keep_case_label
-                           && cin_iscase(skipwhite(ml_get_curline()), FALSE)))
+-                          && cin_iscase(skipwhite(ml_get_curline()), FALSE)))
++           if ((curbuf->b_ind_js || curbuf->b_ind_keep_case_label)
++                          && cin_iscase(skipwhite(ml_get_curline()), FALSE))
                 amount = get_indent();
++           else if (curbuf->b_ind_js)
++               amount = get_indent_lnum(lnum);
             else
 -               amount = skip_label(lnum, &l, ind_maxcomment);
@@ -46208 +52856 @@
             start_brace = BRACE_AT_END;
         }
-@@ -7487,7 +7454,7 @@
+ 
++       /* For Javascript check if the line starts with "key:". */
++       if (curbuf->b_ind_js)
++           js_cur_has_key = cin_has_js_key(theline);
++
+        /*
+-        * if we're looking at a closing brace, that's where
++        * If we're looking at a closing brace, that's where
+         * we want to be.  otherwise, add the amount of room
+         * that an indent is supposed to be.
+         */
+@@ -7487,7 +7598,7 @@
              * they may want closing braces to line up with something
              * other than the open brace.  indulge them, if so.
@@ -46217 +52876 @@
         else
         {
-@@ -7500,14 +7467,12 @@
+@@ -7500,14 +7611,12 @@
             lookfor = LOOKFOR_INITIAL;
             if (cin_iselse(theline))
@@ -46234 +52893 @@
                     amount = get_indent();      /* XXX */
                     goto theend;
-@@ -7524,12 +7489,12 @@
+@@ -7524,12 +7633,12 @@
             /*
              * if the '{' is  _really_ at the left margin, use the imaginary
@@ -46249 +52908 @@
             }
             else if (start_brace == BRACE_AT_START &&
-@@ -7542,16 +7507,16 @@
+@@ -7542,16 +7651,16 @@
             {
                 if (start_brace == BRACE_AT_END)    /* '{' is at end of line */
@@ -46270 +52929 @@
                         amount = 0;
                 }
-@@ -7562,20 +7527,22 @@
+@@ -7562,20 +7671,22 @@
             if (cin_iscase(theline, FALSE))     /* it's a switch() label */
             {
@@ -46297 +52956 @@
             scope_amount = amount;
             whilelevel = 0;
-@@ -7613,14 +7580,14 @@
+@@ -7584,7 +7695,7 @@
+             * Search backwards.  If we find something we recognize, line up
+             * with that.
+             *
+-            * if we're looking at an open brace, indent
++            * If we're looking at an open brace, indent
+             * the usual amount relative to the conditional
+             * that opens the block.
+             */
+@@ -7613,14 +7724,14 @@
                     {
                         if (curwin->w_cursor.lnum == 0
@@ -46316 +52984 @@
                             break;
                         }
-@@ -7631,7 +7598,7 @@
+@@ -7631,7 +7742,7 @@
                          * If we're in a comment now, skip to the start of the
                          * comment.
@@ -46325 +52993 @@
                         {
                             curwin->w_cursor.lnum = trypos->lnum + 1;
-@@ -7656,8 +7623,7 @@
+@@ -7656,8 +7767,7 @@
                          * (it's a variable declaration).
                          */
@@ -46335 +53003 @@
                             /* if the line is terminated with another ','
                              * it is a continued variable initialization.
-@@ -7688,11 +7654,11 @@
+@@ -7688,11 +7798,11 @@
                              */                                 /* XXX */
                             trypos = NULL;
@@ -46350 +53018 @@
                             if (trypos != NULL)
                             {
-@@ -7727,8 +7693,8 @@
+@@ -7727,8 +7837,8 @@
                             amount = scope_amount;
                             if (theline[0] == '{')
@@ -46361 +53029 @@
                         }
  
-@@ -7750,7 +7716,7 @@
+@@ -7750,7 +7860,7 @@
  
                             /* If we're in a comment now, skip to the start of
@@ -46370 +53038 @@
                             {
                                 curwin->w_cursor.lnum = trypos->lnum + 1;
-@@ -7765,7 +7731,8 @@
+@@ -7765,7 +7875,8 @@
                             /* Finally the actual check for "namespace". */
                             if (cin_is_cpp_namespace(l))
@@ -46380 +53048 @@
                             }
  
-@@ -7779,7 +7746,7 @@
+@@ -7779,7 +7890,7 @@
                 /*
                  * If we're in a comment now, skip to the start of the comment.
@@ -46389 +53057 @@
                     curwin->w_cursor.lnum = trypos->lnum + 1;
                     curwin->w_cursor.col = 0;
-@@ -7833,8 +7800,8 @@
+@@ -7833,8 +7944,8 @@
                          * Check that this case label is not for another
                          * switch()
@@ -46400 +53068 @@
                             amount = get_indent();      /* XXX */
                             break;
-@@ -7877,9 +7844,10 @@
+@@ -7877,9 +7988,10 @@
                         if (l != NULL && cin_is_cinword(l))
                         {
@@ -46413 +53081 @@
                         break;
                     }
-@@ -7893,8 +7861,10 @@
+@@ -7893,8 +8005,10 @@
                      * ->   y = 1;
                      */
@@ -46426 +53094 @@
                 }
  
-@@ -7904,8 +7874,8 @@
+@@ -7904,8 +8018,8 @@
                  */
                 if (lookfor == LOOKFOR_CASE || lookfor == LOOKFOR_SCOPEDECL)
@@ -46437 +53105 @@
                         curwin->w_cursor.lnum = trypos->lnum + 1;
                         curwin->w_cursor.col = 0;
-@@ -7916,7 +7886,7 @@
+@@ -7916,7 +8030,7 @@
                 /*
                  * Ignore jump labels with nothing after them.
@@ -46446 +53114 @@
                     l = after_label(ml_get_curline());
                     if (l == NULL || cin_nocode(l))
-@@ -7939,7 +7909,7 @@
+@@ -7939,7 +8053,7 @@
                  * constructor initialization?
                  */                                                 /* XXX */
@@ -46455 +53123 @@
                     n = cin_is_cpp_baseclass(&col);
                     l = ml_get_curline();
-@@ -7962,8 +7932,7 @@
+@@ -7962,8 +8076,7 @@
                     }
                     else
@@ -46465 +53133 @@
                 }
                 else if (lookfor == LOOKFOR_CPP_BASECLASS)
-@@ -8005,9 +7974,7 @@
+@@ -7990,6 +8103,41 @@
+                 */
+                terminated = cin_isterminated(l, FALSE, TRUE);
+ 
++               if (js_cur_has_key)
++               {
++                   js_cur_has_key = 0; /* only check the first line */
++                   if (curbuf->b_ind_js && terminated == ',')
++                   {
++                       /* For Javascript we might be inside an object:
++                        *   key: something,  <- align with this
++                        *   key: something
++                        * or:
++                        *   key: something +  <- align with this
++                        *       something,
++                        *   key: something
++                        */
++                       lookfor = LOOKFOR_JS_KEY;
++                   }
++               }
++               if (lookfor == LOOKFOR_JS_KEY && cin_has_js_key(l))
++               {
++                   amount = get_indent();
++                   break;
++               }
++               if (lookfor == LOOKFOR_NO_COMMA)
++               {
++                   if (terminated != ',')
++                       /* line below current line is the one that starts a
++                        * (possibly broken) line ending in a comma. */
++                       break;
++                   amount = get_indent();
++                   if (curwin->w_cursor.lnum - 1 == ourscope)
++                       /* line above is start of the scope, thus current line
++                        * is the one that stars a (possibly broken) line
++                        * ending in a comma. */
++                       break;
++               }
++
+                if (terminated == 0 || (lookfor != LOOKFOR_UNTERM
+                                                        && terminated == ','))
+                {
+@@ -8001,13 +8149,16 @@
+                     *              bar )
+                     */
+                    /*
+-                    * position the cursor over the rightmost paren, so that
++                    * Position the cursor over the rightmost paren, so that
                      * matching it will take us back to the start of the line.
++                    * Ignore a match before the start of the block.
                      */
                     (void)find_last_paren(l, '(', ')');
@@ -46473 +53189 @@
 -                                                             ind_maxcomment);
 +                   trypos = find_match_paren(corr_ind_maxparen(&cur_curpos));
++                   if (trypos != NULL && (trypos->lnum < tryposBrace->lnum
++                               || (trypos->lnum == tryposBrace->lnum
++                                   && trypos->col < tryposBrace->col)))
++                       trypos = NULL;
  
                     /*
                      * If we are looking for ',', we also look for matching
-@@ -8015,7 +7982,7 @@
+@@ -8015,7 +8166,7 @@
                      */
                     if (trypos == NULL && terminated == ','
@@ -46485 +53205 @@
                     if (trypos != NULL)
                     {
-@@ -8058,9 +8025,8 @@
+@@ -8058,11 +8209,10 @@
                      * Get indent and pointer to text for current line,
                      * ignoring any jump label.     XXX
@@ -46492 +53212 @@
 -                       cur_amount = skip_label(curwin->w_cursor.lnum,
 -                                                         &l, ind_maxcomment);
-+                   if (!curbuf->b_ind_js)
+-                   else
++                   if (curbuf->b_ind_js)
+                        cur_amount = get_indent();
++                   else
 +                       cur_amount = skip_label(curwin->w_cursor.lnum, &l);
-                    else
-                        cur_amount = get_indent();
                     /*
-@@ -8075,16 +8041,16 @@
+                     * If this is just above the line we are indenting, and it
+                     * starts with a '{', line it up with this line.
+@@ -8075,16 +8225,16 @@
                     {
                         amount = cur_amount;
@@ -46513 +53236 @@
  
 -                       if (ind_cpp_baseclass)
-+                       if (curbuf->b_ind_cpp_baseclass)
++                       if (curbuf->b_ind_cpp_baseclass && !curbuf->b_ind_js)
                         {
                             /* have to look back, whether it is a cpp base
                              * class declaration or initialization */
-@@ -8132,10 +8098,11 @@
+@@ -8132,10 +8282,11 @@
                          */
                         amount = cur_amount;
@@ -46531 +53254 @@
                         }
  
-@@ -8169,10 +8136,9 @@
+@@ -8169,10 +8320,9 @@
                                 curwin->w_cursor.col =
                                           (colnr_T)(l - ml_get_curline()) + 1;
@@ -46545 +53268 @@
                         }
                     }
-@@ -8209,7 +8175,7 @@
+@@ -8209,7 +8359,7 @@
                              * enumerations/initializations. */
                             if (terminated == ',')
@@ -46554 +53277 @@
  
                                 lookfor = LOOKFOR_CPP_BASECLASS;
-@@ -8267,8 +8233,7 @@
+@@ -8244,8 +8394,41 @@
+                             */
+                            if (lookfor == LOOKFOR_INITIAL && terminated == ',')
+                            {
+-                               lookfor = LOOKFOR_ENUM_OR_INIT;
+-                               cont_amount = cin_first_id_amount();
++                               if (curbuf->b_ind_js)
++                               {
++                                   /* Search for a line ending in a comma
++                                    * and line up with the line below it
++                                    * (could be the current line).
++                                    * some = [
++                                    *     1,     <- line up here
++                                    *     2,
++                                    * some = [
++                                    *     3 +    <- line up here
++                                    *       4 *
++                                    *        5,
++                                    *     6,
++                                    */
++                                   lookfor = LOOKFOR_NO_COMMA;
++                                   amount = get_indent();          /* XXX */
++                                   trypos = find_match_char('[',
++                                                     curbuf->b_ind_maxparen);
++                                   if (trypos != NULL)
++                                   {
++                                       if (trypos->lnum
++                                                == curwin->w_cursor.lnum - 1)
++                                       {
++                                           /* Current line is first inside
++                                            * [], line up with it. */
++                                           break;
++                                       }
++                                       ourscope = trypos->lnum;
++                                   }
++                               }
++                               else
++                               {
++                                   lookfor = LOOKFOR_ENUM_OR_INIT;
++                                   cont_amount = cin_first_id_amount();
++                               }
+                            }
+                            else
+                            {
+@@ -8255,7 +8438,8 @@
+                                                                /* XXX */
+                                    cont_amount = cin_get_equal_amount(
+                                                       curwin->w_cursor.lnum);
+-                               if (lookfor != LOOKFOR_TERM)
++                               if (lookfor != LOOKFOR_TERM
++                                                && lookfor != LOOKFOR_JS_KEY)
+                                    lookfor = LOOKFOR_UNTERM;
+                            }
+                        }
+@@ -8266,9 +8450,7 @@
+                 * Check if we are after a while (cond);
                  * If so: Ignore until the matching "do".
                  */
-                                                        /* XXX */
+-                                                       /* XXX */
 -               else if (cin_iswhileofdo_end(terminated, ind_maxparen,
 -                                                             ind_maxcomment))
-+               else if (cin_iswhileofdo_end(terminated))
++               else if (cin_iswhileofdo_end(terminated)) /* XXX */
                 {
                     /*
                      * Found an unterminated line after a while ();, line up
-@@ -8292,7 +8257,7 @@
+@@ -8292,7 +8474,7 @@
                         lookfor = LOOKFOR_TERM;
                         amount = get_indent();      /* XXX */
@@ -46573 +53351 @@
                     ++whilelevel;
                 }
-@@ -8385,8 +8350,8 @@
+@@ -8385,8 +8567,8 @@
  term_again:
                         l = ml_get_curline();
@@ -46584 +53362 @@
                             /*
                              * Check if we are on a case label now.  This is
-@@ -8413,21 +8378,21 @@
+@@ -8413,21 +8595,21 @@
                          *      stat;
                          * }
@@ -46612 +53390 @@
  
                         /*
-@@ -8443,10 +8408,9 @@
+@@ -8443,10 +8625,9 @@
                                 && cin_iselse(l)
                                 && whilelevel == 0)
@@ -46626 +53404 @@
                             continue;
                         }
-@@ -8456,9 +8420,8 @@
+@@ -8456,9 +8637,8 @@
                          * that block.
                          */
@@ -46638 +53416 @@
                             curwin->w_cursor = *trypos;
                             /* if not "else {" check for terminated again */
-@@ -8477,11 +8440,11 @@
+@@ -8477,24 +8657,22 @@
  
        /* add extra indent for a comment */
@@ -46651 +53429 @@
 +         amount -= curbuf->b_ind_jump_label;
      }
- 
-     /*
-@@ -8502,7 +8465,7 @@
+-
+-    /*
+-     * ok -- we're not inside any sort of structure at all!
+-     *
+-     * this means we're at the top level, and everything should
+-     * basically just match where the previous line is, except
+-     * for the lines immediately following a function declaration,
+-     * which are K&R-style parameters and need to be indented.
+-     */
+     else
+     {
+        /*
++        * ok -- we're not inside any sort of structure at all!
++        *
++        * This means we're at the top level, and everything should
++        * basically just match where the previous line is, except
++        * for the lines immediately following a function declaration,
++        * which are K&R-style parameters and need to be indented.
++        *
+         * if our line starts with an open brace, forget about any
+         * prevailing indent and make sure it looks like the start
+         * of a function
+@@ -8502,7 +8680,7 @@
  
         if (theline[0] == '{')
@@ -46662 +53460 @@
  
         /*
-@@ -8519,11 +8482,10 @@
+@@ -8519,11 +8697,10 @@
                 && !cin_ends_in(theline, (char_u *)":", NULL)
                 && !cin_ends_in(theline, (char_u *)",", NULL)
@@ -46676 +53474 @@
         else
         {
-@@ -8542,7 +8504,7 @@
+@@ -8542,7 +8719,7 @@
                 /*
                  * If we're in a comment now, skip to the start of the comment.
@@ -46685 +53483 @@
                     curwin->w_cursor.lnum = trypos->lnum + 1;
                     curwin->w_cursor.col = 0;
-@@ -8554,7 +8516,7 @@
+@@ -8554,7 +8731,7 @@
                  * constructor initialization?
                  */                                                 /* XXX */
@@ -46694 +53492 @@
                     n = cin_is_cpp_baseclass(&col);
                     l = ml_get_curline();
-@@ -8562,8 +8524,7 @@
+@@ -8562,8 +8739,7 @@
                 if (n)
                 {
@@ -46704 +53502 @@
                 }
  
-@@ -8594,8 +8555,8 @@
+@@ -8594,8 +8770,8 @@
                 {
                     /* take us back to opening paren */
@@ -46715 +53513 @@
  
                     /* For a line ending in ',' that is a continuation line go
-@@ -8626,8 +8587,7 @@
+@@ -8626,8 +8802,7 @@
                  * If the line looks like a function declaration, and we're
                  * not in a comment, put it the left margin.
@@ -46725 +53523 @@
                 l = ml_get_curline();
  
-@@ -8675,10 +8635,9 @@
+@@ -8648,6 +8823,18 @@
+                    break;
+ 
+                /*
++                * If the previous line ends on '[' we are probably in an
++                * array constant:
++                * something = [
++                *     234,  <- extra indent
++                */
++               if (cin_ends_in(l, (char_u *)"[", NULL))
++               {
++                   amount = get_indent() + ind_continuation;
++                   break;
++               }
++
++               /*
+                 * Find a line only has a semicolon that belongs to a previous
+                 * line ending in '}', e.g. before an #endif.  Don't increase
+                 * indent then.
+@@ -8675,10 +8862,9 @@
                  * line (and the ones that follow) needs to be indented as
                  * parameters.
@@ -46738 +53555 @@
                 }
  
-@@ -8707,8 +8666,7 @@
+@@ -8707,8 +8893,7 @@
                  */
                 find_last_paren(l, '(', ')');
@@ -46748 +53565 @@
                 amount = get_indent();      /* XXX */
                 break;
-@@ -8716,7 +8674,7 @@
+@@ -8716,7 +8901,7 @@
  
             /* add extra indent for a comment */
@@ -46757 +53574 @@
             /* add extra indent if the previous line ended in a backslash:
              *        "asdfasdf\
-@@ -8751,11 +8709,9 @@
+@@ -8751,11 +8936,9 @@
  }
  
@@ -46770 +53587 @@
      char_u     *look;
      pos_T      *theirscope;
-@@ -8785,13 +8741,13 @@
+@@ -8785,13 +8968,13 @@
         if (cin_iselse(look)
                 || cin_isif(look)
@@ -46786 +53603 @@
                 break;
  
-@@ -8829,7 +8785,7 @@
+@@ -8829,7 +9012,7 @@
              * if it was a "while" then we need to go back to
              * another "do", so increment whilelevel.  XXX
@@ -46795 +53612 @@
                 ++whilelevel;
                 continue;
-@@ -8926,7 +8882,7 @@
+@@ -8926,7 +9109,7 @@
  {
      char_u     buf[LSIZE];
@@ -46804 +53621 @@
      while (*word != NUL)
      {
-@@ -9174,6 +9130,8 @@
+@@ -9046,10 +9229,12 @@
+                amount = 2;
+            else
+            {
++               char_u *line = that;
++
+                amount = 0;
+                while (*that && col)
+                {
+-                   amount += lbr_chartabsize_adv(&that, (colnr_T)amount);
++                   amount += lbr_chartabsize_adv(line, &that, (colnr_T)amount);
+                    col--;
+                }
+ 
+@@ -9072,7 +9257,7 @@
+ 
+                    while (vim_iswhite(*that))
+                    {
+-                       amount += lbr_chartabsize(that, (colnr_T)amount);
++                       amount += lbr_chartabsize(line, that, (colnr_T)amount);
+                        ++that;
+                    }
+ 
+@@ -9110,15 +9295,16 @@
+                                                               && !quotecount)
+                                    --parencount;
+                                if (*that == '\\' && *(that+1) != NUL)
+-                                   amount += lbr_chartabsize_adv(&that,
+-                                                            (colnr_T)amount);
+-                               amount += lbr_chartabsize_adv(&that,
+-                                                            (colnr_T)amount);
++                                   amount += lbr_chartabsize_adv(
++                                               line, &that, (colnr_T)amount);
++                               amount += lbr_chartabsize_adv(
++                                               line, &that, (colnr_T)amount);
+                            }
+                        }
+                        while (vim_iswhite(*that))
+                        {
+-                           amount += lbr_chartabsize(that, (colnr_T)amount);
++                           amount += lbr_chartabsize(
++                                                line, that, (colnr_T)amount);
+                            that++;
+                        }
+                        if (!*that || *that == ';')
+@@ -9174,6 +9360,8 @@
  /*
   * Preserve files and exit.
@@ -46813 +53675 @@
      void
  preserve_exit()
-@@ -9196,7 +9154,7 @@
+@@ -9196,7 +9384,7 @@
      {
         if (buf->b_ml.ml_mfp != NULL && buf->b_ml.ml_mfp->mf_fname != NULL)
@@ -46822 +53684 @@
             out_flush();
             ml_sync_all(FALSE, FALSE);  /* preserve all swap files */
-@@ -9206,7 +9164,7 @@
+@@ -9206,7 +9394,7 @@
  
      ml_close_all(FALSE);           /* close all memfiles, without deleting */
@@ -46831 +53693 @@
      getout(1);
  }
-@@ -10381,9 +10339,6 @@
+@@ -10381,9 +10569,6 @@
  {
      char_u     *curdir;
@@ -46841 +53703 @@
  
      if ((curdir = alloc((unsigned)MAXPATHL)) == NULL)
-@@ -10396,37 +10351,13 @@
+@@ -10396,37 +10581,13 @@
      if (path_ga.ga_len == 0)
         return 0;
@@ -46881 +53743 @@
      return gap->ga_len;
  }
-@@ -10710,7 +10641,7 @@
+@@ -10710,7 +10871,7 @@
      else
  #endif
@@ -46890 +53752 @@
      if (buffer == NULL)
         return 0;
-@@ -10773,7 +10704,7 @@
+@@ -10773,7 +10934,7 @@
         return;
  
@@ -46899 +53761 @@
  
      /* Make room for another item in the file list. */
-@@ -10810,13 +10741,16 @@
+@@ -10810,13 +10971,16 @@
  
  /*
@@ -46917 +53779 @@
      char_u     *tempname;
      char_u     *command;
-@@ -10886,7 +10820,7 @@
+@@ -10886,7 +11050,7 @@
         vim_free(buffer);
         buffer = NULL;
@@ -46926 +53788 @@
         /* Change NUL into SOH, otherwise the string is truncated. */
         for (i = 0; i < len; ++i)
-@@ -10895,6 +10829,8 @@
+@@ -10895,6 +11059,8 @@
  
         buffer[len] = NUL;      /* make sure the buffer is terminated */
@@ -46935 +53797 @@
  done:
      vim_free(tempname);
-@@ -10936,3 +10872,41 @@
+@@ -10936,3 +11102,41 @@
  {
      return (p_im && stuff_empty() && typebuf_typed());
@@ -46979 +53841 @@
 diff -Naur vim74.orig/src/misc2.c vim74/src/misc2.c
 --- vim74.orig/src/misc2.c      2013-07-07 14:03:35.000000000 +0000
-+++ vim74/src/misc2.c   2014-06-01 00:43:15.634143166 +0000
++++ vim74/src/misc2.c   2014-07-21 23:33:41.296796265 +0000
 @@ -31,9 +31,7 @@
      if (virtual_op != MAYBE)
@@ -47000 +53862 @@
                     || ((ve_flags & VE_ONEMORE) && wcol < MAXCOL)
  #endif
+@@ -205,10 +201,10 @@
+        {
+            /* Count a tab for what it's worth (if list mode not on) */
+ #ifdef FEAT_LINEBREAK
+-           csize = win_lbr_chartabsize(curwin, ptr, col, &head);
++           csize = win_lbr_chartabsize(curwin, line, ptr, col, &head);
+            mb_ptr_adv(ptr);
+ #else
+-           csize = lbr_chartabsize_adv(&ptr, col);
++           csize = lbr_chartabsize_adv(line, &ptr, col);
+ #endif
+            col += csize;
+        }
 @@ -487,7 +483,7 @@
         {
@@ -47118 +53993 @@
      }
      return s;
-@@ -3286,17 +3290,14 @@
+@@ -2152,7 +2156,8 @@
+     }
+ }
+ 
+-#if (defined(UNIX) && !defined(USE_SYSTEM)) || defined(WIN3264)
++#if (defined(UNIX) && !defined(USE_SYSTEM)) || defined(WIN3264) \
++       || defined(PROTO)
+ /*
+  * Append the text in "gap" below the cursor line and clear "gap".
+  */
+@@ -3286,17 +3291,14 @@
  {
      if (State & NORMAL)
@@ -47138 +54023 @@
      return State;
  }
-@@ -3734,7 +3735,6 @@
+@@ -3734,7 +3736,6 @@
      }
      if (finish_op)
@@ -47146 +54031 @@
      {
         if (*p_sel == 'e')
-@@ -3742,7 +3742,6 @@
+@@ -3742,7 +3743,6 @@
         else
             return SHAPE_IDX_V;
@@ -47154 +54039 @@
  }
  #endif
-@@ -4695,8 +4694,8 @@
+@@ -4695,8 +4695,8 @@
         else
         {
@@ -47165 +54050 @@
  
             if (p > search_ctx->ffsc_fix_path)
-@@ -6496,13 +6495,15 @@
+@@ -6496,13 +6496,15 @@
  get4c(fd)
      FILE       *fd;
@@ -47190 +54075 @@
 diff -Naur vim74.orig/src/move.c vim74/src/move.c
 --- vim74.orig/src/move.c       2012-11-28 17:15:42.000000000 +0000
-+++ vim74/src/move.c    2014-06-01 00:43:15.670809739 +0000
++++ vim74/src/move.c    2014-07-21 23:33:41.333462836 +0000
 @@ -20,6 +20,7 @@
  #include "vim.h"
@@ -47333 +54218 @@
 diff -Naur vim74.orig/src/netbeans.c vim74/src/netbeans.c
 --- vim74.orig/src/netbeans.c   2012-06-20 17:56:18.000000000 +0000
-+++ vim74/src/netbeans.c        2014-06-01 00:43:15.750809536 +0000
++++ vim74/src/netbeans.c        2014-07-21 23:33:41.400129329 +0000
 @@ -2232,11 +2232,9 @@
  
@@ -47348 +54233 @@
 diff -Naur vim74.orig/src/normal.c vim74/src/normal.c
 --- vim74.orig/src/normal.c     2013-07-14 11:24:37.000000000 +0000
-+++ vim74/src/normal.c  2014-06-01 00:43:15.757476185 +0000
++++ vim74/src/normal.c  2014-07-21 23:33:41.430129250 +0000
 @@ -14,17 +14,15 @@
  
@@ -48995 +55880 @@
 diff -Naur vim74.orig/src/ops.c vim74/src/ops.c
 --- vim74.orig/src/ops.c        2013-08-09 17:34:32.000000000 +0000
-+++ vim74/src/ops.c     2014-06-01 00:43:15.767476160 +0000
++++ vim74/src/ops.c     2014-07-21 23:33:41.460129172 +0000
 @@ -57,9 +57,7 @@
      char_u     **y_array;      /* pointer to array of line pointers */
@@ -49097 +55982 @@
      struct block_def   bd;
      int                        incr;
-@@ -733,14 +718,10 @@
+@@ -435,7 +420,9 @@
+        }
+        for ( ; vim_iswhite(*bd.textstart); )
+        {
+-           incr = lbr_chartabsize_adv(&bd.textstart, (colnr_T)(bd.start_vcol));
++           /* TODO: is passing bd.textstart for start of the line OK? */
++           incr = lbr_chartabsize_adv(bd.textstart, &bd.textstart,
++                                                   (colnr_T)(bd.start_vcol));
+            total += incr;
+            bd.start_vcol += incr;
+        }
+@@ -495,7 +482,7 @@
+ 
+        while (vim_iswhite(*non_white))
+        {
+-           incr = lbr_chartabsize_adv(&non_white, non_white_col);
++           incr = lbr_chartabsize_adv(bd.textstart, &non_white, non_white_col);
+            non_white_col += incr;
+        }
+ 
+@@ -520,7 +507,11 @@
+            verbatim_copy_width -= bd.start_char_vcols;
+        while (verbatim_copy_width < destination_col)
+        {
+-           incr = lbr_chartabsize(verbatim_copy_end, verbatim_copy_width);
++           char_u *line = verbatim_copy_end;
++
++           /* TODO: is passing verbatim_copy_end for start of the line OK? */
++           incr = lbr_chartabsize(line, verbatim_copy_end,
++                                                        verbatim_copy_width);
+            if (verbatim_copy_width + incr > destination_col)
+                break;
+            verbatim_copy_width += incr;
+@@ -733,14 +724,10 @@
       * there is no change still need to remove the Visual highlighting. */
      if (last_changed != 0)
@@ -49112 +56030 @@
      if (oap->line_count > p_report)
      {
-@@ -948,7 +929,6 @@
+@@ -948,7 +935,6 @@
  }
  #endif
@@ -49120 +56038 @@
   * Obtain the contents of a "normal" register. The register is made empty.
   * The returned pointer has allocated memory, use put_register() later.
-@@ -1016,10 +996,10 @@
+@@ -1016,10 +1002,10 @@
      *y_current = *(struct yankreg *)reg;
      vim_free(reg);
@@ -49133 +56051 @@
  
      void
-@@ -1034,7 +1014,6 @@
+@@ -1034,7 +1020,6 @@
      vim_free(reg);
      *y_current = tmp;
@@ -49141 +56059 @@
  #if defined(FEAT_MOUSE) || defined(PROTO)
  /*
-@@ -1634,10 +1613,8 @@
+@@ -1634,10 +1619,8 @@
      int                        n;
      linenr_T           lnum;
@@ -49152 +56070 @@
      int                        did_yank = FALSE;
      int                        orig_regname = oap->regname;
-@@ -1670,10 +1647,8 @@
+@@ -1670,10 +1653,8 @@
       * delete linewise.  Don't do this for the change command or Visual mode.
       */
@@ -49163 +56081 @@
             && oap->motion_force == NUL
             && oap->op_type == OP_DELETE)
-@@ -1787,7 +1762,6 @@
+@@ -1787,7 +1768,6 @@
         }
      }
@@ -49171 +56089 @@
       * block mode delete
       */
-@@ -1838,9 +1812,7 @@
+@@ -1838,9 +1818,7 @@
                                                        oap->end.lnum + 1, 0L);
         oap->line_count = 0;        /* no lines deleted */
@@ -49182 +56100 @@
         if (oap->op_type == OP_CHANGE)
         {
-@@ -1924,13 +1896,10 @@
+@@ -1924,13 +1902,10 @@
                 return FAIL;
  
@@ -49198 +56116 @@
  
             n = oap->end.col - oap->start.col + 1 - !oap->inclusive;
-@@ -1967,11 +1936,8 @@
+@@ -1967,11 +1942,8 @@
             }
             else
@@ -49212 +56130 @@
         }
         else                            /* delete characters between lines */
-@@ -2008,15 +1974,12 @@
+@@ -2008,15 +1980,12 @@
             {
                 /* delete from start of line until op_end */
@@ -49231 +56149 @@
      }
  
-@@ -2025,14 +1988,12 @@
+@@ -2025,14 +1994,12 @@
  #ifdef FEAT_VIRTUALEDIT
  setmarks:
@@ -49246 +56164 @@
      curbuf->b_op_start = oap->start;
  
-@@ -2074,10 +2035,15 @@
+@@ -2074,10 +2041,15 @@
      char_u             *newp, *oldp;
      size_t             oldlen;
@@ -49262 +56180 @@
      if (has_mbyte)
         mb_adjust_opend(oap);
-@@ -2164,25 +2130,44 @@
+@@ -2164,25 +2136,44 @@
             /* insert pre-spaces */
             copy_spaces(newp + bd.textcol, (size_t)bd.startspaces);
@@ -49319 +56237 @@
      }
      else
-@@ -2294,9 +2279,7 @@
+@@ -2294,9 +2285,7 @@
      oparg_T    *oap;
  {
@@ -49329 +56247 @@
  
      if (u_save((linenr_T)(oap->start.lnum - 1),
-@@ -2304,7 +2287,6 @@
+@@ -2304,7 +2293,6 @@
         return;
  
@@ -49337 +56255 @@
      {
         for (; pos.lnum <= oap->end.lnum; ++pos.lnum)
-@@ -2316,7 +2298,7 @@
+@@ -2316,7 +2304,7 @@
             one_change = swapchars(oap->op_type, &pos, bd.textlen);
             did_change |= one_change;
@@ -49346 +56264 @@
             {
                 char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
-@@ -2326,13 +2308,12 @@
+@@ -2326,13 +2314,12 @@
                 netbeans_inserted(curbuf, pos.lnum, bd.textcol,
                                                 &ptr[bd.textcol], bd.textlen);
@@ -49361 +56279 @@
         if (oap->motion_type == MLINE)
         {
-@@ -2388,11 +2369,9 @@
+@@ -2388,11 +2375,9 @@
         }
      }
@@ -49373 +56291 @@
      /*
       * Set '[ and '] marks.
-@@ -2617,6 +2596,47 @@
+@@ -2617,6 +2602,47 @@
      {
         struct block_def        bd2;
@@ -49421 +56339 @@
          * Spaces and tabs in the indent may have changed to other spaces and
          * tabs.  Get the starting column again and correct the length.
-@@ -2953,10 +2973,8 @@
+@@ -2953,10 +2979,8 @@
      if (       oap->motion_type == MCHAR
             && oap->start.col == 0
@@ -49432 +56350 @@
             && yanklines > 1)
      {
-@@ -2967,9 +2985,7 @@
+@@ -2967,9 +2991,7 @@
  
      y_current->y_size = yanklines;
@@ -49442 +56360 @@
                                                             yanklines), TRUE);
  
-@@ -2982,7 +2998,6 @@
+@@ -2982,7 +3004,6 @@
      y_idx = 0;
      lnum = oap->start.lnum;
@@ -49450 +56368 @@
      {
         /* Visual block mode */
-@@ -2992,19 +3007,16 @@
+@@ -2992,19 +3013,16 @@
         if (curwin->w_curswant == MAXCOL && y_current->y_width > 0)
             y_current->y_width--;
@@ -49470 +56388 @@
             case MLINE:
                 if ((y_current->y_array[y_idx] =
-@@ -3141,9 +3153,7 @@
+@@ -3138,12 +3156,12 @@
+        vim_free(y_current->y_array);
+        y_current = curr;
+     }
++    if (curwin->w_p_rnu)
++       redraw_later(SOME_VALID);       /* cursor moved to start */
      if (mess)                  /* Display message about yank? */
      {
@@ -49480 +56403 @@
             yanklines = 0;
         /* Some versions of Vi use ">=" here, some don't...  */
-@@ -3153,17 +3163,13 @@
+@@ -3153,17 +3171,13 @@
             update_topline_redraw();
             if (yanklines == 1)
@@ -49498 +56421 @@
                 smsg((char_u *)_("%ld lines yanked"), yanklines);
         }
-@@ -3174,11 +3180,7 @@
+@@ -3174,11 +3188,7 @@
       */
      curbuf->b_op_start = oap->start;
@@ -49511 +56434 @@
         curbuf->b_op_start.col = 0;
         curbuf->b_op_end.col = MAXCOL;
-@@ -3315,7 +3317,6 @@
+@@ -3315,7 +3325,6 @@
      long       i;                      /* index in y_array[] */
      int                y_type;
@@ -49519 +56442 @@
      long       y_width = 0;
      colnr_T    vcol;
-@@ -3323,7 +3324,6 @@
+@@ -3323,7 +3332,6 @@
      int                incr = 0;
      long       j;
@@ -49527 +56450 @@
      long       nr_lines = 0;
      pos_T      new_cursor;
-@@ -3432,14 +3432,11 @@
+@@ -3432,14 +3440,11 @@
         get_yank_register(regname, FALSE);
  
@@ -49542 +56465 @@
      {
         if (flags & PUT_LINE_SPLIT)
-@@ -3470,7 +3467,6 @@
+@@ -3470,7 +3475,6 @@
         curbuf->b_op_start = curwin->w_cursor;  /* default for '[ mark */
         curbuf->b_op_end = curwin->w_cursor;    /* default for '] mark */
@@ -49550 +56473 @@
      if (flags & PUT_LINE)      /* :put command or "p" in Visual line mode. */
         y_type = MLINE;
-@@ -3482,7 +3478,6 @@
+@@ -3482,7 +3486,6 @@
         goto end;
      }
@@ -49558 +56481 @@
      {
         lnum = curwin->w_cursor.lnum + y_size + 1;
-@@ -3491,9 +3486,7 @@
+@@ -3491,9 +3494,7 @@
         if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL)
             goto end;
@@ -49569 +56492 @@
         lnum = curwin->w_cursor.lnum;
  #ifdef FEAT_FOLDING
-@@ -3545,7 +3538,6 @@
+@@ -3545,7 +3546,6 @@
      lnum = curwin->w_cursor.lnum;
      col = curwin->w_cursor.col;
@@ -49577 +56500 @@
       * Block mode
       */
-@@ -3727,7 +3719,6 @@
+@@ -3623,7 +3623,7 @@
+            for (ptr = oldp; vcol < col && *ptr; )
+            {
+                /* Count a tab for what it's worth (if list mode not on) */
+-               incr = lbr_chartabsize_adv(&ptr, (colnr_T)vcol);
++               incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol);
+                vcol += incr;
+            }
+            bd.textcol = (colnr_T)(ptr - oldp);
+@@ -3657,7 +3657,7 @@
+            /* calculate number of spaces required to fill right side of block*/
+            spaces = y_width + 1;
+            for (j = 0; j < yanklen; j++)
+-               spaces -= lbr_chartabsize(&y_array[i][j], 0);
++               spaces -= lbr_chartabsize(NULL, &y_array[i][j], 0);
+            if (spaces < 0)
+                spaces = 0;
+ 
+@@ -3727,7 +3727,6 @@
             curwin->w_cursor.lnum = lnum;
      }
@@ -49585 +56526 @@
         /*
          * Character or Line mode
-@@ -3776,25 +3767,35 @@
+@@ -3776,25 +3775,35 @@
          */
         if (y_type == MCHAR && y_size == 1)
@@ -49638 +56579 @@
             /* For "CTRL-O p" in Insert mode, put cursor after last char */
             if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND)))
-@@ -3955,6 +3956,8 @@
+@@ -3955,6 +3964,8 @@
      if (regname == '=')
         vim_free(y_array);
@@ -49647 +56588 @@
      adjust_cursor_eol();
  }
-@@ -4005,7 +4008,8 @@
+@@ -4005,7 +4016,8 @@
  #  endif
  # endif
@@ -49657 +56598 @@
         ;
  }
-@@ -4319,17 +4323,20 @@
+@@ -4319,17 +4331,20 @@
  /*
   * Join 'count' lines (minimal 2) at cursor position.
@@ -49681 +56622 @@
      char_u     *curr = NULL;
      char_u      *curr_start = NULL;
-@@ -4380,6 +4387,12 @@
+@@ -4380,6 +4395,12 @@
      for (t = 0; t < count; ++t)
      {
@@ -49694 +56635 @@
         if (remove_comments)
         {
-@@ -4496,6 +4509,13 @@
+@@ -4496,6 +4517,13 @@
      }
      ml_replace(curwin->w_cursor.lnum, newp, FALSE);
@@ -49708 +56649 @@
       * the deleted line. */
      changed_lines(curwin->w_cursor.lnum, currsize,
-@@ -4631,11 +4651,9 @@
+@@ -4631,11 +4659,9 @@
         return;
      curwin->w_cursor = oap->start;
@@ -49720 +56661 @@
      /* Set '[ mark at the start of the formatted area */
      curbuf->b_op_start = oap->start;
-@@ -4667,7 +4685,6 @@
+@@ -4667,7 +4693,6 @@
         saved_cursor.lnum = 0;
      }
@@ -49728 +56669 @@
      {
         win_T   *wp;
-@@ -4685,7 +4702,6 @@
+@@ -4685,7 +4710,6 @@
             }
         }
@@ -49736 +56677 @@
  
  #if defined(FEAT_EVAL) || defined(PROTO)
-@@ -4696,11 +4712,9 @@
+@@ -4696,11 +4720,9 @@
  op_formatexpr(oap)
      oparg_T    *oap;
@@ -49748 +56689 @@
      if (fex_format(oap->start.lnum, oap->line_count, NUL) != 0)
         /* As documented: when 'formatexpr' returns non-zero fall back to
-@@ -4971,7 +4985,7 @@
+@@ -4971,7 +4993,7 @@
  
             /*
@@ -49757 +56698 @@
             if (!is_end_par)
             {
-@@ -4981,13 +4995,27 @@
+@@ -4981,13 +5003,27 @@
                 if (line_count < 0 && u_save_cursor() == FAIL)
                     break;
@@ -49787 +56728 @@
                     beep_flush();
                     break;
-@@ -5126,7 +5154,6 @@
+@@ -5126,7 +5162,6 @@
      return FALSE;
  }
@@ -49795 +56736 @@
   * prepare a few things for block mode yank/delete/tilde
   *
-@@ -5285,7 +5312,6 @@
+@@ -5174,7 +5209,7 @@
+     while (bdp->start_vcol < oap->start_vcol && *pstart)
+     {
+        /* Count a tab for what it's worth (if list mode not on) */
+-       incr = lbr_chartabsize(pstart, (colnr_T)bdp->start_vcol);
++       incr = lbr_chartabsize(line, pstart, (colnr_T)bdp->start_vcol);
+        bdp->start_vcol += incr;
+ #ifdef FEAT_VISUALEXTRA
+        if (vim_iswhite(*pstart))
+@@ -5243,7 +5278,10 @@
+            {
+                /* Count a tab for what it's worth (if list mode not on) */
+                prev_pend = pend;
+-               incr = lbr_chartabsize_adv(&pend, (colnr_T)bdp->end_vcol);
++               /* TODO: is passing prev_pend for start of the line OK?
++                * perhaps it should be "line". */
++               incr = lbr_chartabsize_adv(prev_pend, &pend,
++                                                     (colnr_T)bdp->end_vcol);
+                bdp->end_vcol += incr;
+            }
+            if (bdp->end_vcol <= oap->end_vcol
+@@ -5285,7 +5323,6 @@
      bdp->textcol = (colnr_T) (pstart - line);
      bdp->textstart = pstart;
@@ -49803 +56765 @@
  #ifdef FEAT_RIGHTLEFT
  static void reverse_line __ARGS((char_u *s));
-@@ -5636,19 +5662,13 @@
+@@ -5636,19 +5673,13 @@
         str = skipwhite(skiptowhite(str));
         if (STRNCMP(str, "CHAR", 4) == 0)
@@ -49823 +56785 @@
  
      while (!(eof = viminfo_readline(virp))
-@@ -5756,11 +5776,9 @@
+@@ -5756,11 +5787,9 @@
             case MCHAR:
                 type = (char_u *)"CHAR";
@@ -49835 +56797 @@
                 sprintf((char *)IObuff, _("E574: Unknown register type %d"),
                                                             y_regs[i].y_type);
-@@ -5774,13 +5792,7 @@
+@@ -5774,13 +5803,7 @@
         fprintf(fp, "\"%c", c);
         if (c == execreg_lastc)
@@ -49850 +56812 @@
         /* If max_num_lines < 0, then we save ALL the lines in the register */
         if (max_num_lines > 0 && num_lines > max_num_lines)
-@@ -5927,10 +5939,8 @@
+@@ -5927,10 +5950,8 @@
  {
      struct yankreg *old_y_previous, *old_y_current;
@@ -49861 +56823 @@
      int                old_set_curswant;
      pos_T      old_op_start, old_op_end;
-@@ -5951,10 +5961,8 @@
+@@ -5951,10 +5972,8 @@
         old_set_curswant = curwin->w_set_curswant;
         old_op_start = curbuf->b_op_start;
@@ -49872 +56834 @@
         oa.regname = (cbd == &clip_plus ? '+' : '*');
         oa.op_type = OP_YANK;
-@@ -5972,10 +5980,8 @@
+@@ -5972,10 +5991,8 @@
         curwin->w_set_curswant = old_set_curswant;
         curbuf->b_op_start = old_op_start;
@@ -49883 +56845 @@
      else
      {
-@@ -6005,7 +6011,7 @@
+@@ -6005,7 +6022,7 @@
  
      clip_free_selection(cbd);
@@ -49892 +56854 @@
  
  /*
-@@ -6078,7 +6084,6 @@
+@@ -6078,7 +6095,6 @@
  }
  
@@ -49900 +56862 @@
   * If we have written to a clipboard register, send the text to the clipboard.
   */
-@@ -6096,7 +6101,6 @@
+@@ -6096,7 +6112,6 @@
         clip_gen_set_selection(&clip_plus);
      }
@@ -49908 +56870 @@
  #endif /* FEAT_CLIPBOARD || PROTO */
  
-@@ -6115,7 +6119,7 @@
+@@ -6115,7 +6130,7 @@
      curr = y_current;
      y_current = &y_regs[TILDE_REGISTER];
@@ -49917 +56879 @@
  }
  #endif
-@@ -6154,30 +6158,63 @@
+@@ -6154,30 +6169,63 @@
      regname = may_get_selection(regname);
  #endif
@@ -49987 +56949 @@
      long       i;
      char_u     *retval;
-@@ -6187,13 +6224,11 @@
+@@ -6187,13 +6235,11 @@
      /* Don't allow using an expression register inside an expression */
      if (regname == '=')
@@ -50006 +56968 @@
  
      if (regname == '@')            /* "@@" is used for unnamed register */
-@@ -6211,15 +6246,33 @@
+@@ -6211,15 +6257,33 @@
      {
         if (retval == NULL)
@@ -50043 +57005 @@
       * Compute length of resulting string.
       */
-@@ -6261,6 +6314,47 @@
+@@ -6261,6 +6325,47 @@
      return retval;
  }
@@ -50091 +57053 @@
   * Store string "str" in register "name".
   * "maxlen" is the maximum number of bytes to use, -1 for all bytes.
-@@ -6281,6 +6375,51 @@
+@@ -6281,6 +6386,51 @@
  }
  
@@ -50143 +57105 @@
      int                name;
      char_u     *str;
-@@ -6317,45 +6456,22 @@
+@@ -6317,45 +6467,22 @@
             s = concat_str(get_expr_line_src(), p);
             vim_free(p);
@@ -50194 +57156 @@
  #endif /* FEAT_EVAL */
  
-@@ -6365,12 +6481,13 @@
+@@ -6365,12 +6492,13 @@
   * is appended.
   */
@@ -50209 +57171 @@
      int                type;                   /* MCHAR, MLINE or MBLOCK */
      int                lnum;
-@@ -6381,16 +6498,16 @@
+@@ -6381,16 +6509,16 @@
      int                extraline = 0;          /* extra line at the end */
      int                append = FALSE;         /* append to last line in register */
@@ -50229 +57191 @@
      else
         type = yank_type;
-@@ -6399,18 +6516,26 @@
+@@ -6399,18 +6527,26 @@
       * Count the number of lines within the string
       */
@@ -50265 +57227 @@
  
      /*
-@@ -6425,58 +6550,65 @@
+@@ -6425,58 +6561,65 @@
         pp[lnum] = y_ptr->y_array[lnum];
      vim_free(y_ptr->y_array);
@@ -50367 +57329 @@
  #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */
  
-@@ -6570,12 +6702,10 @@
+@@ -6570,12 +6713,10 @@
      long       word_count_cursor = 0;
      int                eol_size;
@@ -50380 +57342 @@
      /*
       * Compute the length of the file in characters.
-@@ -6591,7 +6721,6 @@
+@@ -6591,7 +6732,6 @@
         else
             eol_size = 1;
@@ -50388 +57350 @@
         {
             if (lt(VIsual, curwin->w_cursor))
-@@ -6635,7 +6764,6 @@
+@@ -6635,7 +6775,6 @@
             }
             line_count_selected = max_pos.lnum - min_pos.lnum + 1;
@@ -50396 +57358 @@
         for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum)
         {
-@@ -6648,7 +6776,6 @@
+@@ -6648,7 +6787,6 @@
                 last_check = byte_count + 100000L;
             }
@@ -50404 +57366 @@
             if (VIsual_active
                     && lnum >= min_pos.lnum && lnum <= max_pos.lnum)
-@@ -6659,13 +6786,13 @@
+@@ -6659,13 +6797,13 @@
                 switch (VIsual_mode)
                 {
@@ -50422 +57384 @@
                         len = (long)bd.textlen;
                         break;
-@@ -6697,7 +6824,6 @@
+@@ -6697,7 +6835,6 @@
                 }
             }
@@ -50430 +57392 @@
                 /* In non-visual mode, check for the line the cursor is on */
                 if (lnum == curwin->w_cursor.lnum)
-@@ -6719,7 +6845,6 @@
+@@ -6719,7 +6856,6 @@
         if (!curbuf->b_p_eol && curbuf->b_p_bin)
             byte_count -= eol_size;
@@ -50438 +57400 @@
         {
             if (VIsual_mode == Ctrl_V && curwin->w_curswant < MAXCOL)
-@@ -6750,7 +6875,6 @@
+@@ -6750,13 +6886,13 @@
                         byte_count_cursor, byte_count);
         }
@@ -50446 +57408 @@
             p = ml_get_curline();
             validate_virtcol();
+            col_print(buf1, sizeof(buf1), (int)curwin->w_cursor.col + 1,
+                    (int)curwin->w_virtcol + 1);
+-           col_print(buf2, sizeof(buf2), (int)STRLEN(p), linetabsize(p));
++           col_print(buf2, sizeof(buf2), (int)STRLEN(p),
++                               linetabsize(p));
+ 
+            if (char_count_cursor == byte_count_cursor
+                    && char_count == byte_count)
 diff -Naur vim74.orig/src/option.c vim74/src/option.c
 --- vim74.orig/src/option.c     2013-07-17 19:39:13.000000000 +0000
-+++ vim74/src/option.c  2014-06-01 00:43:15.777476134 +0000
++++ vim74/src/option.c  2014-07-21 23:33:41.516795691 +0000
 @@ -134,6 +134,7 @@
  #define PV_KP          OPT_BOTH(OPT_BUF(BV_KP))
@@ -50457 +57427 @@
  #define PV_MA          OPT_BUF(BV_MA)
  #define PV_ML          OPT_BUF(BV_ML)
-@@ -234,6 +235,7 @@
+@@ -187,6 +188,10 @@
+ #ifdef FEAT_ARABIC
+ # define PV_ARAB       OPT_WIN(WV_ARAB)
+ #endif
++#ifdef FEAT_LINEBREAK
++# define PV_BRI                OPT_WIN(WV_BRI)
++# define PV_BRIOPT     OPT_WIN(WV_BRIOPT)
++#endif
+ #ifdef FEAT_DIFF
+ # define PV_DIFF       OPT_WIN(WV_DIFF)
+ #endif
+@@ -234,6 +239,7 @@
  #ifdef FEAT_STL_OPT
  # define PV_STL                OPT_BOTH(OPT_WIN(WV_STL))
@@ -50465 +57446 @@
  # define PV_WFH                OPT_WIN(WV_WFH)
  #endif
-@@ -1627,11 +1629,7 @@
+@@ -646,6 +652,24 @@
+                            {(char_u *)0L, (char_u *)0L}
+ #endif
+                            SCRIPTID_INIT},
++    {"breakindent",   "bri",  P_BOOL|P_VI_DEF|P_VIM|P_RWIN,
++#ifdef FEAT_LINEBREAK
++                           (char_u *)VAR_WIN, PV_BRI,
++                           {(char_u *)FALSE, (char_u *)0L}
++#else
++                           (char_u *)NULL, PV_NONE,
++                           {(char_u *)0L, (char_u *)0L}
++#endif
++                           SCRIPTID_INIT},
++    {"breakindentopt", "briopt", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_COMMA|P_NODUP,
++#ifdef FEAT_LINEBREAK
++                           (char_u *)VAR_WIN, PV_BRIOPT,
++                           {(char_u *)"", (char_u *)NULL}
++#else
++                           (char_u *)NULL, PV_NONE,
++                           {(char_u *)"", (char_u *)NULL}
++#endif
++                           SCRIPTID_INIT},
+     {"browsedir",   "bsdir",P_STRING|P_VI_DEF,
+ #ifdef FEAT_BROWSE
+                            (char_u *)&p_bsdir, PV_NONE,
+@@ -1390,7 +1414,7 @@
+                            SCRIPTID_INIT},
+     {"history",            "hi",   P_NUM|P_VIM,
+                            (char_u *)&p_hi, PV_NONE,
+-                           {(char_u *)0L, (char_u *)20L} SCRIPTID_INIT},
++                           {(char_u *)0L, (char_u *)50L} SCRIPTID_INIT},
+     {"hkmap",      "hk",   P_BOOL|P_VI_DEF|P_VIM,
+ #ifdef FEAT_RIGHTLEFT
+                            (char_u *)&p_hkmap, PV_NONE,
+@@ -1627,11 +1651,7 @@
  #endif
                             SCRIPTID_INIT},
@@ -50477 +57492 @@
      {"keywordprg",  "kp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
                             (char_u *)&p_kp, PV_KP,
-@@ -1654,7 +1652,7 @@
+@@ -1654,7 +1674,7 @@
  #endif
  #endif
@@ -50486 +57501 @@
                             (char_u *)&p_langmap, PV_NONE,
                             {(char_u *)"",      /* unmatched } */
-@@ -1717,7 +1715,7 @@
+@@ -1717,7 +1737,7 @@
                             {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
      {"lispwords",   "lw",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
@@ -50495 +57510 @@
  #else
                             (char_u *)NULL, PV_NONE,
-@@ -2188,19 +2186,11 @@
+@@ -2188,19 +2208,11 @@
                             (char_u *)&p_secure, PV_NONE,
                             {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
@@ -50515 +57530 @@
      {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  #ifdef FEAT_SESSION
-@@ -2683,7 +2673,7 @@
+@@ -2683,7 +2695,7 @@
  #endif
                             {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
@@ -50524 +57539 @@
  #if defined(UNIX) || defined(WIN3264) || defined(OS2) || defined(VMS)
                             (char_u *)1000L,
-@@ -2977,13 +2967,9 @@
+@@ -2977,13 +2989,9 @@
  static char *(p_wak_values[]) = {"yes", "menu", "no", NULL};
  #endif
@@ -50538 +57553 @@
  static char *(p_bsdir_values[]) = {"current", "last", "buffer", NULL};
  #endif
-@@ -3313,6 +3299,7 @@
+@@ -3066,6 +3074,7 @@
+ static char_u *get_varp_scope __ARGS((struct vimoption *p, int opt_flags));
+ static char_u *get_varp __ARGS((struct vimoption *));
+ static void option_value2string __ARGS((struct vimoption *, int opt_flags));
++static void check_winopt __ARGS((winopt_T *wop));
+ static int wc_use_keyname __ARGS((char_u *varp, long *wcp));
+ #ifdef FEAT_LANGMAP
+ static void langmap_init __ARGS((void));
+@@ -3313,6 +3322,7 @@
  
      curbuf->b_p_initialized = TRUE;
@@ -50546 +57569 @@
      check_win_options(curwin);
      check_options();
-@@ -3817,37 +3804,7 @@
+@@ -3817,37 +3827,7 @@
      else
         do_sp = !(options[idx_sp].flags & P_WAS_SET);
@@ -50585 +57608 @@
      {
         /*
-@@ -3888,6 +3845,7 @@
+@@ -3888,6 +3868,7 @@
                     || fnamecmp(p, "zsh") == 0
                     || fnamecmp(p, "zsh-beta") == 0
@@ -50593 +57616 @@
                     || fnamecmp(p, "cmd") == 0
                     || fnamecmp(p, "sh.exe") == 0
-@@ -4512,8 +4470,16 @@
+@@ -4512,8 +4493,16 @@
                                                 ((flags & P_VI_DEF) || cp_val)
                                                  ?  VI_DEFAULT : VIM_DEFAULT];
@@ -50612 +57635 @@
                                     || (long *)varp == &p_wcm)
                                 && (*arg == '<'
-@@ -5372,6 +5338,7 @@
+@@ -5290,6 +5279,9 @@
+     /* set cedit_key */
+     (void)check_cedit();
+ #endif
++#ifdef FEAT_LINEBREAK
++    briopt_check();
++#endif
+ }
+ 
+ /*
+@@ -5372,6 +5364,7 @@
  #ifdef FEAT_CINDENT
      check_string_option(&buf->b_p_cink);
@@ -50620 +57653 @@
  #ifdef FEAT_AUTOCMD
      check_string_option(&buf->b_p_ft);
-@@ -5401,6 +5368,9 @@
+@@ -5401,6 +5394,9 @@
      check_string_option(&buf->b_p_dict);
      check_string_option(&buf->b_p_tsr);
@@ -50630 +57663 @@
  
  /*
-@@ -6563,7 +6533,6 @@
+@@ -5739,6 +5735,14 @@
+                     *p_pm == '.' ? p_pm + 1 : p_pm) == 0)
+            errmsg = (char_u *)N_("E589: 'backupext' and 'patchmode' are equal");
+     }
++#ifdef FEAT_LINEBREAK
++    /* 'breakindentopt' */
++    else if (varp == &curwin->w_p_briopt)
++    {
++       if (briopt_check() == FAIL)
++           errmsg = e_invarg;
++    }
++#endif
+ 
+     /*
+      * 'isident', 'iskeyword', 'isprint or 'isfname' option: refill chartab[]
+@@ -6563,7 +6567,6 @@
      }
  #endif
@@ -50638 +57686 @@
      else if (varp == &p_sel)
      {
-@@ -6578,7 +6547,6 @@
+@@ -6578,7 +6581,6 @@
         if (check_opt_strings(p_slm, p_slm_values, TRUE) != OK)
             errmsg = e_invarg;
@@ -50646 +57694 @@
  #ifdef FEAT_BROWSE
      /* 'browsedir' */
-@@ -6590,7 +6558,6 @@
+@@ -6590,7 +6592,6 @@
      }
  #endif
@@ -50654 +57702 @@
      else if (varp == &p_km)
      {
-@@ -6602,7 +6569,6 @@
+@@ -6602,7 +6603,6 @@
             km_startsel = (vim_strchr(p_km, 'a') != NULL);
         }
@@ -50662 +57710 @@
      /* 'mousemodel' */
      else if (varp == &p_mousem)
-@@ -6990,6 +6956,15 @@
+@@ -6990,6 +6990,15 @@
      }
  #endif
@@ -50678 +57726 @@
      else
      {
-@@ -7102,6 +7077,11 @@
+@@ -7102,6 +7111,11 @@
         if (varp == &(curwin->w_s->b_p_spl))
         {
@@ -50690 +57738 @@
             /*
              * Source the spell/LANG.vim in 'runtimepath'.
-@@ -7109,11 +7089,10 @@
+@@ -7109,11 +7123,10 @@
              * Use the first name in 'spelllang' up to '_region' or
              * '.encoding'.
@@ -50704 +57752 @@
         }
  #endif
-@@ -7791,7 +7770,7 @@
+@@ -7791,7 +7804,7 @@
      /* when 'hlsearch' is set or reset: reset no_hlsearch */
      else if ((int *)varp == &p_hls)
@@ -50713 +57761 @@
  #endif
  
-@@ -8338,14 +8317,24 @@
+@@ -8338,14 +8351,24 @@
             curwin->w_p_fdc = 12;
         }
@@ -50739 +57787 @@
  #ifdef FEAT_MBYTE
      /* 'maxcombine' */
-@@ -8467,6 +8456,13 @@
+@@ -8467,6 +8490,13 @@
         u_sync(TRUE);
         p_ul = value;
@@ -50753 +57801 @@
  #ifdef FEAT_LINEBREAK
      /* 'numberwidth' must be positive */
-@@ -8820,7 +8816,7 @@
+@@ -8599,6 +8629,11 @@
+        errmsg = e_positive;
+        p_hi = 0;
+     }
++    else if (p_hi > 10000)
++    {
++       errmsg = e_invarg;
++       p_hi = 10000;
++    }
+     if (p_re < 0 || p_re > 2)
+     {
+        errmsg = e_invarg;
+@@ -8820,7 +8855,7 @@
  }
  #endif
@@ -50762 +57822 @@
   * Returns the option attributes and its value. Unlike the above function it
   * will return either global value or local value of the option depending on
-@@ -8833,7 +8829,8 @@
+@@ -8833,7 +8868,8 @@
   * opt_type). Uses
   *
@@ -50772 +57832 @@
   *
   * Possible opt_type values: see SREQ_* in vim.h
-@@ -8956,6 +8953,68 @@
+@@ -8956,6 +8992,68 @@
  
      return r;
@@ -50841 +57901 @@
  
  /*
-@@ -9700,7 +9759,6 @@
+@@ -9700,7 +9798,6 @@
  /*
   * Unset local option value, similar to ":set opt<".
@@ -50849 +57909 @@
  unset_global_local_option(name, from)
      char_u     *name;
-@@ -9773,6 +9831,14 @@
+@@ -9773,6 +9870,14 @@
             clear_string_option(&((win_T *)from)->w_p_stl);
             break;
@@ -50864 +57924 @@
  }
  
-@@ -9821,6 +9887,10 @@
+@@ -9821,6 +9926,10 @@
  #ifdef FEAT_STL_OPT
             case PV_STL:  return (char_u *)&(curwin->w_p_stl);
@@ -50875 +57935 @@
         return NULL; /* "cannot happen" */
      }
-@@ -9885,6 +9955,12 @@
+@@ -9885,6 +9994,12 @@
         case PV_STL:    return *curwin->w_p_stl != NUL
                                     ? (char_u *)&(curwin->w_p_stl) : p->var;
@@ -50888 +57948 @@
  #ifdef FEAT_ARABIC
         case PV_ARAB:   return (char_u *)&(curwin->w_p_arab);
-@@ -10425,6 +10501,7 @@
+@@ -9937,6 +10052,8 @@
+        case PV_WRAP:   return (char_u *)&(curwin->w_p_wrap);
+ #ifdef FEAT_LINEBREAK
+        case PV_LBR:    return (char_u *)&(curwin->w_p_lbr);
++       case PV_BRI:    return (char_u *)&(curwin->w_p_bri);
++       case PV_BRIOPT: return (char_u *)&(curwin->w_p_briopt);
+ #endif
+ #ifdef FEAT_SCROLLBIND
+        case PV_SCBIND: return (char_u *)&(curwin->w_p_scb);
+@@ -10126,6 +10243,8 @@
+ #endif
+ #ifdef FEAT_LINEBREAK
+     to->wo_lbr = from->wo_lbr;
++    to->wo_bri = from->wo_bri;
++    to->wo_briopt = vim_strsave(from->wo_briopt);
+ #endif
+ #ifdef FEAT_SCROLLBIND
+     to->wo_scb = from->wo_scb;
+@@ -10187,7 +10306,7 @@
+ /*
+  * Check for NULL pointers in a winopt_T and replace them with empty_option.
+  */
+-    void
++    static void
+ check_winopt(wop)
+     winopt_T   *wop UNUSED;
+ {
+@@ -10213,6 +10332,9 @@
+ #ifdef FEAT_CONCEAL
+     check_string_option(&wop->wo_cocu);
+ #endif
++#ifdef FEAT_LINEBREAK
++    check_string_option(&wop->wo_briopt);
++#endif
+ }
+ 
+ /*
+@@ -10232,6 +10354,9 @@
+ # endif
+     clear_string_option(&wop->wo_fmr);
+ #endif
++#ifdef FEAT_LINEBREAK
++    clear_string_option(&wop->wo_briopt);
++#endif
+ #ifdef FEAT_RIGHTLEFT
+     clear_string_option(&wop->wo_rlc);
+ #endif
+@@ -10425,6 +10550,7 @@
             /* options that are normally global but also have a local value
              * are not copied, start using the global value */
@@ -50896 +58003 @@
             buf->b_p_gp = empty_option;
             buf->b_p_mp = empty_option;
-@@ -10457,6 +10534,9 @@
+@@ -10457,6 +10583,9 @@
  #ifdef FEAT_PERSISTENT_UNDO
             buf->b_p_udf = p_udf;
@@ -50906 +58013 @@
             /*
              * Don't copy the options set by ex_help(), use the saved values,
-@@ -11729,9 +11809,10 @@
+@@ -11729,9 +11858,10 @@
   * 'tabstop' value when 'shiftwidth' is zero.
   */
@@ -50919 +58026 @@
  
  /*
-@@ -11741,7 +11822,7 @@
+@@ -11741,7 +11871,7 @@
      long
  get_sts_value()
@@ -50928 +58035 @@
  
  /*
+@@ -11841,3 +11971,49 @@
+            ++ptr;
+     }
+ }
++
++#if defined(FEAT_LINEBREAK) || defined(PROTO)
++/*
++ * This is called when 'breakindentopt' is changed and when a window is
++ * initialized.
++ */
++    int
++briopt_check()
++{
++    char_u     *p;
++    int                bri_shift = 0;
++    long       bri_min = 20;
++    int                bri_sbr = FALSE;
++
++    p = curwin->w_p_briopt;
++    while (*p != NUL)
++    {
++       if (STRNCMP(p, "shift:", 6) == 0
++                && ((p[6] == '-' && VIM_ISDIGIT(p[7])) || VIM_ISDIGIT(p[6])))
++       {
++           p += 6;
++           bri_shift = getdigits(&p);
++       }
++       else if (STRNCMP(p, "min:", 4) == 0 && VIM_ISDIGIT(p[4]))
++       {
++           p += 4;
++           bri_min = getdigits(&p);
++       }
++       else if (STRNCMP(p, "sbr", 3) == 0)
++       {
++           p += 3;
++           bri_sbr = TRUE;
++       }
++       if (*p != ',' && *p != NUL)
++           return FAIL;
++       if (*p == ',')
++           ++p;
++    }
++
++    curwin->w_p_brishift = bri_shift;
++    curwin->w_p_brimin   = bri_min;
++    curwin->w_p_brisbr   = bri_sbr;
++
++    return OK;
++}
++#endif
 diff -Naur vim74.orig/src/option.h vim74/src/option.h
 --- vim74.orig/src/option.h     2013-06-26 16:41:39.000000000 +0000
-+++ vim74/src/option.h  2014-06-01 00:43:15.780809459 +0000
++++ vim74/src/option.h  2014-07-21 23:33:41.546795613 +0000
 @@ -31,9 +31,9 @@
  #     define DFLT_EFM  "%A%p^,%C%%CC-%t-%m,%Cat line number %l in file %f,%f|%l| %m"
@@ -50990 +58147 @@
      , BV_COUNT     /* must be the last one */
  };
-@@ -1109,3 +1108,6 @@
+@@ -1053,6 +1052,10 @@
+ #ifdef FEAT_CURSORBIND
+     , WV_CRBIND
+ #endif
++#ifdef FEAT_LINEBREAK
++    , WV_BRI
++    , WV_BRIOPT
++#endif
+ #ifdef FEAT_DIFF
+     , WV_DIFF
+ #endif
+@@ -1109,3 +1112,6 @@
      , WV_WRAP
      , WV_COUNT     /* must be the last one */
@@ -50999 +58167 @@
 diff -Naur vim74.orig/src/os_amiga.c vim74/src/os_amiga.c
 --- vim74.orig/src/os_amiga.c   2013-05-06 02:06:04.000000000 +0000
-+++ vim74/src/os_amiga.c        2014-06-01 00:43:15.794142759 +0000
++++ vim74/src/os_amiga.c        2014-07-21 23:33:41.560128911 +0000
 @@ -884,8 +884,9 @@
   * Return -1 if unknown.
@@ -51013 +58181 @@
 diff -Naur vim74.orig/src/os_dos.h vim74/src/os_dos.h
 --- vim74.orig/src/os_dos.h     2013-06-12 18:09:44.000000000 +0000
-+++ vim74/src/os_dos.h  2014-06-01 00:43:15.837475982 +0000
++++ vim74/src/os_dos.h  2014-07-21 23:33:41.600128807 +0000
 @@ -109,7 +109,7 @@
  #endif
@@ -51034 +58202 @@
 diff -Naur vim74.orig/src/os_mac.h vim74/src/os_mac.h
 --- vim74.orig/src/os_mac.h     2013-05-06 02:06:04.000000000 +0000
-+++ vim74/src/os_mac.h  2014-06-01 00:43:15.847475956 +0000
++++ vim74/src/os_mac.h  2014-07-21 23:33:41.610128781 +0000
 @@ -16,6 +16,11 @@
  # define OPAQUE_TOOLBOX_STRUCTS 0
@@ -51058 +58226 @@
 diff -Naur vim74.orig/src/os_msdos.c vim74/src/os_msdos.c
 --- vim74.orig/src/os_msdos.c   2013-05-06 02:06:04.000000000 +0000
-+++ vim74/src/os_msdos.c        2014-06-01 00:43:15.950809026 +0000
++++ vim74/src/os_msdos.c        2014-07-21 23:33:41.723461818 +0000
 @@ -2270,9 +2270,7 @@
                 default:
@@ -51100 +58268 @@
 diff -Naur vim74.orig/src/os_mswin.c vim74/src/os_mswin.c
 --- vim74.orig/src/os_mswin.c   2013-06-16 14:41:11.000000000 +0000
-+++ vim74/src/os_mswin.c        2014-06-01 00:43:15.970808975 +0000
++++ vim74/src/os_mswin.c        2014-07-21 23:33:41.773461688 +0000
 @@ -456,7 +456,14 @@
      int
@@ -51508 +58676 @@
 diff -Naur vim74.orig/src/os_os2_cfg.h vim74/src/os_os2_cfg.h
 --- vim74.orig/src/os_os2_cfg.h 2010-05-15 11:04:11.000000000 +0000
-+++ vim74/src/os_os2_cfg.h      2014-06-01 00:43:15.987475600 +0000
++++ vim74/src/os_os2_cfg.h      2014-07-21 23:33:41.796794960 +0000
 @@ -47,7 +47,7 @@
  #undef UNIX    /* define always by current configure script */
@@ -51520 +58688 @@
 diff -Naur vim74.orig/src/os_qnx.c vim74/src/os_qnx.c
 --- vim74.orig/src/os_qnx.c     2011-09-21 17:48:08.000000000 +0000
-+++ vim74/src/os_qnx.c  2014-06-01 00:43:16.000808899 +0000
++++ vim74/src/os_qnx.c  2014-07-21 23:33:41.810128259 +0000
 @@ -78,9 +78,7 @@
                 default: /* fallthrough to line type */
@@ -51543 +58711 @@
 diff -Naur vim74.orig/src/os_unix.c vim74/src/os_unix.c
 --- vim74.orig/src/os_unix.c    2013-07-03 14:32:32.000000000 +0000
-+++ vim74/src/os_unix.c 2014-06-01 00:43:16.020808848 +0000
++++ vim74/src/os_unix.c 2014-07-21 23:33:41.840128181 +0000
 @@ -46,6 +46,14 @@
  static int selinux_enabled = -1;
@@ -51815 +58983 @@
  #  ifdef FEAT_GUI
             && !gui.in_use
-@@ -3601,32 +3740,49 @@
+@@ -3601,26 +3740,40 @@
  # endif
  
@@ -51857 +59025 @@
         del_mouse_termcode(KS_PTERM_MOUSE);
  # endif
- # ifdef FEAT_MOUSE_URXVT
-     /* same as the dec mouse */
-     if (use_xterm_mouse() == 3
-+#  ifdef FEAT_TERMRESPONSE
-+           && !did_request_esc_sequence()
-+#  endif
- #  ifdef FEAT_GUI
-            && !gui.in_use
- #  endif
-@@ -3641,12 +3797,13 @@
+@@ -3641,12 +3794,14 @@
             mch_setmouse(FALSE);
             setmouse();
         }
-+       xterm_conflict_mouse = TRUE;
++       /* It's OK to request the xterm version for uxterm. */
++       resume_get_esc_sequence();
      }
      else
@@ -51881 +59041 @@
  #  ifdef FEAT_GUI
             && !gui.in_use
-@@ -5028,6 +5185,7 @@
+@@ -5028,6 +5183,7 @@
      return avail;
  }
@@ -51889 +59049 @@
   * Wait "msec" msec until a character is available from file descriptor "fd".
   * "msec" == 0 will check for characters once.
-@@ -5327,13 +5485,7 @@
+@@ -5327,13 +5483,7 @@
         }
  # endif
@@ -51903 +59063 @@
         if (ret == -1 && errno == EINTR)
         {
-@@ -5455,8 +5607,6 @@
+@@ -5455,8 +5605,6 @@
      return (ret > 0);
  }
@@ -51912 +59072 @@
  /*
   * Expand a path into all matching files and/or directories.  Handles "*",
-@@ -5569,7 +5719,7 @@
+@@ -5569,7 +5717,7 @@
                     continue;
  
@@ -51921 +59081 @@
  
                 if (--files_free == 0)
-@@ -5979,7 +6129,7 @@
+@@ -5979,7 +6127,7 @@
         {
             /* If there is a NUL, set did_find_nul, else set check_spaces */
@@ -51930 +59090 @@
             else
                 check_spaces = TRUE;
-@@ -6067,7 +6217,7 @@
+@@ -6067,7 +6215,7 @@
             continue;
  
@@ -51939 +59099 @@
  
         p = alloc((unsigned)(STRLEN((*file)[i]) + 1 + dir));
-@@ -6294,7 +6444,7 @@
+@@ -6294,7 +6442,7 @@
  
  /* Reads gpm event and adds special keys to input buf. Returns length of
@@ -51950 +59110 @@
 diff -Naur vim74.orig/src/os_unix.h vim74/src/os_unix.h
 --- vim74.orig/src/os_unix.h    2013-06-12 18:09:44.000000000 +0000
-+++ vim74/src/os_unix.h 2014-06-01 00:43:16.040808797 +0000
++++ vim74/src/os_unix.h 2014-07-21 23:33:41.860128129 +0000
 @@ -225,6 +225,8 @@
  # include <starlet.h>
@@ -51991 +59151 @@
 diff -Naur vim74.orig/src/os_vms.c vim74/src/os_vms.c
 --- vim74.orig/src/os_vms.c     2010-06-26 04:03:31.000000000 +0000
-+++ vim74/src/os_vms.c  2014-06-01 00:43:16.060808746 +0000
++++ vim74/src/os_vms.c  2014-07-21 23:33:41.880128076 +0000
 @@ -11,6 +11,23 @@
  
@@ -52239 +59399 @@
 diff -Naur vim74.orig/src/os_vms_conf.h vim74/src/os_vms_conf.h
 --- vim74.orig/src/os_vms_conf.h        2010-07-28 17:07:48.000000000 +0000
-+++ vim74/src/os_vms_conf.h     2014-06-01 00:43:16.077475370 +0000
++++ vim74/src/os_vms_conf.h     2014-07-21 23:33:41.906794673 +0000
 @@ -23,7 +23,7 @@
  #define HAVE_DATE_TIME
@@ -52281 +59441 @@
 diff -Naur vim74.orig/src/os_win16.h vim74/src/os_win16.h
 --- vim74.orig/src/os_win16.h   2013-05-06 02:06:04.000000000 +0000
-+++ vim74/src/os_win16.h        2014-06-01 00:43:16.150808517 +0000
++++ vim74/src/os_win16.h        2014-07-21 23:33:41.966794517 +0000
 @@ -55,8 +55,8 @@
  
@@ -52295 +59455 @@
 diff -Naur vim74.orig/src/os_win32.c vim74/src/os_win32.c
 --- vim74.orig/src/os_win32.c   2013-08-10 10:39:12.000000000 +0000
-+++ vim74/src/os_win32.c        2014-06-01 00:43:16.187475090 +0000
++++ vim74/src/os_win32.c        2014-07-21 23:33:42.003461088 +0000
 @@ -78,16 +78,6 @@
  # endif
@@ -52423 +59583 @@
      if (!OpenProcessToken(GetCurrentProcess(),
                 TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken))
+@@ -541,7 +619,7 @@
+        return FALSE;
+     }
+ 
+-    tokenPrivileges.PrivilegeCount           = 1;
++    tokenPrivileges.PrivilegeCount          = 1;
+     tokenPrivileges.Privileges[0].Luid       = luid;
+     tokenPrivileges.Privileges[0].Attributes = bEnable ?
+                                                    SE_PRIVILEGE_ENABLED : 0;
 @@ -573,6 +651,10 @@
  
@@ -52501 +59670 @@
             if (did_create_conin)
                 read_error_exit();
-@@ -1800,7 +1882,7 @@
+@@ -1703,13 +1785,14 @@
+ #endif
+            {
+                int     n = 1;
++               int     conv = FALSE;
+ 
+-               /* A key may have one or two bytes. */
+                typeahead[typeaheadlen] = c;
+                if (ch2 != NUL)
+                {
+-                   typeahead[typeaheadlen + 1] = ch2;
+-                   ++n;
++                   typeahead[typeaheadlen + 1] = 3;
++                   typeahead[typeaheadlen + 2] = ch2;
++                   n += 2;
+                }
+ #ifdef FEAT_MBYTE
+                /* Only convert normal characters, not special keys.  Need to
+@@ -1718,6 +1801,7 @@
+                if (input_conv.vc_type != CONV_NONE
+                                                && (ch2 == NUL || c != K_NUL))
+                {
++                   conv = TRUE;
+                    typeaheadlen -= unconverted;
+                    n = convert_input_safe(typeahead + typeaheadlen,
+                                n + unconverted, TYPEAHEADLEN - typeaheadlen,
+@@ -1725,6 +1809,24 @@
+                }
+ #endif
+ 
++               if (conv)
++               {
++                   char_u *p = typeahead + typeaheadlen;
++                   char_u *e = typeahead + TYPEAHEADLEN;
++
++                   while (*p && p < e)
++                   {
++                       if (*p == K_NUL)
++                       {
++                           ++p;
++                           mch_memmove(p + 1, p, ((size_t)(e - p)) - 1);
++                           *p = 3;
++                           ++n;
++                       }
++                       ++p;
++                   }
++               }
++
+                /* Use the ALT key to set the 8th bit of the character
+                 * when it's one byte, the 8th bit isn't set yet and not
+                 * using a double-byte encoding (would become a lead
+@@ -1800,7 +1902,7 @@
   * TODO: Should somehow check if it's really executable.
   */
@@ -52510 +59730 @@
      char       *dum;
      char       fname[_MAX_PATH];
-@@ -1823,6 +1905,8 @@
+@@ -1823,6 +1925,8 @@
                     return FALSE;
                 if (GetFileAttributesW(fnamew) & FILE_ATTRIBUTE_DIRECTORY)
@@ -52519 +59739 @@
             }
             /* Retry with non-wide function (for Windows 98). */
-@@ -1833,6 +1917,8 @@
+@@ -1833,6 +1937,8 @@
         return FALSE;
      if (mch_isdir(fname))
@@ -52528 +59748 @@
  }
  
-@@ -1914,7 +2000,7 @@
+@@ -1914,7 +2020,7 @@
             vimrun_path = (char *)vim_strsave(vimrun_location);
             s_dont_use_vimrun = FALSE;
@@ -52537 +59757 @@
  
         /* Don't give the warning for a missing vimrun.exe right now, but only
-@@ -1928,7 +2014,7 @@
+@@ -1928,7 +2034,7 @@
       * If "finstr.exe" doesn't exist, use "grep -n" for 'grepprg'.
       * Otherwise the default "findstr /n" is used.
@@ -52546 +59766 @@
  
  #ifdef FEAT_CLIPBOARD
-@@ -2500,9 +2586,125 @@
+@@ -2500,9 +2606,125 @@
  }
  
@@ -52672 +59892 @@
      void
  fname_case(
-@@ -2520,11 +2722,44 @@
+@@ -2520,11 +2742,44 @@
      int                        slen;
  
@@ -52718 +59938 @@
      porig = name;
      ptrue = szTrueName;
-@@ -2534,8 +2769,8 @@
+@@ -2534,8 +2789,8 @@
         /* copy leading drive letter */
         *ptrue++ = *porig++;
@@ -52728 +59948 @@
      while (*porig != NUL)
      {
-@@ -2629,6 +2864,28 @@
+@@ -2629,6 +2884,28 @@
      char szUserName[256 + 1];  /* UNLEN is 256 */
      DWORD cch = sizeof szUserName;
@@ -52757 +59977 @@
      {
         vim_strncpy(s, szUserName, len - 1);
-@@ -2649,6 +2906,28 @@
+@@ -2649,6 +2926,28 @@
  {
      DWORD cch = len;
@@ -52786 +60006 @@
         vim_strncpy(s, "PC (Win32 Vim)", len - 1);
  }
-@@ -2695,6 +2974,8 @@
+@@ -2695,6 +2994,8 @@
                 return OK;
             }
@@ -52795 +60015 @@
      }
  #endif
-@@ -2702,18 +2983,17 @@
+@@ -2702,18 +3003,17 @@
  }
  
@@ -52818 +60038 @@
  
  
-@@ -2736,7 +3016,7 @@
+@@ -2736,7 +3036,7 @@
         {
             n = _wchmod(p, perm);
@@ -52827 +60047 @@
             /* Retry with non-wide function (for Windows 98). */
         }
-@@ -2955,8 +3235,7 @@
+@@ -2955,8 +3255,7 @@
   * -1 : error
   * else FILE_ATTRIBUTE_* defined in winnt.h
@@ -52837 +60057 @@
  {
      int                attr;
-@@ -3055,7 +3334,7 @@
+@@ -3055,7 +3354,7 @@
   * Return -1 if unknown.
   */
@@ -52846 +60066 @@
      char_u     buf[_MAX_PATH];
      int                len = (int)STRLEN(name);
-@@ -3068,7 +3347,7 @@
+@@ -3068,7 +3367,7 @@
       * this with a Unix-shell like 'shell'. */
      if (vim_strchr(gettail(name), '.') != NULL
@@ -52855 +60075 @@
  
      /*
-@@ -3090,7 +3369,7 @@
+@@ -3090,7 +3389,7 @@
         }
         else
@@ -52864 +60084 @@
      }
      return FALSE;
-@@ -3107,6 +3386,9 @@
+@@ -3107,6 +3406,9 @@
  {
      HANDLE     hFile;
@@ -52874 +60094 @@
      /* We can't open a file with a name "\\.\con" or "\\.\prn" and trying to
       * read from it later will cause Vim to hang.  Thus return NODE_WRITABLE
-@@ -3114,14 +3396,41 @@
+@@ -3114,14 +3416,41 @@
      if (STRNCMP(name, "\\\\.\\", 4) == 0)
         return NODE_WRITABLE;
@@ -52923 +60143 @@
         return NODE_NORMAL;
  
-@@ -3618,6 +3927,50 @@
+@@ -3618,6 +3947,50 @@
  }
  #endif /* FEAT_GUI_W32 */
@@ -52974 +60194 @@
  
  #if defined(FEAT_GUI_W32) || defined(PROTO)
-@@ -3664,18 +4017,8 @@
+@@ -3664,18 +4037,8 @@
         cmd += 3;
  
@@ -52995 +60215 @@
      /* Wait for the command to terminate before continuing */
      if (g_PlatformId != VER_PLATFORM_WIN32s)
-@@ -4007,22 +4350,11 @@
+@@ -4007,22 +4370,11 @@
             p = cmd;
      }
@@ -53023 +60243 @@
      if (p != cmd)
         vim_free(p);
-@@ -4049,10 +4381,10 @@
+@@ -4049,10 +4401,10 @@
      {
         MSG     msg;
@@ -53036 +60256 @@
  
         /* write pipe information in the window */
-@@ -4240,7 +4572,25 @@
+@@ -4240,7 +4592,25 @@
  }
  #else
@@ -53063 +60283 @@
  #endif
  
-@@ -4325,6 +4675,7 @@
+@@ -4325,6 +4695,7 @@
             DWORD               flags = CREATE_NEW_CONSOLE;
             char_u              *p;
@@ -53071 +60291 @@
             si.lpReserved = NULL;
             si.lpDesktop = NULL;
-@@ -4408,16 +4759,7 @@
+@@ -4408,16 +4779,7 @@
              * inherit our handles which causes unpleasant dangling swap
              * files if we exit before the spawned process
@@ -53089 +60309 @@
             else
             {
-@@ -4430,9 +4772,9 @@
+@@ -4430,9 +4792,9 @@
             if (newcmd != cmdbase)
                 vim_free(newcmd);
@@ -53101 +60321 @@
             }
             /* Close the handles to the subprocess, so that it goes away */
-@@ -5716,7 +6058,7 @@
+@@ -5716,7 +6078,7 @@
         {
             f = _wopen(wn, flags, mode);
@@ -53110 +60330 @@
             /* Retry with non-wide function (for Windows 98). Can't use
              * GetLastError() here and it's unclear what errno gets set to if
-@@ -5767,7 +6109,7 @@
+@@ -5767,7 +6129,7 @@
         _set_fmode(oldMode);
  # endif
@@ -53119 +60339 @@
         /* Retry with non-wide function (for Windows 98). Can't use
          * GetLastError() here and it's unclear what errno gets set to if
-@@ -6102,6 +6444,7 @@
+@@ -6102,6 +6464,7 @@
                     while (i > 0)
                         free(argv[--i]);
@@ -53129 +60349 @@
 diff -Naur vim74.orig/src/os_win32.h vim74/src/os_win32.h
 --- vim74.orig/src/os_win32.h   2013-07-21 15:53:13.000000000 +0000
-+++ vim74/src/os_win32.h        2014-06-01 00:43:16.214141689 +0000
++++ vim74/src/os_win32.h        2014-07-21 23:33:42.043460983 +0000
 @@ -68,7 +68,7 @@
  #endif
@@ -53161 +60381 @@
 diff -Naur vim74.orig/src/osdef.sh vim74/src/osdef.sh
 --- vim74.orig/src/osdef.sh     2010-05-15 11:04:08.000000000 +0000
-+++ vim74/src/osdef.sh  2014-06-01 00:43:16.220808339 +0000
++++ vim74/src/osdef.sh  2014-07-21 23:33:42.050127633 +0000
 @@ -47,11 +47,7 @@
  #endif
@@ -53175 +60395 @@
  # insert a space in front of each line, so that a function name at the
  # start of the line is matched with "[)*,      ]\1[    (]"
+diff -Naur vim74.orig/src/po/Makefile vim74/src/po/Makefile
+--- vim74.orig/src/po/Makefile  2013-06-23 11:26:12.000000000 +0000
++++ vim74/src/po/Makefile       2014-07-21 23:33:42.136794073 +0000
+@@ -1,5 +1,8 @@
+ # Makefile for the Vim message translations.
+ 
++# Include stuff found by configure.
++include ../auto/config.mk
++
+ # TODO make this configurable
+ # Note: ja.sjis, *.cp1250 and zh_CN.cp936 are only for MS-Windows, they are
+ # not installed on Unix
+@@ -133,7 +136,7 @@
+ # tools 0.10.37, which use a slightly different .po file format that is not
+ # compatible with Solaris (and old gettext implementations) unless these are
+ # set.  gettext 0.10.36 will not work!
+-MSGFMT = OLD_PO_FILE_INPUT=yes msgfmt -v
++MSGFMTCMD = OLD_PO_FILE_INPUT=yes $(MSGFMT) -v
+ XGETTEXT = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes xgettext
+ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes msgmerge
+ 
+@@ -142,7 +145,7 @@
+ .PHONY: all install uninstall prefixcheck converted check clean checkclean distclean update-po $(LANGUAGES) $(CONVERTED)
+ 
+ .po.mo:
+-       $(MSGFMT) -o $@ $<
++       $(MSGFMTCMD) -o $@ $<
+ 
+ .po.ck:
+        $(VIM) -u NONE -e -X -S check.vim -c "if error == 0 | q | endif" -c cq $<
 diff -Naur vim74.orig/src/po/ca.po vim74/src/po/ca.po
 --- vim74.orig/src/po/ca.po     2012-01-18 18:40:35.000000000 +0000
-+++ vim74/src/po/ca.po  2014-06-01 00:43:16.347474683 +0000
++++ vim74/src/po/ca.po  2014-07-21 23:33:42.186793943 +0000
 @@ -448,7 +448,7 @@
  msgid "E691: Can only compare List with List"
@@ -53189 +60439 @@
 diff -Naur vim74.orig/src/po/de.po vim74/src/po/de.po
 --- vim74.orig/src/po/de.po     2013-01-23 12:04:20.000000000 +0000
-+++ vim74/src/po/de.po  2014-06-01 00:43:16.460807728 +0000
++++ vim74/src/po/de.po  2014-07-21 23:33:42.256793760 +0000
 @@ -426,7 +426,7 @@
  msgid "E691: Can only compare List with List"
@@ -53201 +60451 @@
 diff -Naur vim74.orig/src/po/eo.po vim74/src/po/eo.po
 --- vim74.orig/src/po/eo.po     2013-05-27 18:40:27.000000000 +0000
-+++ vim74/src/po/eo.po  2014-06-01 00:43:16.487474326 +0000
++++ vim74/src/po/eo.po  2014-07-21 23:33:42.300126980 +0000
 @@ -23,8 +23,8 @@
  msgstr ""
@@ -53960 +61210 @@
 diff -Naur vim74.orig/src/po/es.po vim74/src/po/es.po
 --- vim74.orig/src/po/es.po     2011-05-19 10:45:41.000000000 +0000
-+++ vim74/src/po/es.po  2014-06-01 00:43:16.504140951 +0000
++++ vim74/src/po/es.po  2014-07-21 23:33:42.306793630 +0000
 @@ -582,8 +582,8 @@
  msgstr "E691: Solo se puede comparar una lista con otra lista"
@@ -53974 +61224 @@
 diff -Naur vim74.orig/src/po/fi.po vim74/src/po/fi.po
 --- vim74.orig/src/po/fi.po     2013-04-20 13:49:08.000000000 +0000
-+++ vim74/src/po/fi.po  2014-06-01 00:43:16.510807600 +0000
++++ vim74/src/po/fi.po  2014-07-21 23:33:42.326793578 +0000
 @@ -471,7 +471,7 @@
  msgid "E691: Can only compare List with List"
@@ -53986 +61236 @@
 diff -Naur vim74.orig/src/po/fr.po vim74/src/po/fr.po
 --- vim74.orig/src/po/fr.po     2013-05-27 08:41:50.000000000 +0000
-+++ vim74/src/po/fr.po  2014-06-01 00:43:16.527474225 +0000
++++ vim74/src/po/fr.po  2014-07-21 23:33:42.353460175 +0000
 @@ -543,8 +543,8 @@
  msgid "E691: Can only compare List with List"
@@ -54000 +61250 @@
 diff -Naur vim74.orig/src/po/ga.po vim74/src/po/ga.po
 --- vim74.orig/src/po/ga.po     2011-05-19 10:46:33.000000000 +0000
-+++ vim74/src/po/ga.po  2014-06-01 00:43:16.540807524 +0000
++++ vim74/src/po/ga.po  2014-07-21 23:33:42.366793473 +0000
 @@ -443,7 +443,7 @@
  msgid "E691: Can only compare List with List"
@@ -54012 +61262 @@
 diff -Naur vim74.orig/src/po/it.po vim74/src/po/it.po
 --- vim74.orig/src/po/it.po     2013-08-10 11:31:45.000000000 +0000
-+++ vim74/src/po/it.po  2014-06-01 00:43:16.590807397 +0000
++++ vim74/src/po/it.po  2014-07-21 23:33:42.436793291 +0000
 @@ -477,7 +477,7 @@
  msgid "E691: Can only compare List with List"
@@ -54024 +61274 @@
 diff -Naur vim74.orig/src/po/ja.euc-jp.po vim74/src/po/ja.euc-jp.po
 --- vim74.orig/src/po/ja.euc-jp.po      2013-07-06 10:53:48.000000000 +0000
-+++ vim74/src/po/ja.euc-jp.po   2014-06-01 00:43:16.594140721 +0000
++++ vim74/src/po/ja.euc-jp.po   2014-07-21 23:33:42.473459862 +0000
 @@ -3,7 +3,7 @@
  # Do ":help uganda"  in Vim to read copying and usage conditions.
@@ -54045 +61295 @@
 diff -Naur vim74.orig/src/po/ja.po vim74/src/po/ja.po
 --- vim74.orig/src/po/ja.po     2013-07-06 06:04:57.000000000 +0000
-+++ vim74/src/po/ja.po  2014-06-01 00:43:16.640807269 +0000
++++ vim74/src/po/ja.po  2014-07-21 23:33:42.513459757 +0000
 @@ -3,7 +3,7 @@
  # Do ":help uganda"  in Vim to read copying and usage conditions.
@@ -54066 +61316 @@
 diff -Naur vim74.orig/src/po/ja.sjis.po vim74/src/po/ja.sjis.po
 --- vim74.orig/src/po/ja.sjis.po        2013-08-10 12:28:27.000000000 +0000
-+++ vim74/src/po/ja.sjis.po     2014-06-01 00:43:16.647473919 +0000
++++ vim74/src/po/ja.sjis.po     2014-07-21 23:33:42.560126302 +0000
 @@ -3,7 +3,7 @@
  # Do ":help uganda"  in Vim to read copying and usage conditions.
@@ -54087 +61337 @@
 diff -Naur vim74.orig/src/po/ko.UTF-8.po vim74/src/po/ko.UTF-8.po
 --- vim74.orig/src/po/ko.UTF-8.po       2011-05-19 10:47:30.000000000 +0000
-+++ vim74/src/po/ko.UTF-8.po    2014-06-01 00:43:16.650807244 +0000
++++ vim74/src/po/ko.UTF-8.po    2014-07-21 23:33:42.596792873 +0000
 @@ -462,7 +462,7 @@
  msgid "E691: Can only compare List with List"
@@ -54099 +61349 @@
 diff -Naur vim74.orig/src/po/ko.po vim74/src/po/ko.po
 --- vim74.orig/src/po/ko.po     2011-05-19 10:47:53.000000000 +0000
-+++ vim74/src/po/ko.po  2014-06-01 00:43:16.657473894 +0000
++++ vim74/src/po/ko.po  2014-07-21 23:33:42.633459444 +0000
 @@ -462,7 +462,7 @@
  msgid "E691: Can only compare List with List"
@@ -54111 +61361 @@
 diff -Naur vim74.orig/src/po/nb.po vim74/src/po/nb.po
 --- vim74.orig/src/po/nb.po     2011-05-19 11:12:47.000000000 +0000
-+++ vim74/src/po/nb.po  2014-06-01 00:43:16.660807218 +0000
++++ vim74/src/po/nb.po  2014-07-21 23:33:42.653459392 +0000
 @@ -456,8 +456,8 @@
  msgid "E691: Can only compare List with List"
@@ -54125 +61375 @@
 diff -Naur vim74.orig/src/po/nl.po vim74/src/po/nl.po
 --- vim74.orig/src/po/nl.po     2013-07-09 12:55:16.000000000 +0000
-+++ vim74/src/po/nl.po  2014-06-01 00:43:16.667473868 +0000
++++ vim74/src/po/nl.po  2014-07-21 23:33:42.680125989 +0000
 @@ -458,8 +458,8 @@
  msgid "E691: Can only compare List with List"
@@ -54139 +61389 @@
 diff -Naur vim74.orig/src/po/no.po vim74/src/po/no.po
 --- vim74.orig/src/po/no.po     2011-05-19 10:48:14.000000000 +0000
-+++ vim74/src/po/no.po  2014-06-01 00:43:16.670807193 +0000
++++ vim74/src/po/no.po  2014-07-21 23:33:42.706792586 +0000
 @@ -456,8 +456,8 @@
  msgid "E691: Can only compare List with List"
@@ -54153 +61403 @@
 diff -Naur vim74.orig/src/po/pl.UTF-8.po vim74/src/po/pl.UTF-8.po
 --- vim74.orig/src/po/pl.UTF-8.po       2013-07-09 12:25:44.000000000 +0000
-+++ vim74/src/po/pl.UTF-8.po    2014-06-01 00:43:16.677473843 +0000
-@@ -14,7 +14,7 @@
++++ vim74/src/po/pl.UTF-8.po    2014-07-21 23:33:42.740125832 +0000
+@@ -12,9 +12,10 @@
+ "POT-Creation-Date: 2013-07-06 19:33+0200\n"
+ "PO-Revision-Date: 2010-08-10 18:15+0200\n"
  "Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n"
++"Language-Team: \n"
  "Language: pl\n"
  "MIME-Version: 1.0\n"
@@ -54163 +61416 @@
  "X-Generator: Lokalize 1.0\n"
  "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-@@ -475,7 +475,7 @@
+@@ -475,7 +476,7 @@
  msgid "E691: Can only compare List with List"
  msgstr "E691: Listę mogę porównać tylko z ListÄ
@@ -54175 +61428 @@
 diff -Naur vim74.orig/src/po/pl.cp1250.po vim74/src/po/pl.cp1250.po
 --- vim74.orig/src/po/pl.cp1250.po      2013-08-10 12:28:27.000000000 +0000
-+++ vim74/src/po/pl.cp1250.po   2014-06-01 00:43:16.684140492 +0000
-@@ -14,7 +14,7 @@
++++ vim74/src/po/pl.cp1250.po   2014-07-21 23:33:42.793459027 +0000
+@@ -12,9 +12,10 @@
+ "POT-Creation-Date: 2013-07-06 19:33+0200\n"
+ "PO-Revision-Date: 2010-08-10 18:15+0200\n"
  "Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n"
++"Language-Team: \n"
  "Language: pl\n"
  "MIME-Version: 1.0\n"
@@ -54185 +61441 @@
  "X-Generator: Lokalize 1.0\n"
  "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-@@ -475,7 +475,7 @@
+@@ -475,7 +476,7 @@
  msgid "E691: Can only compare List with List"
  msgstr "E691: Listê mogê porównaæ tylko z List¹"
@@ -54196 +61452 @@
 diff -Naur vim74.orig/src/po/pl.po vim74/src/po/pl.po
 --- vim74.orig/src/po/pl.po     2013-07-09 12:25:10.000000000 +0000
-+++ vim74/src/po/pl.po  2014-06-01 00:43:16.690807142 +0000
-@@ -475,7 +475,7 @@
++++ vim74/src/po/pl.po  2014-07-21 23:33:42.833458922 +0000
+@@ -12,6 +12,7 @@
+ "POT-Creation-Date: 2013-07-06 19:33+0200\n"
+ "PO-Revision-Date: 2010-08-10 18:15+0200\n"
+ "Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n"
++"Language-Team: \n"
+ "Language: pl\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-2\n"
+@@ -475,7 +476,7 @@
  msgid "E691: Can only compare List with List"
  msgstr "E691: Listê mogê porównaæ tylko z List±"
@@ -54208 +61472 @@
 diff -Naur vim74.orig/src/po/pt_BR.po vim74/src/po/pt_BR.po
 --- vim74.orig/src/po/pt_BR.po  2011-05-19 10:49:11.000000000 +0000
-+++ vim74/src/po/pt_BR.po       2014-06-01 00:43:16.697473792 +0000
++++ vim74/src/po/pt_BR.po       2014-07-21 23:33:42.866792169 +0000
 @@ -438,8 +438,8 @@
  msgid "E691: Can only compare List with List"
@@ -54222 +61486 @@
 diff -Naur vim74.orig/src/po/ru.cp1251.po vim74/src/po/ru.cp1251.po
 --- vim74.orig/src/po/ru.cp1251.po      2013-08-10 12:28:27.000000000 +0000
-+++ vim74/src/po/ru.cp1251.po   2014-06-01 00:43:16.704140441 +0000
++++ vim74/src/po/ru.cp1251.po   2014-07-21 23:33:42.910125389 +0000
 @@ -3,14 +3,14 @@
  # Îá óñëîâèÿõ èñïîëüçîâàíèÿ ÷èòàéòå â ðåäàêòîðå Vim ":help uganda"
@@ -54483 +61747 @@
 diff -Naur vim74.orig/src/po/ru.po vim74/src/po/ru.po
 --- vim74.orig/src/po/ru.po     2013-07-09 12:36:10.000000000 +0000
-+++ vim74/src/po/ru.po  2014-06-01 00:43:16.710807091 +0000
++++ vim74/src/po/ru.po  2014-07-21 23:33:42.953458609 +0000
 @@ -3,14 +3,14 @@
  # Об услПвОяÑ
@@ -54752 +62016 @@
 diff -Naur vim74.orig/src/po/sk.cp1250.po vim74/src/po/sk.cp1250.po
 --- vim74.orig/src/po/sk.cp1250.po      2013-08-10 12:28:27.000000000 +0000
-+++ vim74/src/po/sk.cp1250.po   2014-06-01 00:43:16.734140365 +0000
++++ vim74/src/po/sk.cp1250.po   2014-07-21 23:33:42.986791855 +0000
 @@ -414,8 +414,8 @@
  msgid "E691: Can only compare List with List"
@@ -54766 +62030 @@
 diff -Naur vim74.orig/src/po/sk.po vim74/src/po/sk.po
 --- vim74.orig/src/po/sk.po     2011-05-19 10:50:14.000000000 +0000
-+++ vim74/src/po/sk.po  2014-06-01 00:43:16.740807015 +0000
++++ vim74/src/po/sk.po  2014-07-21 23:33:43.016791777 +0000
 @@ -414,8 +414,8 @@
  msgid "E691: Can only compare List with List"
@@ -54780 +62044 @@
 diff -Naur vim74.orig/src/po/sv.po vim74/src/po/sv.po
 --- vim74.orig/src/po/sv.po     2011-05-19 10:50:27.000000000 +0000
-+++ vim74/src/po/sv.po  2014-06-01 00:43:16.744140339 +0000
++++ vim74/src/po/sv.po  2014-07-21 23:33:43.043458374 +0000
 @@ -433,8 +433,8 @@
  msgid "E691: Can only compare List with List"
@@ -54794 +62058 @@
 diff -Naur vim74.orig/src/po/uk.cp1251.po vim74/src/po/uk.cp1251.po
 --- vim74.orig/src/po/uk.cp1251.po      2013-08-10 12:28:27.000000000 +0000
-+++ vim74/src/po/uk.cp1251.po   2014-06-01 00:43:16.754140314 +0000
++++ vim74/src/po/uk.cp1251.po   2014-07-21 23:33:43.086791595 +0000
 @@ -2,19 +2,17 @@
  # Ukrainian Vim translation [uk]
@@ -55636 +62900 @@
 diff -Naur vim74.orig/src/po/uk.po vim74/src/po/uk.po
 --- vim74.orig/src/po/uk.po     2013-01-17 12:11:55.000000000 +0000
-+++ vim74/src/po/uk.po  2014-06-01 00:43:16.790806887 +0000
++++ vim74/src/po/uk.po  2014-07-21 23:33:43.130124815 +0000
 @@ -2,19 +2,17 @@
  # Ukrainian Vim translation [uk]
@@ -56488 +63752 @@
 diff -Naur vim74.orig/src/po/zh_CN.UTF-8.po vim74/src/po/zh_CN.UTF-8.po
 --- vim74.orig/src/po/zh_CN.UTF-8.po    2012-04-20 11:48:11.000000000 +0000
-+++ vim74/src/po/zh_CN.UTF-8.po 2014-06-01 00:43:16.830806785 +0000
++++ vim74/src/po/zh_CN.UTF-8.po 2014-07-21 23:33:43.186791334 +0000
 @@ -434,7 +434,7 @@
  msgid "E691: Can only compare List with List"
@@ -56500 +63764 @@
 diff -Naur vim74.orig/src/po/zh_CN.cp936.po vim74/src/po/zh_CN.cp936.po
 --- vim74.orig/src/po/zh_CN.cp936.po    2013-08-10 12:28:27.000000000 +0000
-+++ vim74/src/po/zh_CN.cp936.po 2014-06-01 00:43:16.834140110 +0000
++++ vim74/src/po/zh_CN.cp936.po 2014-07-21 23:33:43.220124580 +0000
 @@ -435,7 +435,7 @@
  msgid "E691: Can only compare List with List"
@@ -56521 +63785 @@
 diff -Naur vim74.orig/src/po/zh_CN.po vim74/src/po/zh_CN.po
 --- vim74.orig/src/po/zh_CN.po  2011-05-19 10:52:13.000000000 +0000
-+++ vim74/src/po/zh_CN.po       2014-06-01 00:43:16.840806760 +0000
++++ vim74/src/po/zh_CN.po       2014-07-21 23:33:43.240124528 +0000
 @@ -435,7 +435,7 @@
  msgid "E691: Can only compare List with List"
@@ -56533 +63797 @@
 diff -Naur vim74.orig/src/popupmnu.c vim74/src/popupmnu.c
 --- vim74.orig/src/popupmnu.c   2011-08-17 16:04:28.000000000 +0000
-+++ vim74/src/popupmnu.c        2014-06-01 00:43:16.890806633 +0000
++++ vim74/src/popupmnu.c        2014-07-21 23:33:43.323457644 +0000
 @@ -282,6 +282,10 @@
      int                round;
@@ -56545 +63809 @@
      {
         thumb_heigth = pum_height * pum_height / pum_size;
-@@ -672,10 +676,6 @@
+@@ -563,7 +567,9 @@
+            g_do_tagpreview = 3;
+            if (p_pvh > 0 && p_pvh < g_do_tagpreview)
+                g_do_tagpreview = p_pvh;
++           ++RedrawingDisabled;
+            resized = prepare_tagpreview(FALSE);
++           --RedrawingDisabled;
+            g_do_tagpreview = 0;
+ 
+            if (curwin->w_p_pvw)
+@@ -672,10 +678,6 @@
  #endif
      }
@@ -56558 +63832 @@
 diff -Naur vim74.orig/src/proto/blowfish.pro vim74/src/proto/blowfish.pro
 --- vim74.orig/src/proto/blowfish.pro   2013-08-10 11:37:06.000000000 +0000
-+++ vim74/src/proto/blowfish.pro        2014-06-01 00:43:16.927473206 +0000
++++ vim74/src/proto/blowfish.pro        2014-07-21 23:33:43.370124189 +0000
 @@ -1,6 +1,6 @@
  /* blowfish.c */
@@ -56567 +63841 @@
  void bf_crypt_decode __ARGS((char_u *ptr, long len));
  void bf_crypt_init_keys __ARGS((char_u *passwd));
+diff -Naur vim74.orig/src/proto/charset.pro vim74/src/proto/charset.pro
+--- vim74.orig/src/proto/charset.pro    2013-08-10 11:37:07.000000000 +0000
++++ vim74/src/proto/charset.pro 2014-07-21 23:33:43.400124110 +0000
+@@ -16,7 +16,7 @@
+ int chartabsize __ARGS((char_u *p, colnr_T col));
+ int linetabsize __ARGS((char_u *s));
+ int linetabsize_col __ARGS((int startcol, char_u *s));
+-int win_linetabsize __ARGS((win_T *wp, char_u *p, colnr_T len));
++int win_linetabsize __ARGS((win_T *wp, char_u *line, 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));
+@@ -26,9 +26,9 @@
+ int vim_isfilec_or_wc __ARGS((int c));
+ int vim_isprintc __ARGS((int c));
+ int vim_isprintc_strict __ARGS((int c));
+-int lbr_chartabsize __ARGS((unsigned char *s, colnr_T col));
+-int lbr_chartabsize_adv __ARGS((char_u **s, colnr_T col));
+-int win_lbr_chartabsize __ARGS((win_T *wp, char_u *s, colnr_T col, int *headp));
++int lbr_chartabsize __ARGS((char_u *line, unsigned char *s, colnr_T col));
++int lbr_chartabsize_adv __ARGS((char_u *line, char_u **s, colnr_T col));
++int win_lbr_chartabsize __ARGS((win_T *wp, char_u *line, char_u *s, colnr_T col, int *headp));
+ int in_win_border __ARGS((win_T *wp, colnr_T vcol));
+ void getvcol __ARGS((win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, colnr_T *end));
+ colnr_T getvcol_nolist __ARGS((pos_T *posp));
 diff -Naur vim74.orig/src/proto/eval.pro vim74/src/proto/eval.pro
 --- vim74.orig/src/proto/eval.pro       2013-08-10 11:37:09.000000000 +0000
-+++ vim74/src/proto/eval.pro    2014-06-01 00:43:16.980806403 +0000
++++ vim74/src/proto/eval.pro    2014-07-21 23:33:43.440124006 +0000
 @@ -59,7 +59,8 @@
  int list_append_dict __ARGS((list_T *list, dict_T *dict));
@@ -56582 +63881 @@
 diff -Naur vim74.orig/src/proto/ex_cmds2.pro vim74/src/proto/ex_cmds2.pro
 --- vim74.orig/src/proto/ex_cmds2.pro   2013-08-10 11:37:10.000000000 +0000
-+++ vim74/src/proto/ex_cmds2.pro        2014-06-01 00:43:17.000806353 +0000
++++ vim74/src/proto/ex_cmds2.pro        2014-07-21 23:33:43.463457278 +0000
 @@ -35,7 +35,7 @@
  int prof_def_func __ARGS((void));
@@ -56594 +63893 @@
 diff -Naur vim74.orig/src/proto/ex_docmd.pro vim74/src/proto/ex_docmd.pro
 --- vim74.orig/src/proto/ex_docmd.pro   2013-08-10 11:37:10.000000000 +0000
-+++ vim74/src/proto/ex_docmd.pro        2014-06-01 00:43:17.007473002 +0000
++++ vim74/src/proto/ex_docmd.pro        2014-07-21 23:33:43.470123928 +0000
 @@ -54,4 +54,5 @@
  int put_line __ARGS((FILE *fd, char *s));
@@ -56603 +63902 @@
 diff -Naur vim74.orig/src/proto/ex_eval.pro vim74/src/proto/ex_eval.pro
 --- vim74.orig/src/proto/ex_eval.pro    2013-08-10 11:37:10.000000000 +0000
-+++ vim74/src/proto/ex_eval.pro 2014-06-01 00:43:17.020806302 +0000
++++ vim74/src/proto/ex_eval.pro 2014-07-21 23:33:43.483457226 +0000
 @@ -4,8 +4,10 @@
  int should_abort __ARGS((int retcode));
@@ -56617 +63916 @@
 diff -Naur vim74.orig/src/proto/ex_getln.pro vim74/src/proto/ex_getln.pro
 --- vim74.orig/src/proto/ex_getln.pro   2013-08-10 11:37:11.000000000 +0000
-+++ vim74/src/proto/ex_getln.pro        2014-06-01 00:43:17.020806302 +0000
++++ vim74/src/proto/ex_getln.pro        2014-07-21 23:33:43.496790525 +0000
 @@ -32,7 +32,7 @@
  void set_cmd_context __ARGS((expand_T *xp, char_u *str, int len, int col));
@@ -56629 +63928 @@
 diff -Naur vim74.orig/src/proto/getchar.pro vim74/src/proto/getchar.pro
 --- vim74.orig/src/proto/getchar.pro    2013-08-10 11:37:12.000000000 +0000
-+++ vim74/src/proto/getchar.pro 2014-06-01 00:43:17.060806200 +0000
++++ vim74/src/proto/getchar.pro 2014-07-21 23:33:43.536790420 +0000
 @@ -1,8 +1,9 @@
  /* getchar.c */
@@ -56643 +63942 @@
 diff -Naur vim74.orig/src/proto/misc1.pro vim74/src/proto/misc1.pro
 --- vim74.orig/src/proto/misc1.pro      2013-08-10 11:37:20.000000000 +0000
-+++ vim74/src/proto/misc1.pro   2014-06-01 00:43:17.457471856 +0000
-@@ -69,6 +69,7 @@
++++ vim74/src/proto/misc1.pro   2014-07-21 23:33:43.906789455 +0000
+@@ -2,9 +2,10 @@
+ int get_indent __ARGS((void));
+ int get_indent_lnum __ARGS((linenr_T lnum));
+ int get_indent_buf __ARGS((buf_T *buf, linenr_T lnum));
+-int get_indent_str __ARGS((char_u *ptr, int ts));
++int get_indent_str __ARGS((char_u *ptr, int ts, int list));
+ int set_indent __ARGS((int size, int flags));
+ int get_number_indent __ARGS((linenr_T lnum));
++int get_breakindent_win __ARGS((win_T *wp, char_u *ptr));
+ int open_line __ARGS((int dir, int flags, int second_line_indent));
+ int get_leader_len __ARGS((char_u *line, char_u **flags, int backward, int include_space));
+ int get_last_leader_offset __ARGS((char_u *line, char_u **flags));
+@@ -69,6 +70,7 @@
  char_u *getnextcomp __ARGS((char_u *fname));
  char_u *get_past_head __ARGS((char_u *path));
@@ -56652 +63963 @@
  void shorten_dir __ARGS((char_u *str));
  int dir_of_file_exists __ARGS((char_u *fname));
-@@ -80,9 +81,10 @@
+@@ -80,9 +82,10 @@
  char_u *FullName_save __ARGS((char_u *fname, int force));
  pos_T *find_start_comment __ARGS((int ind_maxcomment));
@@ -56664 +63975 @@
  int get_expr_indent __ARGS((void));
  int get_lisp_indent __ARGS((void));
-@@ -98,7 +100,8 @@
+@@ -98,7 +101,8 @@
  void remove_duplicates __ARGS((garray_T *gap));
  int gen_expand_wildcards __ARGS((int num_pat, char_u **pat, int *num_file, char_u ***file, int flags));
@@ -56676 +63987 @@
 diff -Naur vim74.orig/src/proto/misc2.pro vim74/src/proto/misc2.pro
 --- vim74.orig/src/proto/misc2.pro      2013-08-10 11:37:20.000000000 +0000
-+++ vim74/src/proto/misc2.pro   2014-06-01 00:43:17.460805181 +0000
++++ vim74/src/proto/misc2.pro   2014-07-21 23:33:43.936789377 +0000
 @@ -32,7 +32,7 @@
  char_u *vim_strsave_escaped __ARGS((char_u *string, char_u *esc_chars));
@@ -56697 +64008 @@
 diff -Naur vim74.orig/src/proto/ops.pro vim74/src/proto/ops.pro
 --- vim74.orig/src/proto/ops.pro        2013-08-10 11:37:22.000000000 +0000
-+++ vim74/src/proto/ops.pro     2014-06-01 00:43:17.494138430 +0000
++++ vim74/src/proto/ops.pro     2014-07-21 23:33:43.970122623 +0000
 @@ -37,7 +37,7 @@
  int preprocs_left __ARGS((void));
@@ -56721 +64032 @@
 diff -Naur vim74.orig/src/proto/option.pro vim74/src/proto/option.pro
 --- vim74.orig/src/proto/option.pro     2013-08-10 11:37:22.000000000 +0000
-+++ vim74/src/proto/option.pro  2014-06-01 00:43:17.510805054 +0000
++++ vim74/src/proto/option.pro  2014-07-21 23:33:43.983455922 +0000
 @@ -23,6 +23,7 @@
  char_u *check_stl_option __ARGS((char_u *s));
@@ -56730 +64041 @@
  char_u *get_term_code __ARGS((char_u *tname));
  char_u *get_highlight_default __ARGS((void));
-@@ -59,7 +60,7 @@
+@@ -39,7 +40,6 @@
+ void win_copy_options __ARGS((win_T *wp_from, win_T *wp_to));
+ void copy_winopt __ARGS((winopt_T *from, winopt_T *to));
+ void check_win_options __ARGS((win_T *win));
+-void check_winopt __ARGS((winopt_T *wop));
+ void clear_winopt __ARGS((winopt_T *wop));
+ void buf_copy_options __ARGS((buf_T *buf, int flags));
+ void reset_modifiable __ARGS((void));
+@@ -59,7 +59,8 @@
  void save_file_ff __ARGS((buf_T *buf));
  int file_ff_differs __ARGS((buf_T *buf, int ignore_empty));
@@ -56738 +64057 @@
  long get_sts_value __ARGS((void));
  void find_mps_values __ARGS((int *initc, int *findc, int *backwards, int switchit));
++int briopt_check __ARGS((void));
  /* vim: set ft=c : */
 diff -Naur vim74.orig/src/proto/os_amiga.pro vim74/src/proto/os_amiga.pro
 --- vim74.orig/src/proto/os_amiga.pro   2013-08-10 11:37:37.000000000 +0000
-+++ vim74/src/proto/os_amiga.pro        2014-06-01 00:43:17.517471704 +0000
++++ vim74/src/proto/os_amiga.pro        2014-07-21 23:33:44.013455843 +0000
 @@ -26,7 +26,7 @@
  void mch_hide __ARGS((char_u *name));
@@ -56753 +64073 @@
 diff -Naur vim74.orig/src/proto/os_msdos.pro vim74/src/proto/os_msdos.pro
 --- vim74.orig/src/proto/os_msdos.pro   2013-08-10 11:37:37.000000000 +0000
-+++ vim74/src/proto/os_msdos.pro        2014-06-01 00:43:17.564138251 +0000
++++ vim74/src/proto/os_msdos.pro        2014-07-21 23:33:44.060122388 +0000
 @@ -38,7 +38,7 @@
  int mch_setperm __ARGS((char_u *name, long perm));
@@ -56765 +64085 @@
 diff -Naur vim74.orig/src/proto/os_unix.pro vim74/src/proto/os_unix.pro
 --- vim74.orig/src/proto/os_unix.pro    2013-08-10 11:37:23.000000000 +0000
-+++ vim74/src/proto/os_unix.pro 2014-06-01 00:43:17.584138200 +0000
++++ vim74/src/proto/os_unix.pro 2014-07-21 23:33:44.080122336 +0000
 @@ -42,7 +42,7 @@
  void mch_free_acl __ARGS((vim_acl_T aclent));
@@ -56777 +64097 @@
 diff -Naur vim74.orig/src/proto/os_vms.pro vim74/src/proto/os_vms.pro
 --- vim74.orig/src/proto/os_vms.pro     2013-08-10 11:37:40.000000000 +0000
-+++ vim74/src/proto/os_vms.pro  2014-06-01 00:43:17.594138175 +0000
++++ vim74/src/proto/os_vms.pro  2014-07-21 23:33:44.090122310 +0000
 @@ -7,6 +7,7 @@
  int vms_sys __ARGS((char *cmd, char *out, char *inp));
@@ -56788 +64108 @@
 diff -Naur vim74.orig/src/proto/os_win32.pro vim74/src/proto/os_win32.pro
 --- vim74.orig/src/proto/os_win32.pro   2013-08-10 11:37:38.000000000 +0000
-+++ vim74/src/proto/os_win32.pro        2014-06-01 00:43:17.610804799 +0000
++++ vim74/src/proto/os_win32.pro        2014-07-21 23:33:44.106788933 +0000
 @@ -26,7 +26,7 @@
  int mch_is_linked __ARGS((char_u *fname));
@@ -56800 +64120 @@
 diff -Naur vim74.orig/src/proto/regexp.pro vim74/src/proto/regexp.pro
 --- vim74.orig/src/proto/regexp.pro     2013-08-10 11:37:24.000000000 +0000
-+++ vim74/src/proto/regexp.pro  2014-06-01 00:43:17.660804672 +0000
++++ vim74/src/proto/regexp.pro  2014-07-21 23:33:44.156788803 +0000
 @@ -10,6 +10,7 @@
  int vim_regsub __ARGS((regmatch_T *rmp, char_u *source, char_u *dest, int copy, int magic, int backslash));
@@ -56811 +64131 @@
 diff -Naur vim74.orig/src/proto/spell.pro vim74/src/proto/spell.pro
 --- vim74.orig/src/proto/spell.pro      2013-08-10 11:37:26.000000000 +0000
-+++ vim74/src/proto/spell.pro   2014-06-01 00:43:17.687471271 +0000
++++ vim74/src/proto/spell.pro   2014-07-21 23:33:44.173455426 +0000
 @@ -3,6 +3,7 @@
  int spell_move_to __ARGS((win_T *wp, int dir, int allwords, int curline, hlf_T *attrp));
@@ -56822 +64142 @@
 diff -Naur vim74.orig/src/proto/term.pro vim74/src/proto/term.pro
 --- vim74.orig/src/proto/term.pro       2013-08-10 11:37:28.000000000 +0000
-+++ vim74/src/proto/term.pro    2014-06-01 00:43:17.707471220 +0000
-@@ -34,8 +34,9 @@
++++ vim74/src/proto/term.pro    2014-07-21 23:33:44.200122023 +0000
+@@ -34,8 +34,10 @@
  void settmode __ARGS((int tmode));
  void starttermcap __ARGS((void));
  void stoptermcap __ARGS((void));
 +int did_request_esc_sequence __ARGS((void));
++void resume_get_esc_sequence __ARGS((void));
  void may_req_termresponse __ARGS((void));
 -void may_req_ambiguous_character_width __ARGS((void));
@@ -56836 +64157 @@
 diff -Naur vim74.orig/src/proto/winclip.pro vim74/src/proto/winclip.pro
 --- vim74.orig/src/proto/winclip.pro    2013-08-10 11:37:39.000000000 +0000
-+++ vim74/src/proto/winclip.pro 2014-06-01 00:43:17.754137768 +0000
++++ vim74/src/proto/winclip.pro 2014-07-21 23:33:44.260121866 +0000
 @@ -11,4 +11,5 @@
  short_u *enc_to_utf16 __ARGS((char_u *str, int *lenp));
@@ -56845 +64166 @@
 diff -Naur vim74.orig/src/proto/window.pro vim74/src/proto/window.pro
 --- vim74.orig/src/proto/window.pro     2013-08-10 11:37:30.000000000 +0000
-+++ vim74/src/proto/window.pro  2014-06-01 00:43:17.764137742 +0000
++++ vim74/src/proto/window.pro  2014-07-21 23:33:44.273455165 +0000
 @@ -9,7 +9,7 @@
  void win_equal __ARGS((win_T *next_curwin, int current, int dir));
@@ -56855 +64176 @@
  void win_free_all __ARGS((void));
  win_T *winframe_remove __ARGS((win_T *win, int *dirp, tabpage_T *tp));
+@@ -75,7 +75,7 @@
+ void switch_buffer __ARGS((buf_T **save_curbuf, buf_T *buf));
+ void restore_buffer __ARGS((buf_T *save_curbuf));
+ int win_hasvertsplit __ARGS((void));
+-int match_add __ARGS((win_T *wp, char_u *grp, char_u *pat, int prio, int id));
++int match_add __ARGS((win_T *wp, char_u *grp, char_u *pat, int prio, int id, list_T *pos));
+ int match_delete __ARGS((win_T *wp, int id, int perr));
+ void clear_matches __ARGS((win_T *wp));
+ matchitem_T *get_match __ARGS((win_T *wp, int id));
 diff -Naur vim74.orig/src/quickfix.c vim74/src/quickfix.c
 --- vim74.orig/src/quickfix.c   2013-07-01 19:16:44.000000000 +0000
-+++ vim74/src/quickfix.c        2014-06-01 00:43:17.804137640 +0000
++++ vim74/src/quickfix.c        2014-07-21 23:33:44.323455035 +0000
 @@ -751,7 +751,10 @@
                 fmt_start = fmt_ptr;
@@ -56904 +64234 @@
 diff -Naur vim74.orig/src/regexp.c vim74/src/regexp.c
 --- vim74.orig/src/regexp.c     2013-08-01 16:31:30.000000000 +0000
-+++ vim74/src/regexp.c  2014-06-01 00:43:17.820804264 +0000
++++ vim74/src/regexp.c  2014-07-21 23:33:44.396788177 +0000
 @@ -244,6 +244,7 @@
  
@@ -56924 +64254 @@
                  * branch which matches nothing. */
                 case '[':
-@@ -3709,25 +3714,28 @@
+@@ -3104,15 +3109,25 @@
+            if (reg_magic >= MAGIC_OFF)
+            {
+                char_u *p = regparse + 1;
++               int is_magic_all = (reg_magic == MAGIC_ALL);
+ 
+-               /* ignore \c \C \m and \M after '$' */
++               /* ignore \c \C \m \M \v \V and \Z after '$' */
+                while (p[0] == '\\' && (p[1] == 'c' || p[1] == 'C'
+-                               || p[1] == 'm' || p[1] == 'M' || p[1] == 'Z'))
++                               || p[1] == 'm' || p[1] == 'M'
++                               || p[1] == 'v' || p[1] == 'V' || p[1] == 'Z'))
++               {
++                   if (p[1] == 'v')
++                       is_magic_all = TRUE;
++                   else if (p[1] == 'm' || p[1] == 'M' || p[1] == 'V')
++                       is_magic_all = FALSE;
+                    p += 2;
++               }
+                if (p[0] == NUL
+                        || (p[0] == '\\'
+                            && (p[1] == '|' || p[1] == '&' || p[1] == ')'
+                                || p[1] == 'n'))
++                       || (is_magic_all
++                              && (p[0] == '|' || p[0] == '&' || p[0] == ')'))
+                        || reg_magic == MAGIC_ALL)
+                    curchr = Magic('$');
+            }
+@@ -3709,53 +3724,28 @@
  /* TRUE if using multi-line regexp. */
  #define REG_MULTI      (reg_match == NULL)
@@ -56942 +64300 @@
      static int
 -bt_regexec(rmp, line, col)
-+bt_regexec_nl(rmp, line, col, line_lbr)
-     regmatch_T *rmp;
-     char_u     *line;  /* string to match against */
-     colnr_T    col;    /* column to start looking for match */
-+    int                line_lbr;
- {
-     reg_match = rmp;
-     reg_mmatch = NULL;
-     reg_maxline = 0;
+-    regmatch_T *rmp;
+-    char_u     *line;  /* string to match against */
+-    colnr_T    col;    /* column to start looking for match */
+-{
+-    reg_match = rmp;
+-    reg_mmatch = NULL;
+-    reg_maxline = 0;
 -    reg_line_lbr = FALSE;
-+    reg_line_lbr = line_lbr;
-     reg_buf = curbuf;
-     reg_win = NULL;
-     ireg_ic = rmp->rm_ic;
-@@ -3738,35 +3746,6 @@
-     return (bt_regexec_both(line, col, NULL) != 0);
- }
- 
+-    reg_buf = curbuf;
+-    reg_win = NULL;
+-    ireg_ic = rmp->rm_ic;
+-#ifdef FEAT_MBYTE
+-    ireg_icombine = FALSE;
+-#endif
+-    ireg_maxcol = 0;
+-    return (bt_regexec_both(line, col, NULL) != 0);
+-}
+-
 -#if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) \
 -       || defined(FIND_REPLACE_DIALOG) || defined(PROTO)
@@ -56970 +64328 @@
 -    static int
 -bt_regexec_nl(rmp, line, col)
--    regmatch_T *rmp;
--    char_u     *line;  /* string to match against */
--    colnr_T    col;    /* column to start looking for match */
--{
--    reg_match = rmp;
--    reg_mmatch = NULL;
--    reg_maxline = 0;
++bt_regexec_nl(rmp, line, col, line_lbr)
+     regmatch_T *rmp;
+     char_u     *line;  /* string to match against */
+     colnr_T    col;    /* column to start looking for match */
++    int                line_lbr;
+ {
+     reg_match = rmp;
+     reg_mmatch = NULL;
+     reg_maxline = 0;
 -    reg_line_lbr = TRUE;
--    reg_buf = curbuf;
--    reg_win = NULL;
--    ireg_ic = rmp->rm_ic;
--#ifdef FEAT_MBYTE
--    ireg_icombine = FALSE;
++    reg_line_lbr = line_lbr;
+     reg_buf = curbuf;
+     reg_win = NULL;
+     ireg_ic = rmp->rm_ic;
+@@ -3765,7 +3755,6 @@
+     ireg_maxcol = 0;
+     return (bt_regexec_both(line, col, NULL) != 0);
+ }
 -#endif
--    ireg_maxcol = 0;
--    return (bt_regexec_both(line, col, NULL) != 0);
--}
--#endif
--
+ 
  static long bt_regexec_multi __ARGS((regmmatch_T *rmp, win_T *win, buf_T *buf, linenr_T lnum, colnr_T col, proftime_T *tm));
  
- /*
-@@ -4146,7 +4125,8 @@
+@@ -4146,7 +4135,8 @@
             {
                 /* Only accept single line matches. */
@@ -57002 +64360 @@
                         vim_strnsave(reg_getline(reg_startzpos[i].lnum)
                                                        + reg_startzpos[i].col,
-@@ -4179,9 +4159,8 @@
+@@ -4179,9 +4169,8 @@
                             - (*mb_head_off)(regline, reginput - 1), reg_buf);
      return -1;
@@ -57013 +64371 @@
  
  /*
-@@ -4258,7 +4237,6 @@
+@@ -4258,7 +4247,6 @@
      }
      return TRUE;
@@ -57021 +64379 @@
  #define ADVANCE_REGINPUT() mb_ptr_adv(reginput)
  
-@@ -4311,8 +4289,8 @@
+@@ -4311,8 +4299,8 @@
     */
    for (;;)
@@ -57032 +64390 @@
  
  #ifdef DEBUG
-@@ -4440,9 +4418,7 @@
+@@ -4440,9 +4428,7 @@
             break;
  
@@ -57042 +64400 @@
             break;
  
-@@ -4721,31 +4697,39 @@
+@@ -4721,31 +4707,39 @@
                     /* match empty string always works; happens when "~" is
                      * empty. */
@@ -57096 +64454 @@
                 }
             }
-@@ -4814,6 +4798,16 @@
+@@ -4814,6 +4808,16 @@
                 status = RA_NOMATCH;
             break;
@@ -57113 +64471 @@
           case NOTHING:
             break;
-@@ -6455,7 +6449,8 @@
+@@ -6455,7 +6459,8 @@
  /*
   * Check whether a backreference matches.
@@ -57123 +64481 @@
      static int
  match_with_backref(start_lnum, start_col, end_lnum, end_col, bytelen)
-@@ -6511,6 +6506,8 @@
+@@ -6511,6 +6516,8 @@
  
         /* Advance to next line. */
@@ -57132 +64490 @@
         ccol = 0;
         if (got_int)
-@@ -7381,6 +7378,7 @@
+@@ -7381,6 +7388,7 @@
      reg_mmatch = NULL;
      reg_maxline = 0;
@@ -57140 +64498 @@
  }
  #endif
-@@ -7400,6 +7398,7 @@
+@@ -7400,6 +7408,7 @@
      reg_buf = curbuf;          /* always works on the current buffer! */
      reg_firstlnum = lnum;
@@ -57148 +64506 @@
  }
  
-@@ -7898,17 +7897,92 @@
+@@ -7898,17 +7907,92 @@
  
      return retval;
@@ -57245 +64603 @@
  #ifdef DEBUG
      ,(char_u *)""
-@@ -7922,11 +7996,7 @@
+@@ -7922,11 +8006,7 @@
  {
      nfa_regcomp,
@@ -57257 +64615 @@
  #ifdef DEBUG
      ,(char_u *)""
-@@ -7975,8 +8045,8 @@
+@@ -7975,8 +8055,8 @@
             regexp_engine = expr[4] - '0';
             expr += 5;
@@ -57268 +64626 @@
         }
         else
-@@ -8016,12 +8086,11 @@
+@@ -8016,12 +8096,11 @@
         }
  #endif
@@ -57284 +64642 @@
  
      return prog;
-@@ -8051,7 +8120,7 @@
+@@ -8051,7 +8130,7 @@
      char_u      *line;  /* string to match against */
      colnr_T     col;    /* column to start looking for match */
@@ -57293 +64651 @@
  
  #if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) \
-@@ -8065,7 +8134,7 @@
+@@ -8065,7 +8144,7 @@
      char_u *line;
      colnr_T col;
@@ -57304 +64662 @@
 diff -Naur vim74.orig/src/regexp.h vim74/src/regexp.h
 --- vim74.orig/src/regexp.h     2013-06-11 08:53:14.000000000 +0000
-+++ vim74/src/regexp.h  2014-06-01 00:43:17.844137538 +0000
++++ vim74/src/regexp.h  2014-07-21 23:33:44.400121501 +0000
 @@ -149,11 +149,7 @@
  {
@@ -57320 +64678 @@
 diff -Naur vim74.orig/src/regexp_nfa.c vim74/src/regexp_nfa.c
 --- vim74.orig/src/regexp_nfa.c 2013-08-01 16:27:51.000000000 +0000
-+++ vim74/src/regexp_nfa.c      2014-06-01 00:43:17.864137487 +0000
++++ vim74/src/regexp_nfa.c      2014-07-21 23:33:44.493454591 +0000
 @@ -29,11 +29,14 @@
  # define NFA_REGEXP_DEBUG_LOG  "nfa_regexp_debug.log"
@@ -58541 +65899 @@
 diff -Naur vim74.orig/src/screen.c vim74/src/screen.c
 --- vim74.orig/src/screen.c     2013-07-13 10:23:00.000000000 +0000
-+++ vim74/src/screen.c  2014-06-01 00:43:17.884137436 +0000
++++ vim74/src/screen.c  2014-07-21 23:33:44.550121110 +0000
 @@ -42,7 +42,7 @@
   *
@@ -58551 +65909 @@
   * - w_skipcol (skipped window cells of first line)
   *
-@@ -446,8 +446,6 @@
+@@ -139,12 +139,13 @@
+ static void redraw_custom_statusline __ARGS((win_T *wp));
+ #endif
+ #ifdef FEAT_SEARCH_EXTRA
+-#define SEARCH_HL_PRIORITY 0
++# define SEARCH_HL_PRIORITY 0
+ static void start_search_hl __ARGS((void));
+ static void end_search_hl __ARGS((void));
+ static void init_search_hl __ARGS((win_T *wp));
+ static void prepare_search_hl __ARGS((win_T *wp, linenr_T lnum));
+-static void next_search_hl __ARGS((win_T *win, match_T *shl, linenr_T lnum, colnr_T mincol));
++static void next_search_hl __ARGS((win_T *win, match_T *shl, linenr_T lnum, colnr_T mincol, matchitem_T *cur));
++static int next_search_hl_pos __ARGS((match_T *shl, linenr_T lnum, posmatch_T *pos, colnr_T mincol));
+ #endif
+ static void screen_start_highlight __ARGS((int attr));
+ static void screen_char __ARGS((unsigned off, int row, int col));
+@@ -446,8 +447,6 @@
  #endif
  }
@@ -58560 +65934 @@
   * update all windows that are editing the current buffer
   */
-@@ -458,7 +456,6 @@
+@@ -458,7 +457,6 @@
      redraw_curbuf_later(type);
      update_screen(type);
@@ -58568 +65942 @@
  /*
   * update_screen()
-@@ -596,14 +593,12 @@
+@@ -596,14 +594,12 @@
                     && curwin->w_botfill == curwin->w_old_botfill
  #endif
@@ -58583 +65957 @@
         curwin->w_redr_type = type;
  
-@@ -1030,10 +1025,8 @@
+@@ -1030,10 +1026,8 @@
                                    updating.  0 when no mid area updating. */
      int                bot_start = 999;/* first row of the bot area that needs
@@ -58594 +65968 @@
      matchitem_T *cur;          /* points to the match list */
      int                top_to_mod = FALSE;    /* redraw above mod_top */
-@@ -1354,9 +1347,7 @@
+@@ -1354,9 +1348,7 @@
                             /* Need to update rows that are new, stop at the
                              * first one that scrolled down. */
@@ -58604 +65978 @@
                             /* Move the entries that were scrolled, disable
                              * the entries for the lines to be redrawn. */
-@@ -1513,7 +1504,6 @@
+@@ -1513,7 +1505,6 @@
         type = NOT_VALID;
      }
@@ -58612 +65986 @@
      if ((VIsual_active && buf == curwin->w_buffer)
             || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID))
-@@ -1708,7 +1698,6 @@
+@@ -1708,7 +1699,6 @@
         wp->w_old_visual_lnum = 0;
         wp->w_old_visual_col = 0;
@@ -58620 +65994 @@
  #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA)
      /* reset got_int, otherwise regexp won't work */
-@@ -2467,8 +2456,8 @@
+@@ -1779,8 +1769,10 @@
+                                        syntax_check_changed(lnum)))
+ #endif
+ #ifdef FEAT_SEARCH_EXTRA
+-                               /* match in fixed position might need redraw */
+-                               ||  wp->w_match_head != NULL
++                               /* match in fixed position might need redraw
++                                * if lines were inserted or deleted */
++                               || (wp->w_match_head != NULL
++                                                   && buf->b_mod_xlines != 0)
+ #endif
+                                )))))
+        {
+@@ -2467,8 +2459,8 @@
         if (len > 0)
         {
@@ -58631 +66018 @@
             if (len > w + 1)
                 len = w + 1;
-@@ -2670,7 +2659,6 @@
+@@ -2670,7 +2662,6 @@
       * 6. set highlighting for the Visual area an other text.
       * If all folded lines are in the Visual area, highlight the line.
@@ -58639 +66026 @@
      {
         if (ltoreq(curwin->w_cursor, VIsual))
-@@ -2718,7 +2706,6 @@
+@@ -2718,7 +2709,6 @@
             }
         }
@@ -58647 +66034 @@
  #ifdef FEAT_SYN_HL
      /* Show 'cursorcolumn' in the fold line. */
-@@ -2876,10 +2863,8 @@
+@@ -2853,6 +2843,7 @@
+     char_u     extra[18];              /* "%ld" and 'fdc' must fit in here */
+     int                n_extra = 0;            /* number of extra chars */
+     char_u     *p_extra = NULL;        /* string of extra chars, plus NUL */
++    char_u     *p_extra_free = NULL;   /* p_extra needs to be freed */
+     int                c_extra = NUL;          /* extra chars, all the same */
+     int                extra_attr = 0;         /* attributes when n_extra != 0 */
+     static char_u *at_end_str = (char_u *)""; /* used for p_extra when
+@@ -2876,10 +2867,8 @@
      int                fromcol, tocol;         /* start/end of inverting */
      int                fromcol_prev = -2;      /* start of inverting after cursor */
@@ -58658 +66053 @@
      long       v;
  
-@@ -3090,7 +3075,6 @@
+@@ -2944,6 +2933,8 @@
+     match_T    *shl;                   /* points to search_hl or a match */
+     int                shl_flag;               /* flag to indicate whether search_hl
+                                           has been processed or not */
++    int                pos_inprogress;         /* marks that position match search is
++                                          in progress */
+     int                prevcol_hl_flag;        /* flag to indicate whether prevcol
+                                           equals startcol of search_hl or one
+                                           of the matches */
+@@ -2974,10 +2965,15 @@
+ # define WL_SIGN       WL_FOLD         /* column for signs */
+ #endif
+ #define WL_NR          WL_SIGN + 1     /* line number */
++#ifdef FEAT_LINEBREAK
++# define WL_BRI                WL_NR + 1       /* 'breakindent' */
++#else
++# define WL_BRI                WL_NR
++#endif
+ #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF)
+-# define WL_SBR                WL_NR + 1       /* 'showbreak' or 'diff' */
++# define WL_SBR                WL_BRI + 1      /* 'showbreak' or 'diff' */
+ #else
+-# define WL_SBR                WL_NR
++# define WL_SBR                WL_BRI
+ #endif
+ #define WL_LINE                WL_SBR + 1      /* text in the line */
+     int                draw_state = WL_START;  /* what to draw next */
+@@ -3090,7 +3086,6 @@
       */
      fromcol = -10;
@@ -58666 +66088 @@
      {
                                         /* Visual is after curwin->w_cursor */
-@@ -3183,9 +3167,7 @@
+@@ -3183,9 +3178,7 @@
      /*
       * handle 'incsearch' and ":s///c" highlighting
@@ -58677 +66099 @@
             && lnum >= curwin->w_cursor.lnum
             && lnum <= curwin->w_cursor.lnum + search_match_lines)
-@@ -3324,7 +3306,6 @@
+@@ -3316,7 +3309,7 @@
+ #endif
+        while (vcol < v && *ptr != NUL)
+        {
+-           c = win_lbr_chartabsize(wp, ptr, (colnr_T)vcol, NULL);
++           c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL);
+            vcol += c;
+ #ifdef FEAT_MBYTE
+            prev_ptr = ptr;
+@@ -3324,7 +3317,6 @@
             mb_ptr_adv(ptr);
         }
@@ -58685 +66116 @@
          * - 'cuc' is set, or
          * - 'colorcolumn' is set, or
-@@ -3333,27 +3314,16 @@
+@@ -3333,27 +3325,16 @@
          * the end of the line may be before the start of the displayed part.
          */
@@ -58720 +66151 @@
         /* Handle a character that's not completely on the screen: Put ptr at
          * that character but skip the first few screen characters. */
-@@ -3583,11 +3553,7 @@
+@@ -3469,44 +3450,43 @@
+        shl->startcol = MAXCOL;
+        shl->endcol = MAXCOL;
+        shl->attr_cur = 0;
+-       if (shl->rm.regprog != NULL)
+-       {
+-           v = (long)(ptr - line);
+-           next_search_hl(wp, shl, lnum, (colnr_T)v);
++       v = (long)(ptr - line);
++       if (cur != NULL)
++           cur->pos.cur = 0;
++       next_search_hl(wp, shl, lnum, (colnr_T)v, cur);
+ 
+-           /* Need to get the line again, a multi-line regexp may have made it
+-            * invalid. */
+-           line = ml_get_buf(wp->w_buffer, lnum, FALSE);
+-           ptr = line + v;
++       /* Need to get the line again, a multi-line regexp may have made it
++        * invalid. */
++       line = ml_get_buf(wp->w_buffer, lnum, FALSE);
++       ptr = line + v;
+ 
+-           if (shl->lnum != 0 && shl->lnum <= lnum)
++       if (shl->lnum != 0 && shl->lnum <= lnum)
++       {
++           if (shl->lnum == lnum)
++               shl->startcol = shl->rm.startpos[0].col;
++           else
++               shl->startcol = 0;
++           if (lnum == shl->lnum + shl->rm.endpos[0].lnum
++                                               - shl->rm.startpos[0].lnum)
++               shl->endcol = shl->rm.endpos[0].col;
++           else
++               shl->endcol = MAXCOL;
++           /* Highlight one character for an empty match. */
++           if (shl->startcol == shl->endcol)
+            {
+-               if (shl->lnum == lnum)
+-                   shl->startcol = shl->rm.startpos[0].col;
+-               else
+-                   shl->startcol = 0;
+-               if (lnum == shl->lnum + shl->rm.endpos[0].lnum
+-                                                 - shl->rm.startpos[0].lnum)
+-                   shl->endcol = shl->rm.endpos[0].col;
+-               else
+-                   shl->endcol = MAXCOL;
+-               /* Highlight one character for an empty match. */
+-               if (shl->startcol == shl->endcol)
+-               {
+ #ifdef FEAT_MBYTE
+-                   if (has_mbyte && line[shl->endcol] != NUL)
+-                       shl->endcol += (*mb_ptr2len)(line + shl->endcol);
+-                   else
++               if (has_mbyte && line[shl->endcol] != NUL)
++                   shl->endcol += (*mb_ptr2len)(line + shl->endcol);
++               else
+ #endif
+-                       ++shl->endcol;
+-               }
+-               if ((long)shl->startcol < v)  /* match at leftcol */
+-               {
+-                   shl->attr_cur = shl->attr;
+-                   search_attr = shl->attr;
+-               }
+-               area_highlighting = TRUE;
++                   ++shl->endcol;
++           }
++           if ((long)shl->startcol < v)  /* match at leftcol */
++           {
++               shl->attr_cur = shl->attr;
++               search_attr = shl->attr;
+            }
++           area_highlighting = TRUE;
+        }
+        if (shl != &search_hl && cur != NULL)
+            cur = cur->next;
+@@ -3518,7 +3498,7 @@
+      * when Visual mode is active, because it's not clear what is selected
+      * then. */
+     if (wp->w_p_cul && lnum == wp->w_cursor.lnum
+-                                        && !(wp == curwin  && VIsual_active))
++                                        && !(wp == curwin && VIsual_active))
+     {
+        line_attr = hl_attr(HLF_CUL);
+        area_highlighting = TRUE;
+@@ -3583,11 +3563,7 @@
                 draw_state = WL_SIGN;
                 /* Show the sign column when there are any signs in this
@@ -58733 +66249 @@
                     int text_sign;
  # ifdef FEAT_SIGN_ICONS
-@@ -3599,7 +3565,11 @@
+@@ -3599,7 +3575,11 @@
                     char_attr = hl_attr(HLF_SC);
                     n_extra = 2;
@@ -58746 +66262 @@
                         text_sign = buf_getsigntype(wp->w_buffer, lnum,
                                                                    SIGN_TEXT);
-@@ -4500,9 +4470,7 @@
+@@ -3698,6 +3678,44 @@
+                }
+            }
+ 
++#ifdef FEAT_LINEBREAK
++           if (wp->w_p_brisbr && draw_state == WL_BRI - 1
++                                            && n_extra == 0 && *p_sbr != NUL)
++               /* draw indent after showbreak value */
++               draw_state = WL_BRI;
++           else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0)
++               /* After the showbreak, draw the breakindent */
++               draw_state = WL_BRI - 1;
++
++           /* draw 'breakindent': indent wrapped text accordingly */
++           if (draw_state == WL_BRI - 1 && n_extra == 0)
++           {
++               draw_state = WL_BRI;
++# ifdef FEAT_DIFF
++# endif
++               if (wp->w_p_bri && n_extra == 0 && row != startrow
++#ifdef FEAT_DIFF
++                       && filler_lines == 0
++#endif
++                  )
++               {
++                   char_attr = 0; /* was: hl_attr(HLF_AT); */
++#ifdef FEAT_DIFF
++                   if (diff_hlf != (hlf_T)0)
++                       char_attr = hl_attr(diff_hlf);
++#endif
++                   p_extra = NULL;
++                   c_extra = ' ';
++                   n_extra = get_breakindent_win(wp,
++                                      ml_get_buf(wp->w_buffer, lnum, FALSE));
++                   /* Correct end of highlighted area for 'breakindent',
++                    * required when 'linebreak' is also set. */
++                   if (tocol == vcol)
++                       tocol += n_extra;
++               }
++           }
++#endif
++
+ #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF)
+            if (draw_state == WL_SBR - 1 && n_extra == 0)
+            {
+@@ -3822,7 +3840,11 @@
+                    }
+                    else
+                        shl = &cur->hl;
+-                   while (shl->rm.regprog != NULL)
++                   if (cur != NULL)
++                       cur->pos.cur = 0;
++                   pos_inprogress = TRUE;
++                   while (shl->rm.regprog != NULL
++                                          || (cur != NULL && pos_inprogress))
+                    {
+                        if (shl->startcol != MAXCOL
+                                && v >= (long)shl->startcol
+@@ -3830,11 +3852,12 @@
+                        {
+                            shl->attr_cur = shl->attr;
+                        }
+-                       else if (v == (long)shl->endcol)
++                       else if (v >= (long)shl->endcol)
+                        {
+                            shl->attr_cur = 0;
+-
+-                           next_search_hl(wp, shl, lnum, (colnr_T)v);
++                           next_search_hl(wp, shl, lnum, (colnr_T)v, cur);
++                           pos_inprogress = cur == NULL || cur->pos.cur == 0
++                                                             ? FALSE : TRUE;
+ 
+                            /* Need to get the line again, a multi-line regexp
+                             * may have made it invalid. */
+@@ -4031,6 +4054,11 @@
+        }
+        else
+        {
++           if (p_extra_free != NULL)
++           {
++               vim_free(p_extra_free);
++               p_extra_free = NULL;
++           }
+            /*
+             * Get a character from the line itself.
+             */
+@@ -4402,14 +4430,16 @@
+                /*
+                 * Found last space before word: check for line break.
+                 */
+-               if (wp->w_p_lbr && vim_isbreak(c) && !vim_isbreak(*ptr)
+-                                                            && !wp->w_p_list)
++               if (wp->w_p_lbr && vim_isbreak(c) && !vim_isbreak(*ptr))
+                {
+-                   n_extra = win_lbr_chartabsize(wp, ptr - (
++                   char_u *p = ptr - (
+ # ifdef FEAT_MBYTE
+                                has_mbyte ? mb_l :
+ # endif
+-                               1), (colnr_T)vcol, NULL) - 1;
++                               1);
++                   /* TODO: is passing p for start of the line OK? */
++                   n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol,
++                                                                   NULL) - 1;
+                    c_extra = ' ';
+                    if (vim_iswhite(c))
+                    {
+@@ -4418,7 +4448,8 @@
+                            /* See "Tab alignment" below. */
+                            FIX_FOR_BOGUSCOLS;
+ #endif
+-                       c = ' ';
++                       if (!wp->w_p_list)
++                           c = ' ';
+                    }
+                }
+ #endif
+@@ -4458,9 +4489,50 @@
+                 */
+                if (c == TAB && (!wp->w_p_list || lcs_tab1))
+                {
++                   int tab_len = 0;
+                    /* tab amount depends on current column */
+-                   n_extra = (int)wp->w_buffer->b_p_ts
++                   tab_len = (int)wp->w_buffer->b_p_ts
+                                        - vcol % (int)wp->w_buffer->b_p_ts - 1;
++#ifdef FEAT_LINEBREAK
++                   if (!wp->w_p_lbr)
++#endif
++                   /* tab amount depends on current column */
++                       n_extra = tab_len;
++#ifdef FEAT_LINEBREAK
++                   else
++                   {
++                       char_u *p;
++                       int     len = n_extra;
++                       int     i;
++                       int     saved_nextra = n_extra;
++
++                       /* if n_extra > 0, it gives the number of chars, to
++                        * use for a tab, else we need to calculate the width
++                        * for a tab */
++#ifdef FEAT_MBYTE
++                       len = (tab_len * mb_char2len(lcs_tab2));
++                       if (n_extra > 0)
++                           len += n_extra - tab_len;
++#endif
++                       c = lcs_tab1;
++                       p = alloc((unsigned)(len + 1));
++                       vim_memset(p, ' ', len);
++                       p[len] = NUL;
++                       p_extra_free = p;
++                       for (i = 0; i < tab_len; i++)
++                       {
++#ifdef FEAT_MBYTE
++                           mb_char2bytes(lcs_tab2, p);
++                           p += mb_char2len(lcs_tab2);
++                           n_extra += mb_char2len(lcs_tab2)
++                                                - (saved_nextra > 0 ? 1 : 0);
++#else
++                           p[i] = lcs_tab2;
++#endif
++                       }
++                       p_extra = p_extra_free;
++                   }
++#endif
+ #ifdef FEAT_CONCEAL
+                    /* Tab alignment should be identical regardless of
+                     * 'conceallevel' value. So tab compensates of all
+@@ -4476,8 +4548,13 @@
+                    if (wp->w_p_list)
+                    {
+                        c = lcs_tab1;
+-                       c_extra = lcs_tab2;
+-                       n_attr = n_extra + 1;
++#ifdef FEAT_LINEBREAK
++                       if (wp->w_p_lbr)
++                           c_extra = NUL; /* using p_extra from above */
++                       else
++#endif
++                           c_extra = lcs_tab2;
++                       n_attr = tab_len + 1;
+                        extra_attr = hl_attr(HLF_8);
+                        saved_attr2 = char_attr; /* save current attr */
+ #ifdef FEAT_MBYTE
+@@ -4500,9 +4577,7 @@
                         && ((wp->w_p_list && lcs_eol > 0)
                             || ((fromcol >= 0 || fromcol_prev >= 0)
@@ -58756 +66457 @@
  # ifdef FEAT_RIGHTLEFT
                                     wp->w_p_rl ? (col >= 0) :
-@@ -4854,11 +4822,9 @@
+@@ -4571,13 +4646,31 @@
+                else if (c != NUL)
+                {
+                    p_extra = transchar(c);
++                   if (n_extra == 0)
++                       n_extra = byte2cells(c) - 1;
+ #ifdef FEAT_RIGHTLEFT
+                    if ((dy_flags & DY_UHEX) && wp->w_p_rl)
+                        rl_mirror(p_extra);     /* reverse "<12>" */
+ #endif
+-                   n_extra = byte2cells(c) - 1;
+                    c_extra = NUL;
+-                   c = *p_extra++;
++#ifdef FEAT_LINEBREAK
++                   if (wp->w_p_lbr)
++                   {
++                       char_u *p;
++
++                       c = *p_extra;
++                       p = alloc((unsigned)n_extra + 1);
++                       vim_memset(p, ' ', n_extra);
++                       STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1);
++                       p[n_extra] = NUL;
++                       p_extra_free = p_extra = p;
++                   }
++                   else
++#endif
++                   {
++                       n_extra = byte2cells(c) - 1;
++                       c = *p_extra++;
++                   }
+                    if (!attr_pri)
+                    {
+                        n_attr = n_extra + 1;
+@@ -4854,11 +4947,9 @@
  #endif
             if (lcs_eol == lcs_eol_one
@@ -58768 +66503 @@
  #ifdef FEAT_SEARCH_EXTRA
                         /* highlight 'hlsearch' match at end of line */
-@@ -6653,6 +6619,7 @@
+@@ -6653,6 +6744,7 @@
      win_T      *wp;
      int                draw_ruler;     /* TRUE or FALSE */
@@ -58776 +66511 @@
      int                curattr;
      int                row;
-@@ -6671,6 +6638,13 @@
+@@ -6671,6 +6763,13 @@
      win_T      *ewp;
      int                p_crb_save;
@@ -58790 +66525 @@
      if (wp == NULL)
      {
-@@ -6746,7 +6720,7 @@
+@@ -6746,7 +6845,7 @@
      }
  
@@ -58799 +66534 @@
      /* Temporarily reset 'cursorbind', we don't want a side effect from moving
       * the cursor away and back. */
-@@ -6827,6 +6801,9 @@
+@@ -6827,6 +6926,9 @@
         while (col < Columns)
             TabPageIdxs[col++] = fillchar;
@@ -58809 +66544 @@
  
  #endif /* FEAT_STL_OPT */
-@@ -6939,15 +6916,16 @@
+@@ -6939,15 +7041,16 @@
   * a NUL.
   */
@@ -58828 +66563 @@
  #ifdef FEAT_MBYTE
      unsigned   max_off;
-@@ -7192,7 +7170,11 @@
+@@ -7192,7 +7295,11 @@
             col += mbyte_cells;
             ptr += mbyte_blen;
@@ -58840 +66575 @@
         else
  #endif
-@@ -7447,7 +7429,7 @@
+@@ -7295,6 +7402,8 @@
+     match_T    *shl;           /* points to search_hl or a match */
+     int                shl_flag;       /* flag to indicate whether search_hl
+                                   has been processed or not */
++    int                pos_inprogress; /* marks that position match search is
++                                  in progress */
+     int                n;
+ 
+     /*
+@@ -7329,10 +7438,16 @@
+                shl->first_lnum = wp->w_topline;
+ # endif
+            }
++           if (cur != NULL)
++               cur->pos.cur = 0;
++           pos_inprogress = TRUE;
+            n = 0;
+-           while (shl->first_lnum < lnum && shl->rm.regprog != NULL)
++           while (shl->first_lnum < lnum && (shl->rm.regprog != NULL
++                                         || (cur != NULL && pos_inprogress)))
             {
-                /* don't free regprog in the match list, it's a copy */
-                vim_regfree(shl->rm.regprog);
+-               next_search_hl(wp, shl, shl->first_lnum, (colnr_T)n);
++               next_search_hl(wp, shl, shl->first_lnum, (colnr_T)n, cur);
++               pos_inprogress = cur == NULL || cur->pos.cur == 0
++                                                             ? FALSE : TRUE;
+                if (shl->lnum != 0)
+                {
+                    shl->first_lnum = shl->lnum
+@@ -7361,11 +7476,12 @@
+  * Careful: Any pointers for buffer lines will become invalid.
+  */
+     static void
+-next_search_hl(win, shl, lnum, mincol)
+-    win_T      *win;
+-    match_T    *shl;           /* points to search_hl or a match */
+-    linenr_T   lnum;
+-    colnr_T    mincol;         /* minimal column for a match */
++next_search_hl(win, shl, lnum, mincol, cur)
++    win_T          *win;
++    match_T        *shl;       /* points to search_hl or a match */
++    linenr_T       lnum;
++    colnr_T        mincol;     /* minimal column for a match */
++    matchitem_T            *cur;       /* to retrieve match positions if any */
+ {
+     linenr_T   l;
+     colnr_T    matchcol;
+@@ -7433,27 +7549,36 @@
+            matchcol = shl->rm.endpos[0].col;
+ 
+        shl->lnum = lnum;
+-       nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, matchcol,
++       if (shl->rm.regprog != NULL)
++       {
++           nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum,
++                   matchcol,
+ #ifdef FEAT_RELTIME
+-               &(shl->tm)
++                   &(shl->tm)
+ #else
+-               NULL
++                   NULL
+ #endif
+-               );
+-       if (called_emsg || got_int)
+-       {
+-           /* Error while handling regexp: stop using this regexp. */
+-           if (shl == &search_hl)
++                   );
++           if (called_emsg || got_int)
+            {
+-               /* don't free regprog in the match list, it's a copy */
+-               vim_regfree(shl->rm.regprog);
 -               no_hlsearch = TRUE;
-+               SET_NO_HLSEARCH(TRUE);
++               /* Error while handling regexp: stop using this regexp. */
++               if (shl == &search_hl)
++               {
++                   /* don't free regprog in the match list, it's a copy */
++                   vim_regfree(shl->rm.regprog);
++                   SET_NO_HLSEARCH(TRUE);
++               }
++               shl->rm.regprog = NULL;
++               shl->lnum = 0;
++               got_int = FALSE;  /* avoid the "Type :quit to exit Vim"
++                                    message */
++               break;
             }
-            shl->rm.regprog = NULL;
-            shl->lnum = 0;
-@@ -9648,10 +9630,7 @@
+-           shl->rm.regprog = NULL;
+-           shl->lnum = 0;
+-           got_int = FALSE;  /* avoid the "Type :quit to exit Vim" message */
+-           break;
+        }
++       else if (cur != NULL)
++           nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol);
++       else
++           nmatched = 0;
+        if (nmatched == 0)
+        {
+            shl->lnum = 0;              /* no match found */
+@@ -7469,6 +7594,62 @@
+        }
+     }
+ }
++
++    static int
++next_search_hl_pos(shl, lnum, posmatch, mincol)
++    match_T        *shl;       /* points to a match */
++    linenr_T       lnum;
++    posmatch_T     *posmatch;  /* match positions */
++    colnr_T        mincol;     /* minimal column for a match */
++{
++    int            i;
++    int            bot = -1;
++
++    shl->lnum = 0;
++    for (i = posmatch->cur; i < MAXPOSMATCH; i++)
++    {
++       if (posmatch->pos[i].lnum == 0)
++           break;
++       if (posmatch->pos[i].col < mincol)
++           continue;
++       if (posmatch->pos[i].lnum == lnum)
++       {
++           if (shl->lnum == lnum)
++           {
++               /* partially sort positions by column numbers
++                * on the same line */
++               if (posmatch->pos[i].col < posmatch->pos[bot].col)
++               {
++                   llpos_T     tmp = posmatch->pos[i];
++
++                   posmatch->pos[i] = posmatch->pos[bot];
++                   posmatch->pos[bot] = tmp;
++               }
++           }
++           else
++           {
++               bot = i;
++               shl->lnum = lnum;
++           }
++       }
++    }
++    posmatch->cur = 0;
++    if (shl->lnum == lnum)
++    {
++       colnr_T start = posmatch->pos[bot].col == 0
++                                            ? 0 : posmatch->pos[bot].col - 1;
++       colnr_T end = posmatch->pos[bot].col == 0
++                                   ? MAXCOL : start + posmatch->pos[bot].len;
++
++       shl->rm.startpos[0].lnum = 0;
++       shl->rm.startpos[0].col = start;
++       shl->rm.endpos[0].lnum = 0;
++       shl->rm.endpos[0].col = end;
++       posmatch->cur = bot + 1;
++       return TRUE;
++    }
++    return FALSE;
++}
+ #endif
+ 
+       static void
+@@ -8853,8 +9034,8 @@
+        {
+            if (noinvcurs)
+                screen_stop_highlight();
+-           if (row == screen_cur_row && (col > screen_cur_col) &&
+-                                                               *T_CRI != NUL)
++           if (row == screen_cur_row && (col > screen_cur_col)
++                                                            && *T_CRI != NUL)
+                term_cursor_right(col - screen_cur_col);
+            else
+                term_windgoto(row, col);
+@@ -9648,10 +9829,7 @@
      do_mode = ((p_smd && msg_silent == 0)
             && ((State & INSERT)
@@ -58861 +66759 @@
      {
         /*
-@@ -9704,7 +9683,8 @@
+@@ -9704,7 +9882,8 @@
             }
  #endif
@@ -58871 +66769 @@
                 /* These messages can get long, avoid a wrap in a narrow
                  * window.  Prefer showing edit_submode_extra. */
-@@ -9779,7 +9759,6 @@
+@@ -9779,7 +9958,6 @@
                 if ((State & INSERT) && p_paste)
                     MSG_PUTS_ATTR(_(" (paste)"), attr);
@@ -58879 +66777 @@
                 {
                     char *p;
-@@ -9799,7 +9778,6 @@
+@@ -9799,7 +9977,6 @@
                     }
                     MSG_PUTS_ATTR(_(p), attr);
@@ -58887 +66785 @@
             }
  
-@@ -9828,11 +9806,9 @@
+@@ -9828,11 +10005,9 @@
         msg_clr_cmdline();
  
@@ -58901 +66799 @@
 diff -Naur vim74.orig/src/search.c vim74/src/search.c
 --- vim74.orig/src/search.c     2013-07-17 17:20:47.000000000 +0000
-+++ vim74/src/search.c  2014-06-01 00:43:17.920804010 +0000
++++ vim74/src/search.c  2014-07-21 23:33:44.590121005 +0000
 @@ -201,7 +201,7 @@
       * Save the currently used pattern in the appropriate place,
@@ -59099 +66997 @@
      /*
       * Search backwards for unclosed '(', '{', etc..
-@@ -3638,7 +3623,6 @@
-                if (decl(&curwin->w_cursor) != 0)
-                    break;
-            }
+@@ -3623,22 +3608,22 @@
+ 
+     /*
+      * Try to exclude the '(', '{', ')', '}', etc. when "include" is FALSE.
+-     * If the ending '}' is only preceded by indent, skip that indent.
+-     * But only if the resulting area is not smaller than what we started with.
++     * If the ending '}', ')' or ']' is only preceded by indent, skip that
++     * indent.  But only if the resulting area is not smaller than what we
++     * started with.
+      */
+     while (!include)
+     {
+        incl(&start_pos);
+        sol = (curwin->w_cursor.col == 0);
+        decl(&curwin->w_cursor);
+-       if (what == '{')
+-           while (inindent(1))
+-           {
+-               sol = TRUE;
+-               if (decl(&curwin->w_cursor) != 0)
+-                   break;
+-           }
 -#ifdef FEAT_VISUAL
++       while (inindent(1))
++       {
++           sol = TRUE;
++           if (decl(&curwin->w_cursor) != 0)
++               break;
++       }
++
         /*
          * In Visual mode, when the resulting area is not bigger than what we
          * started with, extend it to the next block, and then exclude again.
-@@ -3663,11 +3647,9 @@
+@@ -3663,11 +3648,9 @@
             curwin->w_cursor = *end_pos;
         }
@@ -59119 +67042 @@
      {
         if (*p_sel == 'e')
-@@ -3680,7 +3662,6 @@
+@@ -3680,7 +3663,6 @@
         showmode();
      }
@@ -59127 +67050 @@
         oap->start = start_pos;
         oap->motion_type = MCHAR;
-@@ -3804,17 +3785,13 @@
+@@ -3804,17 +3786,13 @@
      old_pos = curwin->w_cursor;
      old_end = curwin->w_cursor;                    /* remember where we started */
@@ -59145 +67068 @@
         setpcmark();
  
-@@ -3840,7 +3817,6 @@
+@@ -3840,7 +3818,6 @@
             old_end = curwin->w_cursor;
         }
@@ -59153 +67076 @@
      {
         old_start = VIsual;
-@@ -3848,7 +3824,6 @@
+@@ -3848,7 +3825,6 @@
      }
      else
@@ -59161 +67084 @@
  again:
      /*
-@@ -3948,7 +3923,6 @@
+@@ -3948,7 +3924,6 @@
         }
      }
@@ -59169 +67092 @@
      {
         /* If the end is before the start there is no text between tags, select
-@@ -3963,7 +3937,6 @@
+@@ -3963,7 +3938,6 @@
         showmode();
      }
@@ -59177 +67100 @@
         oap->start = start_pos;
         oap->motion_type = MCHAR;
-@@ -4007,7 +3980,6 @@
+@@ -4007,7 +3981,6 @@
  
      start_lnum = curwin->w_cursor.lnum;
@@ -59185 +67108 @@
       * When visual area is more than one line: extend it.
       */
-@@ -4061,7 +4033,6 @@
+@@ -4061,7 +4034,6 @@
         curwin->w_cursor.col = 0;
         return retval;
@@ -59193 +67116 @@
      /*
       * First move back to the start_lnum of the paragraph or white lines
-@@ -4133,7 +4104,6 @@
+@@ -4133,7 +4105,6 @@
         while (start_lnum > 1 && linewhite(start_lnum - 1))
             --start_lnum;
@@ -59201 +67124 @@
      {
         /* Problem: when doing "Vipipip" nothing happens in a single white
-@@ -4146,7 +4116,6 @@
+@@ -4146,7 +4117,6 @@
         showmode();
      }
@@ -59209 +67132 @@
         oap->start.lnum = start_lnum;
         oap->start.col = 0;
-@@ -4244,7 +4213,6 @@
+@@ -4244,7 +4214,6 @@
      int                col_end;
      int                col_start = curwin->w_cursor.col;
@@ -59217 +67140 @@
      int                vis_bef_curs = FALSE;   /* Visual starts before cursor */
      int                inside_quotes = FALSE;  /* Looks like "i'" done before */
-@@ -4328,17 +4296,11 @@
+@@ -4328,17 +4297,11 @@
         }
      }
@@ -59236 +67159 @@
         {
             if (vis_bef_curs)
-@@ -4346,7 +4308,7 @@
+@@ -4346,7 +4309,7 @@
             else
                 first_col = find_prev_quote(line, col_start, quotechar, NULL);
@@ -59245 +67168 @@
          * closing quote.  Search from the start of the line to find out.
          * Also do this when there is a Visual area, a' may leave the cursor
-@@ -4403,14 +4365,9 @@
+@@ -4403,14 +4366,9 @@
  
      /* Set start position.  After vi" another i" must include the ".
@@ -59261 +67184 @@
      {
         /* Set the start of the Visual area when the Visual area was empty, we
-@@ -4430,7 +4387,6 @@
+@@ -4430,7 +4388,6 @@
         }
      }
@@ -59269 +67192 @@
         oap->start = curwin->w_cursor;
         oap->motion_type = MCHAR;
-@@ -4438,14 +4394,10 @@
+@@ -4438,14 +4395,10 @@
  
      /* Set end position. */
@@ -59285 +67208 @@
      {
         if (vis_empty || vis_bef_curs)
-@@ -4477,7 +4429,6 @@
+@@ -4477,7 +4430,6 @@
         }
      }
@@ -59293 +67216 @@
         /* Set inclusive and other oap's flags. */
         oap->inclusive = inclusive;
-@@ -4488,7 +4439,6 @@
+@@ -4488,7 +4440,6 @@
  
  #endif /* FEAT_TEXTOBJ */
@@ -59301 +67224 @@
  
  /*
-@@ -4541,7 +4491,10 @@
+@@ -4541,7 +4492,10 @@
      /* Is the pattern is zero-width? */
      one_char = is_one_char(spats[last_idx].pat);
@@ -59313 +67236 @@
      /*
       * The trick is to first search backwards and then search forward again,
-@@ -4589,7 +4542,7 @@
+@@ -4589,7 +4543,7 @@
                                 ml_get(curwin->w_buffer->b_ml.ml_line_count));
             }
@@ -59322 +67245 @@
  
      start_pos = pos;
-@@ -4604,7 +4557,6 @@
+@@ -4604,7 +4558,6 @@
      if (!VIsual_active)
         VIsual = start_pos;
@@ -59330 +67253 @@
      VIsual_active = TRUE;
      VIsual_mode = 'v';
-@@ -4677,15 +4629,14 @@
+@@ -4677,15 +4630,14 @@
                 && regmatch.startpos[0].lnum == regmatch.endpos[0].lnum
                 && regmatch.startpos[0].col == regmatch.endpos[0].col);
@@ -59348 +67271 @@
  #if defined(FEAT_LISP) || defined(FEAT_CINDENT) || defined(FEAT_TEXTOBJ) \
         || defined(PROTO)
-@@ -5559,7 +5510,9 @@
+@@ -5559,7 +5511,9 @@
                 spats[idx].off.off = off;
  #ifdef FEAT_SEARCH_EXTRA
@@ -59361 +67284 @@
 diff -Naur vim74.orig/src/spell.c vim74/src/spell.c
 --- vim74.orig/src/spell.c      2013-07-17 15:28:28.000000000 +0000
-+++ vim74/src/spell.c   2014-06-01 00:43:17.964137233 +0000
++++ vim74/src/spell.c   2014-07-21 23:33:44.676787446 +0000
 @@ -317,7 +317,7 @@
  
@@ -59792 +67715 @@
 diff -Naur vim74.orig/src/structs.h vim74/src/structs.h
 --- vim74.orig/src/structs.h    2013-07-03 13:35:59.000000000 +0000
-+++ vim74/src/structs.h 2014-06-01 00:43:17.970803882 +0000
-@@ -346,9 +346,7 @@
++++ vim74/src/structs.h 2014-07-21 23:33:44.713454017 +0000
+@@ -134,6 +134,12 @@
+     int                wo_arab;
+ # define w_p_arab w_onebuf_opt.wo_arab /* 'arabic' */
+ #endif
++#ifdef FEAT_LINEBREAK
++    int                wo_bri;
++# define w_p_bri w_onebuf_opt.wo_bri   /* 'breakindent' */
++    char_u             *wo_briopt;
++# define w_p_briopt w_onebuf_opt.wo_briopt /* 'breakindentopt' */
++#endif
+ #ifdef FEAT_DIFF
+     int                wo_diff;
+ # define w_p_diff w_onebuf_opt.wo_diff /* 'diff' */
+@@ -346,9 +352,7 @@
  #endif
      int                uh_flags;       /* see below */
@@ -59803 +67739 @@
      long       uh_save_nr;     /* set when the file was saved after the
                                    changes in this block */
-@@ -364,7 +362,7 @@
+@@ -364,7 +368,7 @@
  /*
   * structures used in undo.c
@@ -59812 +67748 @@
  # define ALIGN_SIZE (sizeof(long))
  #else
-@@ -471,13 +469,17 @@
+@@ -471,13 +475,17 @@
      blocknr_T  nt_new_bnum;            /* new, positive, number */
  };
@@ -59832 +67768 @@
  
  /*
-@@ -485,10 +487,10 @@
+@@ -485,10 +493,10 @@
   */
  struct buffheader
@@ -59847 +67783 @@
  
  /*
-@@ -542,6 +544,8 @@
+@@ -542,6 +550,8 @@
      int                keepmarks;              /* TRUE when ":keepmarks" was used */
      int                keepjumps;              /* TRUE when ":keepjumps" was used */
@@ -59856 +67792 @@
      char_u     *save_ei;               /* saved value of 'eventignore' */
  # endif
-@@ -568,7 +572,7 @@
+@@ -568,7 +578,7 @@
      unsigned   mf_page_size;           /* number of bytes in a page */
      int                mf_dirty;               /* TRUE if there are dirty blocks */
@@ -59865 +67801 @@
  
      /* Values for key, method and seed used for reading data blocks when
-@@ -671,6 +675,7 @@
+@@ -671,6 +681,7 @@
  {
      garray_T   al_ga;          /* growarray with the array of file names */
@@ -59873 +67809 @@
  
  /*
-@@ -963,7 +968,8 @@
+@@ -963,7 +974,8 @@
      int                        typebuf_valid;      /* TRUE when save_typebuf valid */
      int                        old_char;
@@ -59883 +67819 @@
      char_u             *save_inputbuf;
  #endif
-@@ -1088,7 +1094,7 @@
+@@ -1088,7 +1100,7 @@
  typedef long_u hash_T;         /* Type for hi_hash */
  
@@ -59892 +67828 @@
  #else
  typedef int    varnumber_T;
-@@ -1309,6 +1315,9 @@
+@@ -1309,6 +1321,9 @@
      regprog_T  *b_cap_prog;    /* program for 'spellcapcheck' */
      char_u     *b_p_spf;       /* 'spellfile' */
@@ -59902 +67838 @@
  #if !defined(FEAT_SYN_HL) && !defined(FEAT_SPELL)
      int                dummy;
-@@ -1397,12 +1406,10 @@
+@@ -1397,12 +1412,10 @@
  
      pos_T      b_namedm[NMARKS]; /* current named marks (mark.c) */
@@ -59916 +67852 @@
  
      pos_T      b_last_cursor;  /* cursor position when last unloading this
-@@ -1440,6 +1447,7 @@
+@@ -1440,6 +1453,7 @@
       * start and end of an operator, also used for '[ and ']
       */
@@ -59924 +67860 @@
  
  #ifdef FEAT_VIMINFO
-@@ -1627,12 +1635,55 @@
+@@ -1627,12 +1641,55 @@
      char_u     *b_p_dict;      /* 'dictionary' local value */
      char_u     *b_p_tsr;       /* 'thesaurus' local value */
@@ -59980 +67916 @@
                                  * write should not have an end-of-line */
  
-@@ -1927,7 +1978,6 @@
+@@ -1876,6 +1933,32 @@
+ #endif
+ } match_T;
+ 
++/* number of positions supported by matchaddpos() */
++#define MAXPOSMATCH 8
++
++/*
++ * Same as lpos_T, but with additional field len.
++ */
++typedef struct
++{
++    linenr_T   lnum;   /* line number */
++    colnr_T    col;    /* column number */
++    int                len;    /* length: 0 - to the end of line */
++} llpos_T;
++
++/*
++ * posmatch_T provides an array for storing match items for matchaddpos()
++ * function.
++ */
++typedef struct posmatch posmatch_T;
++struct posmatch
++{
++    llpos_T    pos[MAXPOSMATCH];       /* array of positions */
++    int                cur;                    /* internal position counter */
++    linenr_T   toplnum;                /* top buffer line */
++    linenr_T   botlnum;                /* bottom buffer line */
++};
++
+ /*
+  * matchitem_T provides a linked list for storing match items for ":match" and
+  * the match functions.
+@@ -1889,6 +1972,7 @@
+     char_u     *pattern;   /* pattern to highlight */
+     int                hlg_id;     /* highlight group ID */
+     regmmatch_T        match;      /* regexp program for pattern */
++    posmatch_T pos;        /* position matches */
+     match_T    hl;         /* struct for doing the actual highlighting */
+ };
+ 
+@@ -1927,7 +2011,6 @@
                                        time through cursupdate() to the
                                        current virtual column */
@@ -59988 +67965 @@
       * the next six are used to update the visual part
       */
-@@ -1938,7 +1988,6 @@
+@@ -1938,7 +2021,6 @@
      linenr_T   w_old_visual_lnum;  /* last known start of visual part */
      colnr_T    w_old_visual_col;   /* last known start of visual part */
@@ -59996 +67973 @@
      /*
       * "w_topline", "w_leftcol" and "w_skipcol" specify the offsets for
-@@ -2240,10 +2289,8 @@
+@@ -2113,6 +2195,11 @@
+ #ifdef FEAT_SYN_HL
+     int                *w_p_cc_cols;       /* array of columns to highlight or NULL */
+ #endif
++#ifdef FEAT_LINEBREAK
++    int                w_p_brimin;         /* minimum width for breakindent */
++    int                w_p_brishift;       /* additional shift for breakindent */
++    int                w_p_brisbr;         /* sbr in 'briopt' */
++#endif
+ 
+     /* transform a pointer to a "onebuf" option into a "allbuf" option */
+ #define GLOBAL_WO(p)   ((char *)p + sizeof(winopt_T))
+@@ -2240,10 +2327,8 @@
                                    (inclusive) */
      int                empty;          /* op_start and op_end the same (only used by
@@ -60009 +67998 @@
 diff -Naur vim74.orig/src/syntax.c vim74/src/syntax.c
 --- vim74.orig/src/syntax.c     2013-06-08 14:10:08.000000000 +0000
-+++ vim74/src/syntax.c  2014-06-01 00:43:18.047470354 +0000
++++ vim74/src/syntax.c  2014-07-21 23:33:44.760120562 +0000
 @@ -6837,10 +6837,8 @@
         CENT("SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue",
@@ -60041 +68030 @@
      }
      recursive = FALSE;
+@@ -8047,8 +8043,14 @@
+ {
+     return (   HL_TABLE()[idx].sg_term_attr != 0
+            || HL_TABLE()[idx].sg_cterm_attr != 0
++           || HL_TABLE()[idx].sg_cterm_fg != 0
++           || HL_TABLE()[idx].sg_cterm_bg != 0
+ #ifdef FEAT_GUI
+            || HL_TABLE()[idx].sg_gui_attr != 0
++           || HL_TABLE()[idx].sg_gui_fg_name != NULL
++           || HL_TABLE()[idx].sg_gui_bg_name != NULL
++           || HL_TABLE()[idx].sg_gui_sp_name != NULL
++           || HL_TABLE()[idx].sg_font_name != NUL
+ #endif
+            || (check_link && (HL_TABLE()[idx].sg_set & SG_LINK)));
+ }
 diff -Naur vim74.orig/src/tag.c vim74/src/tag.c
 --- vim74.orig/src/tag.c        2013-06-15 20:26:26.000000000 +0000
-+++ vim74/src/tag.c     2014-06-01 00:43:18.100803551 +0000
++++ vim74/src/tag.c     2014-07-21 23:33:44.786787159 +0000
 @@ -741,8 +741,10 @@
                             break;
@@ -60118 +68122 @@
 diff -Naur vim74.orig/src/term.c vim74/src/term.c
 --- vim74.orig/src/term.c       2013-07-04 20:29:28.000000000 +0000
-+++ vim74/src/term.c    2014-06-01 00:43:18.190803322 +0000
++++ vim74/src/term.c    2014-07-21 23:33:44.846787002 +0000
 @@ -153,6 +153,11 @@
  static char_u *vim_tgetstr __ARGS((char *s, char_u **pp));
@@ -60140 +68144 @@
         }
  #endif
-@@ -3307,6 +3312,27 @@
+@@ -3307,6 +3312,40 @@
  }
  
@@ -60162 +68166 @@
 +                                               || xt_index_out > xt_index_in;
 +}
++
++/*
++ * If requesting the version was disabled in did_request_esc_sequence(),
++ * enable it again.
++ */
++    void
++resume_get_esc_sequence()
++{
++    if (crv_status == 0)
++       crv_status = CRV_GET;
++    if (u7_status == 0)
++       u7_status = U7_GET;
++}
 +# endif
 +
@@ -60168 +68185 @@
   * Request version string (for xterm) when needed.
   * Only do this after switching to raw mode, otherwise the result will be
-@@ -3319,6 +3345,8 @@
+@@ -3319,6 +3358,8 @@
   * Insert mode.
   * On Unix only do it when both output and input are a tty (avoid writing
@@ -60177 +68194 @@
   */
      void
-@@ -3332,6 +3360,7 @@
+@@ -3332,6 +3373,7 @@
  # ifdef UNIX
             && isatty(1)
@@ -60185 +68202 @@
             && *T_CRV != NUL)
      {
-@@ -3356,7 +3385,7 @@
+@@ -3356,7 +3398,7 @@
   * it must be called immediately after entering termcap mode.
   */
@@ -60194 +68211 @@
      if (u7_status == U7_GET
             && cur_tmode == TMODE_RAW
-@@ -3379,7 +3408,8 @@
+@@ -3379,7 +3421,8 @@
          out_str(buf);
          out_str(T_U7);
@@ -60204 +68221 @@
          term_windgoto(0, 0);
          /* check for the characters now, otherwise they might be eaten by
-@@ -3455,12 +3485,9 @@
+@@ -3455,12 +3498,9 @@
         return;
      }
@@ -60218 +68235 @@
      else if (State & INSERT)
         checkfor = MOUSE_INSERT;
-@@ -4185,24 +4212,38 @@
+@@ -3684,7 +3724,11 @@
+        return;
+     }
+ 
++#if defined(WIN3264) && !defined(FEAT_GUI)
++    s = vim_strnsave(string, (int)STRLEN(string) + 1);
++#else
+     s = vim_strsave(string);
++#endif
+     if (s == NULL)
+        return;
+ 
+@@ -3694,6 +3738,15 @@
+        STRMOVE(s, s + 1);
+        s[0] = term_7to8bit(string);
+     }
++
++#if defined(WIN3264) && !defined(FEAT_GUI)
++    if (s[0] == K_NUL)
++    {
++        STRMOVE(s + 1, s);
++        s[1] = 3;
++    }
++#endif
++
+     len = (int)STRLEN(s);
+ 
+     need_gather = TRUE;                /* need to fill termleader[] */
+@@ -4185,24 +4238,38 @@
                             || (tp[0] == CSI && len >= 2))
                         && (VIM_ISDIGIT(*p) || *p == '>' || *p == '?'))
@@ -60262 +68307 @@
                     char *aw = NULL;
  
-@@ -4211,18 +4252,16 @@
+@@ -4211,18 +4278,16 @@
  # ifdef FEAT_AUTOCMD
                     did_cursorhold = TRUE;
@@ -60284 +68329 @@
                             char buf[100];
                             int  r = redraw_asap(CLEAR);
-@@ -4231,9 +4270,9 @@
+@@ -4231,9 +4296,9 @@
                                                                            r);
                             log_tr(buf);
@@ -60296 +68341 @@
                     key_name[0] = (int)KS_EXTRA;
                     key_name[1] = (int)KE_IGNORE;
-@@ -5704,9 +5743,6 @@
+@@ -5704,9 +5769,6 @@
   * termcap codes from the terminal itself.
   * We get them one by one to avoid a very long response string.
@@ -60308 +68353 @@
 diff -Naur vim74.orig/src/testdir/Make_amiga.mak vim74/src/testdir/Make_amiga.mak
 --- vim74.orig/src/testdir/Make_amiga.mak       2013-07-09 11:40:02.000000000 +0000
-+++ vim74/src/testdir/Make_amiga.mak    2014-06-01 00:43:18.240803195 +0000
-@@ -33,7 +33,12 @@
++++ vim74/src/testdir/Make_amiga.mak    2014-07-21 23:33:44.876786924 +0000
+@@ -33,7 +33,15 @@
                 test76.out test77.out test78.out test79.out test80.out \
                 test81.out test82.out test83.out test84.out test88.out \
@@ -60318 +68363 @@
 +               test104.out test105.out test106.out test107.out \
 +               test_autoformat_join.out \
++               test_breakindent.out \
++               test_listlbr.out \
++               test_listlbr_utf8.out \
 +               test_eval.out \
 +               test_options.out
@@ -60323 +68371 @@
  .SUFFIXES: .in .out
  
-@@ -148,3 +153,15 @@
+@@ -148,3 +156,18 @@
  test96.out: test96.in
  test97.out: test97.in
@@ -60337 +68385 @@
 +test107.out: test107.in
 +test_autoformat_join.out: test_autoformat_join.in
++test_breakindent.out: test_breakindent.in
++test_listlbr.out: test_listlbr.in
++test_listlbr_utf8.out: test_listlbr_utf8.in
 +test_eval.out: test_eval.in
 +test_options.out: test_options.in
 diff -Naur vim74.orig/src/testdir/Make_dos.mak vim74/src/testdir/Make_dos.mak
 --- vim74.orig/src/testdir/Make_dos.mak 2013-07-09 11:40:30.000000000 +0000
-+++ vim74/src/testdir/Make_dos.mak      2014-06-01 00:43:18.240803195 +0000
-@@ -32,7 +32,12 @@
++++ vim74/src/testdir/Make_dos.mak      2014-07-21 23:33:44.890120223 +0000
+@@ -32,7 +32,15 @@
                 test79.out test80.out test81.out test82.out test83.out \
                 test84.out test85.out test86.out test87.out test88.out \
@@ -60351 +68402 @@
 +               test105.out test106.out  test107.out\
 +               test_autoformat_join.out \
++               test_breakindent.out \
++               test_listlbr.out \
++               test_listlbr_utf8.out \
 +               test_eval.out \
 +               test_options.out
@@ -60358 +68412 @@
 diff -Naur vim74.orig/src/testdir/Make_ming.mak vim74/src/testdir/Make_ming.mak
 --- vim74.orig/src/testdir/Make_ming.mak        2013-07-09 11:40:38.000000000 +0000
-+++ vim74/src/testdir/Make_ming.mak     2014-06-01 00:43:18.244136520 +0000
-@@ -52,7 +52,12 @@
++++ vim74/src/testdir/Make_ming.mak     2014-07-21 23:33:44.903453521 +0000
+@@ -52,7 +52,15 @@
                 test79.out test80.out test81.out test82.out test83.out \
                 test84.out test85.out test86.out test87.out test88.out \
@@ -60368 +68422 @@
 +               test105.out test106.out test107.out \
 +               test_autoformat_join.out \
++               test_breakindent.out \
++               test_listlbr.out \
++               test_listlbr_utf8.out \
 +               test_eval.out \
 +               test_options.out
@@ -60375 +68432 @@
 diff -Naur vim74.orig/src/testdir/Make_os2.mak vim74/src/testdir/Make_os2.mak
 --- vim74.orig/src/testdir/Make_os2.mak 2013-07-09 11:40:43.000000000 +0000
-+++ vim74/src/testdir/Make_os2.mak      2014-06-01 00:43:18.244136520 +0000
-@@ -34,7 +34,12 @@
++++ vim74/src/testdir/Make_os2.mak      2014-07-21 23:33:44.913453495 +0000
+@@ -34,7 +34,15 @@
                 test76.out test77.out test78.out test79.out test80.out \
                 test81.out test82.out test83.out test84.out test88.out \
@@ -60386 +68443 @@
 +               test_autoformat_join.out \
 +               test_eval.out \
++               test_breakindent.out \
++               test_listlbr_utf8.out \
++               test_listlbr.out \
 +               test_options.out
  
@@ -60392 +68452 @@
 diff -Naur vim74.orig/src/testdir/Make_vms.mms vim74/src/testdir/Make_vms.mms
 --- vim74.orig/src/testdir/Make_vms.mms 2013-07-09 11:40:47.000000000 +0000
-+++ vim74/src/testdir/Make_vms.mms      2014-06-01 00:43:18.247469845 +0000
++++ vim74/src/testdir/Make_vms.mms      2014-07-21 23:33:44.920120144 +0000
 @@ -4,7 +4,7 @@
  # Authors:     Zoltan Arpadffy, <arpadffy@polarhome.com>
@@ -60435 +68495 @@
  # End of configuration section.
  #
-@@ -63,35 +78,47 @@
+@@ -63,35 +78,50 @@
  
  SCRIPT = test1.out  test2.out  test3.out  test4.out  test5.out  \
@@ -60464 +68524 @@
 +        test105.out test106.out test107.out \
 +        test_autoformat_join.out \
++        test_breakindent.out \
++        test_listlbr.out \
++        test_listlbr_utf8.out \
 +        test_eval.out \
 +        test_options.out
@@ -60494 +68557 @@
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
-@@ -99,7 +126,7 @@
+@@ -99,7 +129,7 @@
  .ENDIF
  
@@ -60503 +68566 @@
  
  .IFDEF WANT_WIN
-@@ -114,6 +141,10 @@
+@@ -114,6 +144,10 @@
  SCRIPT_MZSCH = test70.out 
  .ENDIF
@@ -60514 +68577 @@
  SCRIPT_GZIP = test11.out
  .ENDIF
-@@ -122,10 +153,28 @@
+@@ -122,10 +156,28 @@
  SCRIPT_GDIFF = test47.out
  .ENDIF
@@ -60543 +68606 @@
         -@ write sys$output "-----------------------------------------------"
         -@ write sys$output "                "$*" "
-@@ -138,9 +187,10 @@
+@@ -138,9 +190,10 @@
         -@ if "''F$SEARCH("$*.out.*")'"   .NES. "" then differences /par $*.out $*.ok;
         -@ !clean up after the test
@@ -60556 +68619 @@
         -@ write sys$output "-----------------------------------------------"
         -@ write sys$output "                All done"
-@@ -163,13 +213,18 @@
+@@ -163,13 +216,18 @@
         -@ write sys$output "                Test results:"
         -@ write sys$output "-----------------------------------------------"
@@ -60582 +68645 @@
         -@ write sys$output "-----------------------------------------------"
         -@ type VMS.VIM
-@@ -179,6 +234,9 @@
+@@ -179,6 +237,9 @@
         -@ if "''F$SEARCH("test.log")'"     .NES. "" then delete/noconfirm/nolog test.log.*
         -@ if "''F$SEARCH("test.ok")'"      .NES. "" then delete/noconfirm/nolog test.ok.*
@@ -60592 +68655 @@
         -@ if "''F$SEARCH("*.failed")'"     .NES. "" then delete/noconfirm/nolog *.failed.*
         -@ if "''F$SEARCH("*.rej")'"        .NES. "" then delete/noconfirm/nolog *.rej.*
-@@ -186,6 +244,6 @@
+@@ -186,6 +247,6 @@
         -@ if "''F$SEARCH("small.vim")'"    .NES. "" then delete/noconfirm/nolog small.vim.*
         -@ if "''F$SEARCH("mbyte.vim")'"    .NES. "" then delete/noconfirm/nolog mbyte.vim.*
@@ -60602 +68665 @@
 diff -Naur vim74.orig/src/testdir/Makefile vim74/src/testdir/Makefile
 --- vim74.orig/src/testdir/Makefile     2013-08-10 12:20:20.000000000 +0000
-+++ vim74/src/testdir/Makefile  2014-06-01 00:43:18.250803169 +0000
++++ vim74/src/testdir/Makefile  2014-07-21 23:33:44.950120066 +0000
 @@ -3,6 +3,7 @@
  #
@@ -60611 +68674 @@
  # Uncomment this line to use valgrind for memory leaks and extra warnings.
  #   The output goes into a file "valgrind.testN"
-@@ -29,7 +30,12 @@
+@@ -29,7 +30,15 @@
                 test79.out test80.out test81.out test82.out test83.out \
                 test84.out test85.out test86.out test87.out test88.out \
@@ -60620 +68683 @@
 +               test104.out test105.out test106.out test107.out \
 +               test_autoformat_join.out \
++               test_breakindent.out \
++               test_listlbr.out \
++               test_listlbr_utf8.out \
 +               test_eval.out \
 +               test_options.out
@@ -60625 +68691 @@
  SCRIPTS_GUI = test16.out
  
-@@ -51,15 +57,19 @@
+@@ -51,15 +60,19 @@
  
  RM_ON_RUN = test.out X* viminfo
@@ -60650 +68716 @@
 diff -Naur vim74.orig/src/testdir/sautest/autoload/Test104.vim vim74/src/testdir/sautest/autoload/Test104.vim
 --- vim74.orig/src/testdir/sautest/autoload/Test104.vim 1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/sautest/autoload/Test104.vim      2014-06-01 00:43:18.450802660 +0000
++++ vim74/src/testdir/sautest/autoload/Test104.vim      2014-07-21 23:33:45.170119492 +0000
 @@ -0,0 +1 @@
 +let Test104#numvar = 123
 diff -Naur vim74.orig/src/testdir/sautest/autoload/footest.vim vim74/src/testdir/sautest/autoload/footest.vim
 --- vim74.orig/src/testdir/sautest/autoload/footest.vim 1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/sautest/autoload/footest.vim      2014-06-01 00:43:18.464135959 +0000
++++ vim74/src/testdir/sautest/autoload/footest.vim      2014-07-21 23:33:45.183452791 +0000
 @@ -0,0 +1,5 @@
 +" Autoload script used by test55 and test60
@@ -60664 +68730 @@
 diff -Naur vim74.orig/src/testdir/test1.in vim74/src/testdir/test1.in
 --- vim74.orig/src/testdir/test1.in     2012-04-05 14:37:37.000000000 +0000
-+++ vim74/src/testdir/test1.in  2014-06-01 00:43:18.470802609 +0000
++++ vim74/src/testdir/test1.in  2014-07-21 23:33:45.213452712 +0000
 @@ -18,6 +18,10 @@
  Similar logic is applied to the +lua feature, using lua.vim.
@@ -60678 +68744 @@
 diff -Naur vim74.orig/src/testdir/test100.in vim74/src/testdir/test100.in
 --- vim74.orig/src/testdir/test100.in   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test100.in        2014-06-01 00:43:18.517469157 +0000
++++ vim74/src/testdir/test100.in        2014-07-21 23:33:45.243452634 +0000
 @@ -0,0 +1,50 @@
 +Tests for 'undolevel' and 'lispwords' settings being global-local
@@ -60732 +68798 @@
 diff -Naur vim74.orig/src/testdir/test100.ok vim74/src/testdir/test100.ok
 --- vim74.orig/src/testdir/test100.ok   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test100.ok        2014-06-01 00:43:18.517469157 +0000
++++ vim74/src/testdir/test100.ok        2014-07-21 23:33:45.256785933 +0000
 @@ -0,0 +1,51 @@
 +ONE: expecting global undolevels: 5, local undolevels: -123456 (default)
@@ -60787 +68853 @@
 diff -Naur vim74.orig/src/testdir/test101.in vim74/src/testdir/test101.in
 --- vim74.orig/src/testdir/test101.in   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test101.in        2014-06-01 00:43:18.540802431 +0000
++++ vim74/src/testdir/test101.in        2014-07-21 23:33:45.270119231 +0000
 @@ -0,0 +1,45 @@
 +Test for v:hlsearch     vim: set ft=vim :
@@ -60836 +68902 @@
 diff -Naur vim74.orig/src/testdir/test101.ok vim74/src/testdir/test101.ok
 --- vim74.orig/src/testdir/test101.ok   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test101.ok        2014-06-01 00:43:18.544135756 +0000
++++ vim74/src/testdir/test101.ok        2014-07-21 23:33:45.273452556 +0000
 @@ -0,0 +1,11 @@
 +start:
@@ -60851 +68917 @@
 diff -Naur vim74.orig/src/testdir/test102.in vim74/src/testdir/test102.in
 --- vim74.orig/src/testdir/test102.in   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test102.in        2014-06-01 00:43:18.557469055 +0000
++++ vim74/src/testdir/test102.in        2014-07-21 23:33:45.286785854 +0000
 @@ -0,0 +1,12 @@
 +Test if fnameescape is correct for special chars like !
@@ -60867 +68933 @@
 diff -Naur vim74.orig/src/testdir/test102.ok vim74/src/testdir/test102.ok
 --- vim74.orig/src/testdir/test102.ok   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test102.ok        2014-06-01 00:43:18.560802380 +0000
++++ vim74/src/testdir/test102.ok        2014-07-21 23:33:45.290119179 +0000
 @@ -0,0 +1,3 @@
 +
@@ -60874 +68940 @@
 diff -Naur vim74.orig/src/testdir/test103.in vim74/src/testdir/test103.in
 --- vim74.orig/src/testdir/test103.in   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test103.in        2014-06-01 00:43:18.574135679 +0000
++++ vim74/src/testdir/test103.in        2014-07-21 23:33:45.313452451 +0000
 @@ -0,0 +1,37 @@
 +Test for visual mode not being reset causing E315 error.
@@ -60915 +68981 @@
 diff -Naur vim74.orig/src/testdir/test103.ok vim74/src/testdir/test103.ok
 --- vim74.orig/src/testdir/test103.ok   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test103.ok        2014-06-01 00:43:18.590802304 +0000
++++ vim74/src/testdir/test103.ok        2014-07-21 23:33:45.320119101 +0000
 @@ -0,0 +1,2 @@
 +
@@ -60921 +68987 @@
 diff -Naur vim74.orig/src/testdir/test104.in vim74/src/testdir/test104.in
 --- vim74.orig/src/testdir/test104.in   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test104.in        2014-06-01 00:43:18.600802278 +0000
++++ vim74/src/testdir/test104.in        2014-07-21 23:33:45.330119075 +0000
 @@ -0,0 +1,30 @@
 +Tests for :let.  vim: set ft=vim ts=8 :
@@ -60955 +69021 @@
 diff -Naur vim74.orig/src/testdir/test104.ok vim74/src/testdir/test104.ok
 --- vim74.orig/src/testdir/test104.ok   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test104.ok        2014-06-01 00:43:18.614135578 +0000
++++ vim74/src/testdir/test104.ok        2014-07-21 23:33:45.356785672 +0000
 @@ -0,0 +1,13 @@
 +Results of test104:
@@ -60972 +69038 @@
 diff -Naur vim74.orig/src/testdir/test105.in vim74/src/testdir/test105.in
 --- vim74.orig/src/testdir/test105.in   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test105.in        2014-06-01 00:43:18.620802227 +0000
++++ vim74/src/testdir/test105.in        2014-07-21 23:33:45.360118996 +0000
 @@ -0,0 +1,45 @@
 +Test filename modifiers     vim: set ft=vim :
@@ -61021 +69087 @@
 diff -Naur vim74.orig/src/testdir/test105.ok vim74/src/testdir/test105.ok
 --- vim74.orig/src/testdir/test105.ok   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test105.ok        2014-06-01 00:43:18.627468877 +0000
++++ vim74/src/testdir/test105.ok        2014-07-21 23:33:45.366785646 +0000
 @@ -0,0 +1,29 @@
 +fnamemodify('.',              ':p'      )[-1:] '/'
@@ -61054 +69120 @@
 diff -Naur vim74.orig/src/testdir/test106.in vim74/src/testdir/test106.in
 --- vim74.orig/src/testdir/test106.in   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test106.in        2014-06-01 00:43:18.644135501 +0000
++++ vim74/src/testdir/test106.in        2014-07-21 23:33:45.383452269 +0000
 @@ -0,0 +1,16 @@
 +Tests for errorformat.  vim: set ft=vim ts=8 :
@@ -61074 +69140 @@
 diff -Naur vim74.orig/src/testdir/test106.ok vim74/src/testdir/test106.ok
 --- vim74.orig/src/testdir/test106.ok   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test106.ok        2014-06-01 00:43:18.657468801 +0000
++++ vim74/src/testdir/test106.ok        2014-07-21 23:33:45.396785567 +0000
 @@ -0,0 +1,4 @@
 +Results of test106:
@@ -61082 +69148 @@
 diff -Naur vim74.orig/src/testdir/test107.in vim74/src/testdir/test107.in
 --- vim74.orig/src/testdir/test107.in   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test107.in        2014-06-01 00:43:18.657468801 +0000
++++ vim74/src/testdir/test107.in        2014-07-21 23:33:45.410118866 +0000
 @@ -0,0 +1,38 @@
 +Tests for adjusting window and contents     vim: set ft=vim :
@@ -61124 +69190 @@
 diff -Naur vim74.orig/src/testdir/test107.ok vim74/src/testdir/test107.ok
 --- vim74.orig/src/testdir/test107.ok   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test107.ok        2014-06-01 00:43:18.660802125 +0000
++++ vim74/src/testdir/test107.ok        2014-07-21 23:33:45.413452191 +0000
 @@ -0,0 +1,4 @@
 +start:
@@ -61132 +69198 @@
 diff -Naur vim74.orig/src/testdir/test14.in vim74/src/testdir/test14.in
 --- vim74.orig/src/testdir/test14.in    2013-04-03 18:59:14.000000000 +0000
-+++ vim74/src/testdir/test14.in 2014-06-01 00:43:18.754135221 +0000
++++ vim74/src/testdir/test14.in 2014-07-21 23:33:45.573451773 +0000
 @@ -47,7 +47,19 @@
  /two
@@ -61164 +69230 @@
 diff -Naur vim74.orig/src/testdir/test14.ok vim74/src/testdir/test14.ok
 --- vim74.orig/src/testdir/test14.ok    2013-04-03 18:59:14.000000000 +0000
-+++ vim74/src/testdir/test14.ok 2014-06-01 00:43:18.767468520 +0000
++++ vim74/src/testdir/test14.ok 2014-07-21 23:33:45.586785072 +0000
 @@ -20,3 +20,7 @@
  1
@@ -61175 +69241 @@
 diff -Naur vim74.orig/src/testdir/test20.in vim74/src/testdir/test20.in
 --- vim74.orig/src/testdir/test20.in    2010-05-15 11:04:10.000000000 +0000
-+++ vim74/src/testdir/test20.in 2014-06-01 00:43:18.927468113 +0000
++++ vim74/src/testdir/test20.in 2014-07-21 23:33:45.733451356 +0000
 @@ -9,11 +9,17 @@
  @auY:quit!
@@ -61198 +69264 @@
 diff -Naur vim74.orig/src/testdir/test20.ok vim74/src/testdir/test20.ok
 --- vim74.orig/src/testdir/test20.ok    2010-05-15 11:04:10.000000000 +0000
-+++ vim74/src/testdir/test20.ok 2014-06-01 00:43:18.940801412 +0000
++++ vim74/src/testdir/test20.ok 2014-07-21 23:33:45.746784654 +0000
 @@ -1,3 +1,7 @@
 +123start here56
@@ -61209 +69275 @@
 diff -Naur vim74.orig/src/testdir/test29.in vim74/src/testdir/test29.in
 --- vim74.orig/src/testdir/test29.in    2012-06-13 11:48:26.000000000 +0000
-+++ vim74/src/testdir/test29.in 2014-06-01 00:43:19.107467655 +0000
++++ vim74/src/testdir/test29.in 2014-07-21 23:33:45.913450886 +0000
 @@ -102,6 +102,34 @@
  }
@@ -61247 +69313 @@
 diff -Naur vim74.orig/src/testdir/test29.ok vim74/src/testdir/test29.ok
 --- vim74.orig/src/testdir/test29.ok    2012-06-13 11:48:26.000000000 +0000
-+++ vim74/src/testdir/test29.ok 2014-06-01 00:43:19.110800979 +0000
++++ vim74/src/testdir/test29.ok 2014-07-21 23:33:45.926784185 +0000
 @@ -62,6 +62,15 @@
      action();
@@ -61264 +69330 @@
  {
  /* Make sure the previous comment leader is not removed.  */
+diff -Naur vim74.orig/src/testdir/test3.in vim74/src/testdir/test3.in
+--- vim74.orig/src/testdir/test3.in     2013-03-07 11:39:35.000000000 +0000
++++ vim74/src/testdir/test3.in  2014-07-21 23:33:45.936784158 +0000
+@@ -1432,7 +1432,7 @@
+ 
+ STARTTEST
+ :set cino=(0,ts
+-2kdd=][
++2kdd2j=][
+ ENDTEST
+ 
+ void func(int a
+@@ -1446,7 +1446,7 @@
+ 
+ STARTTEST
+ :set cino=(0
+-2kdd=][
++2kdd2j=][
+ ENDTEST
+ 
+ void
+@@ -1461,7 +1461,7 @@
+ 
+ STARTTEST
+ :set cino&
+-2kdd=7][
++2kdd2j=7][
+ ENDTEST
+ 
+ void func(void)
+@@ -1538,7 +1538,7 @@
+ STARTTEST
+ :set cino&
+ :set cino+=l1
+-2kdd=][
++2kdd2j=][
+ ENDTEST
+ 
+ void func(void)
+@@ -1567,7 +1567,7 @@
+ 
+ STARTTEST
+ :set cino&
+-2kdd=][
++2kdd2j=][
+ ENDTEST
+ 
+ void func(void)
+@@ -1592,7 +1592,7 @@
+ 
+ STARTTEST
+ :set cino&
+-2kdd=][
++2kdd2j=][
+ ENDTEST
+ 
+ void func(void)
+@@ -1919,10 +1919,10 @@
+ 
+ JSSTART
+ var foo = [
+-1,  // indent 8 more
++1,
+ 2,
+ 3
+-];  // indent 8 less
++];
+ JSEND
+ 
+ STARTTEST
+@@ -1937,7 +1937,7 @@
+ 1,
+ 2,
+ 3
+-];  // indent 16 less
++];
+ }
+ JSEND
+ 
+@@ -1950,6 +1950,12 @@
+ JSSTART
+ (function($){
+ 
++if (cond &&
++cond) {
++stmt;
++}
++window.something.left =
++(width - 50 + offset) + "px";
+ var class_name='myclass';
+ 
+ function private_method() {
+@@ -1965,15 +1971,15 @@
+ 
+ $(this).data(class_name+'_public',$.extend({},{
+ foo: 'bar',
+-bar: 2,  // indent 8 more
+-foobar: [  // indent 8 more
+-1,  // indent 8 more
+-2,  // indent 16 more
+-3   // indent 16 more
++bar: 2,
++foobar: [
++1,
++2,
++3
+ ],
+-callback: function(){  // indent 8 more
+-return true;  // indent 8 more
+-}  // indent 8 more
++callback: function(){
++return true;
++}
+ }, options||{}));
+ }
+ 
+@@ -2014,9 +2020,9 @@
+ foo: 'bar',
+ bar: 2,
+ foobar: [
+-1,  // indent 8 more
+-2,  // indent 8 more
+-3   // indent 8 more
++1,
++2,
++3
+ ],
+ callback: function(){
+ return true;
+@@ -2036,15 +2042,15 @@
+ function init(options) {
+ $(this).data(class_name+'_public',$.extend({},{
+ foo: 'bar',
+-bar: 2,  // indent 8 more
+-foobar: [  // indent 8 more
+-1,  // indent 8 more
+-2,  // indent 16 more
+-3  // indent 16 more
++bar: 2,
++foobar: [
++1,
++2,
++3
+ ],
+-callback: function(){  // indent 8 more
+-return true;  // indent 8 more
+-}  // indent 8 more
++callback: function(){
++return true;
++}
+ }, options||{}));
+ }
+ })(jQuery);
+diff -Naur vim74.orig/src/testdir/test3.ok vim74/src/testdir/test3.ok
+--- vim74.orig/src/testdir/test3.ok     2013-03-07 11:40:03.000000000 +0000
++++ vim74/src/testdir/test3.ok  2014-07-21 23:33:45.940117483 +0000
+@@ -1707,10 +1707,10 @@
+ 
+ JSSTART
+ var foo = [
+-1,  // indent 8 more
++       1,
+        2,
+        3
+-       ];  // indent 8 less
++];
+ JSEND
+ 
+ 
+@@ -1720,7 +1720,7 @@
+                1,
+                2,
+                3
+-                       ];  // indent 16 less
++       ];
+ }
+ JSEND
+ 
+@@ -1728,6 +1728,12 @@
+ JSSTART
+ (function($){
+ 
++       if (cond &&
++                       cond) {
++               stmt;
++       }
++       window.something.left =
++               (width - 50 + offset) + "px";
+        var class_name='myclass';
+ 
+        function private_method() {
+@@ -1743,15 +1749,15 @@
+ 
+                $(this).data(class_name+'_public',$.extend({},{
+                        foo: 'bar',
+-               bar: 2,  // indent 8 more
+-               foobar: [  // indent 8 more
+-                       1,  // indent 8 more
+-               2,  // indent 16 more
+-               3   // indent 16 more
++                       bar: 2,
++                       foobar: [
++                               1,
++                               2,
++                               3
+                        ],
+-               callback: function(){  // indent 8 more
+-                       return true;  // indent 8 more
+-               }  // indent 8 more
++                       callback: function(){
++                               return true;
++                       }
+                }, options||{}));
+        }
+ 
+@@ -1787,9 +1793,9 @@
+                foo: 'bar',
+                bar: 2,
+                foobar: [
+-               1,  // indent 8 more
+-               2,  // indent 8 more
+-               3   // indent 8 more
++                       1,
++                       2,
++                       3
+                ],
+                callback: function(){
+                        return true;
+@@ -1804,15 +1810,15 @@
+        function init(options) {
+                $(this).data(class_name+'_public',$.extend({},{
+                        foo: 'bar',
+-               bar: 2,  // indent 8 more
+-               foobar: [  // indent 8 more
+-                       1,  // indent 8 more
+-               2,  // indent 16 more
+-               3  // indent 16 more
++                       bar: 2,
++                       foobar: [
++                               1,
++                               2,
++                               3
+                        ],
+-               callback: function(){  // indent 8 more
+-                       return true;  // indent 8 more
+-               }  // indent 8 more
++                       callback: function(){
++                               return true;
++                       }
+                }, options||{}));
+        }
+ })(jQuery);
 diff -Naur vim74.orig/src/testdir/test32.in vim74/src/testdir/test32.in
 --- vim74.orig/src/testdir/test32.in    2010-05-15 11:04:10.000000000 +0000
-+++ vim74/src/testdir/test32.in 2014-06-01 00:43:19.207467400 +0000
++++ vim74/src/testdir/test32.in 2014-07-21 23:33:46.013450625 +0000
 @@ -36,6 +36,9 @@
  :w Xtest11.one
@@ -61279 +69597 @@
 diff -Naur vim74.orig/src/testdir/test34.in vim74/src/testdir/test34.in
 --- vim74.orig/src/testdir/test34.in    2012-07-16 14:51:29.000000000 +0000
-+++ vim74/src/testdir/test34.in 2014-06-01 00:43:19.244133973 +0000
++++ vim74/src/testdir/test34.in 2014-07-21 23:33:46.073450469 +0000
 @@ -1,6 +1,7 @@
  Test for user functions.
@@ -61309 +69627 @@
 diff -Naur vim74.orig/src/testdir/test34.ok vim74/src/testdir/test34.ok
 --- vim74.orig/src/testdir/test34.ok    2012-07-16 14:43:15.000000000 +0000
-+++ vim74/src/testdir/test34.ok 2014-06-01 00:43:19.250800623 +0000
++++ vim74/src/testdir/test34.ok 2014-07-21 23:33:46.080117118 +0000
 @@ -6,3 +6,5 @@
  1. one again
@@ -61318 +69636 @@
 diff -Naur vim74.orig/src/testdir/test37.ok vim74/src/testdir/test37.ok
 --- vim74.orig/src/testdir/test37.ok    2010-05-15 11:04:10.000000000 +0000
-+++ vim74/src/testdir/test37.ok 2014-06-01 00:43:19.300800496 +0000
++++ vim74/src/testdir/test37.ok 2014-07-21 23:33:46.143450286 +0000
 @@ -27,7 +27,7 @@
  
@@ -61332 +69650 @@
 diff -Naur vim74.orig/src/testdir/test39.in vim74/src/testdir/test39.in
 --- vim74.orig/src/testdir/test39.in    2013-03-07 17:30:38.000000000 +0000
-+++ vim74/src/testdir/test39.in 2014-06-01 00:43:19.330800419 +0000
++++ vim74/src/testdir/test39.in 2014-07-21 23:33:46.173450208 +0000
 @@ -19,6 +19,28 @@
  :" Test block-change
@@ -61404 +69722 @@
 diff -Naur vim74.orig/src/testdir/test39.ok vim74/src/testdir/test39.ok
 --- vim74.orig/src/testdir/test39.ok    2013-03-07 17:28:51.000000000 +0000
-+++ vim74/src/testdir/test39.ok 2014-06-01 00:43:19.334133744 +0000
++++ vim74/src/testdir/test39.ok 2014-07-21 23:33:46.173450208 +0000
 @@ -3,6 +3,24 @@
  axyzqqqqef mno        ghijklm
@@ -61458 +69776 @@
 diff -Naur vim74.orig/src/testdir/test44.in vim74/src/testdir/test44.in
 --- vim74.orig/src/testdir/test44.in    2013-05-26 12:16:31.000000000 +0000
-+++ vim74/src/testdir/test44.in 2014-06-01 00:43:19.467466738 +0000
++++ vim74/src/testdir/test44.in 2014-07-21 23:33:46.286783245 +0000
 @@ -1,9 +1,11 @@
  Tests for regexp with multi-byte encoding and various magic settings.
@@ -61473 +69791 @@
 diff -Naur vim74.orig/src/testdir/test49.in vim74/src/testdir/test49.in
 --- vim74.orig/src/testdir/test49.in    2012-11-15 21:29:55.000000000 +0000
-+++ vim74/src/testdir/test49.in 2014-06-01 00:43:19.560799833 +0000
++++ vim74/src/testdir/test49.in 2014-07-21 23:33:46.400116283 +0000
 @@ -1,7 +1,7 @@
  This is a test of the script language.
@@ -61485 +69803 @@
 diff -Naur vim74.orig/src/testdir/test53.in vim74/src/testdir/test53.in
 --- vim74.orig/src/testdir/test53.in    2013-06-30 12:31:56.000000000 +0000
-+++ vim74/src/testdir/test53.in 2014-06-01 00:43:19.714132776 +0000
++++ vim74/src/testdir/test53.in 2014-07-21 23:33:46.543449242 +0000
 @@ -4,6 +4,8 @@
  
@@ -61559 +69877 @@
 diff -Naur vim74.orig/src/testdir/test53.ok vim74/src/testdir/test53.ok
 --- vim74.orig/src/testdir/test53.ok    2013-06-30 12:31:56.000000000 +0000
-+++ vim74/src/testdir/test53.ok 2014-06-01 00:43:19.720799426 +0000
++++ vim74/src/testdir/test53.ok 2014-07-21 23:33:46.550115892 +0000
 @@ -18,6 +18,28 @@
  a
@@ -61608 +69926 @@
 diff -Naur vim74.orig/src/testdir/test55.in vim74/src/testdir/test55.in
 --- vim74.orig/src/testdir/test55.in    2013-03-07 13:33:12.000000000 +0000
-+++ vim74/src/testdir/test55.in 2014-06-01 00:43:19.757465999 +0000
++++ vim74/src/testdir/test55.in 2014-07-21 23:33:46.586782463 +0000
 @@ -282,6 +282,13 @@
  :    $put =ps
@@ -61623 +69941 @@
  :" a:000 function argument
  :" first the tests that should fail
-@@ -316,13 +323,15 @@
+@@ -316,13 +323,21 @@
  :  $put ='caught ' . v:exception
  :endtry
@@ -61638 +69956 @@
  :$put =string(sort(reverse(sort(l))))
 +:$put =string(uniq(sort(l)))
++:let l=[7, 9, 'one', 18, 12, 22, 'two', 10.0e-16, -1, 'three', 0xff, 0.22, 'four']
++:$put =string(sort(copy(l), 'n'))
++:let l=[7, 9, 18, 12, 22, 10.0e-16, -1, 0xff, 0, -0, 0.22, 'bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', {}, []]
++:$put =string(sort(copy(l), 1))
++:$put =string(sort(copy(l), 'i'))
++:$put =string(sort(copy(l)))
  :"
  :" splitting a string to a List
@@ -61643 +69967 @@
 diff -Naur vim74.orig/src/testdir/test55.ok vim74/src/testdir/test55.ok
 --- vim74.orig/src/testdir/test55.ok    2012-08-29 14:51:15.000000000 +0000
-+++ vim74/src/testdir/test55.ok 2014-06-01 00:43:19.767465974 +0000
-@@ -86,16 +86,21 @@
++++ vim74/src/testdir/test55.ok 2014-07-21 23:33:46.596782436 +0000
+@@ -86,16 +86,25 @@
  FFpFFpp
  0000-000
@@ -61668 +69992 @@
 +['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]]
 +['-0', 'A11', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 4, [0, 1, 2]]
++[-1, 'one', 'two', 'three', 'four', 1.0e-15, 0.22, 7, 9, 12, 18, 22, 255]
++['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
++['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
++['BAR', 'Bar', 'FOO', 'FOOBAR', 'Foo', 'bar', 'foo', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
  ['aa', 'bb']
  ['aa', 'bb']
@@ -61673 +70001 @@
 diff -Naur vim74.orig/src/testdir/test60.in vim74/src/testdir/test60.in
 --- vim74.orig/src/testdir/test60.in    2010-05-15 11:04:10.000000000 +0000
-+++ vim74/src/testdir/test60.in 2014-06-01 00:43:19.904132292 +0000
++++ vim74/src/testdir/test60.in 2014-07-21 23:33:46.753448694 +0000
 @@ -1,4 +1,4 @@
 -Tests for the exists() function.  vim: set ft=vim :
@@ -61757 +70085 @@
 diff -Naur vim74.orig/src/testdir/test60.ok vim74/src/testdir/test60.ok
 --- vim74.orig/src/testdir/test60.ok    2010-05-15 11:04:10.000000000 +0000
-+++ vim74/src/testdir/test60.ok 2014-06-01 00:43:19.930798891 +0000
++++ vim74/src/testdir/test60.ok 2014-07-21 23:33:46.770115318 +0000
 @@ -71,6 +71,10 @@
  OK
@@ -61792 +70120 @@
 diff -Naur vim74.orig/src/testdir/test62.in vim74/src/testdir/test62.in
 --- vim74.orig/src/testdir/test62.in    2013-07-14 11:37:12.000000000 +0000
-+++ vim74/src/testdir/test62.in 2014-06-01 00:43:19.970798789 +0000
++++ vim74/src/testdir/test62.in 2014-07-21 23:33:46.800115239 +0000
 @@ -2,6 +2,7 @@
  
@@ -61801 +70129 @@
  :tabnew
  :let nr = tabpagenr()
+diff -Naur vim74.orig/src/testdir/test63.in vim74/src/testdir/test63.in
+--- vim74.orig/src/testdir/test63.in    2010-05-15 11:04:10.000000000 +0000
++++ vim74/src/testdir/test63.in 2014-07-21 23:33:46.833448486 +0000
+@@ -1,5 +1,5 @@
+ Test for ":match", ":2match", ":3match", "clearmatches()", "getmatches()",
+-"matchadd()", "matcharg()", "matchdelete()", and "setmatches()".
++"matchadd()", "matchaddpos", "matcharg()", "matchdelete()", and "setmatches()".
+ 
+ STARTTEST
+ :so small.vim
+@@ -147,9 +147,26 @@
+ :unlet rf1
+ :unlet rf2
+ :unlet rf3
+-:highlight clear MyGroup1
+-:highlight clear MyGroup2
+-:highlight clear MyGroup3
++:" --- Check that "matchaddpos()" positions matches correctly
++:let @r .= "*** Test 11:\n"
++:set nolazyredraw
++:call setline(1, 'abcdefghijklmnopq')
++:call matchaddpos("MyGroup1", [[1, 5], [1, 8, 3]], 10, 3)
++:1
++:redraw!
++:let v1 = screenattr(1, 1)
++:let v5 = screenattr(1, 5)
++:let v6 = screenattr(1, 6)
++:let v8 = screenattr(1, 8)
++:let v10 = screenattr(1, 10)
++:let v11 = screenattr(1, 11)
++:let @r .= string(getmatches())."\n"
++:if v1 != v5 && v6 == v1 && v8 == v5 && v10 == v5 && v11 == v1
++:  let @r .= "OK\n"
++:else
++:  let @r .= "FAILED\n"
++:endif
++:call clearmatches()
+ G"rp
+ :/^Results/,$wq! test.out
+ ENDTEST
+diff -Naur vim74.orig/src/testdir/test63.ok vim74/src/testdir/test63.ok
+--- vim74.orig/src/testdir/test63.ok    2010-05-15 11:04:10.000000000 +0000
++++ vim74/src/testdir/test63.ok 2014-07-21 23:33:46.850115109 +0000
+@@ -9,3 +9,6 @@
+ *** Test 8: OK
+ *** Test 9: OK
+ *** Test 10: OK
++*** Test 11:
++[{'group': 'MyGroup1', 'id': 3, 'priority': 10, 'pos1': [1, 5, 1], 'pos2': [1, 8, 3]}]
++OK
 diff -Naur vim74.orig/src/testdir/test64.in vim74/src/testdir/test64.in
 --- vim74.orig/src/testdir/test64.in    2013-08-01 15:45:33.000000000 +0000
-+++ vim74/src/testdir/test64.in 2014-06-01 00:43:20.014132012 +0000
++++ vim74/src/testdir/test64.in 2014-07-21 23:33:46.900114978 +0000
 @@ -238,7 +238,11 @@
  :call add(tl, [2, '\vx(.{-,8})yz(.*)','xayxayzxayzxayz','xayxayzxayzxayz','ayxa','xayzxayz'])
@@ -61937 +70315 @@
 diff -Naur vim74.orig/src/testdir/test64.ok vim74/src/testdir/test64.ok
 --- vim74.orig/src/testdir/test64.ok    2013-08-01 16:28:56.000000000 +0000
-+++ vim74/src/testdir/test64.ok 2014-06-01 00:43:20.020798662 +0000
++++ vim74/src/testdir/test64.ok 2014-07-21 23:33:46.923448251 +0000
 @@ -533,6 +533,18 @@
  OK 0 - \v(a{-1,3})+
@@ -62118 +70496 @@
 diff -Naur vim74.orig/src/testdir/test68.in vim74/src/testdir/test68.in
 --- vim74.orig/src/testdir/test68.in    2012-07-25 13:57:06.000000000 +0000
-+++ vim74/src/testdir/test68.in 2014-06-01 00:43:20.107465108 +0000
++++ vim74/src/testdir/test68.in 2014-07-21 23:33:47.003448042 +0000
 @@ -62,6 +62,20 @@
  }
@@ -62142 +70520 @@
 diff -Naur vim74.orig/src/testdir/test68.ok vim74/src/testdir/test68.ok
 --- vim74.orig/src/testdir/test68.ok    2012-07-25 14:03:05.000000000 +0000
-+++ vim74/src/testdir/test68.ok 2014-06-01 00:43:20.117465083 +0000
++++ vim74/src/testdir/test68.ok 2014-07-21 23:33:47.013448016 +0000
 @@ -43,6 +43,15 @@
  
@@ -62161 +70539 @@
 diff -Naur vim74.orig/src/testdir/test69.in vim74/src/testdir/test69.in
 --- vim74.orig/src/testdir/test69.in    2013-03-07 17:30:50.000000000 +0000
-+++ vim74/src/testdir/test69.in 2014-06-01 00:43:20.130798382 +0000
++++ vim74/src/testdir/test69.in 2014-07-21 23:33:47.016781341 +0000
 @@ -1,6 +1,7 @@
  Test for multi-byte text formatting.
@@ -62170 +70548 @@
  STARTTEST
  :so mbyte.vim
-@@ -154,6 +155,31 @@
+@@ -154,6 +155,38 @@
  b
  
@@ -62199 +70577 @@
 +
 +STARTTEST
++/^substitute
++:let y = substitute('', '\zs', 'a', 'g')    | put =y
++ENDTEST
++
++substitute
++
++STARTTEST
  :g/^STARTTEST/.,/^ENDTEST/d
  :1;/^Results/,$wq! test.out
@@ -62204 +70589 @@
 diff -Naur vim74.orig/src/testdir/test69.ok vim74/src/testdir/test69.ok
 --- vim74.orig/src/testdir/test69.ok    2013-03-07 17:31:32.000000000 +0000
-+++ vim74/src/testdir/test69.ok 2014-06-01 00:43:20.137465032 +0000
-@@ -149,3 +149,14 @@
++++ vim74/src/testdir/test69.ok 2014-07-21 23:33:47.033447964 +0000
+@@ -149,3 +149,18 @@
  aaaa
  aaa
@@ -62220 +70605 @@
 +[0, 1, 2, 4, 5, -1]
 +
++
++substitute
++aaaa
++
 diff -Naur vim74.orig/src/testdir/test72.in vim74/src/testdir/test72.in
 --- vim74.orig/src/testdir/test72.in    2012-01-04 18:04:17.000000000 +0000
-+++ vim74/src/testdir/test72.in 2014-06-01 00:43:20.217464828 +0000
++++ vim74/src/testdir/test72.in 2014-07-21 23:33:47.126781054 +0000
 @@ -105,7 +105,11 @@
  u:.w >>test.out
@@ -62238 +70627 @@
 diff -Naur vim74.orig/src/testdir/test75.in vim74/src/testdir/test75.in
 --- vim74.orig/src/testdir/test75.in    2013-06-29 11:48:42.000000000 +0000
-+++ vim74/src/testdir/test75.in 2014-06-01 00:43:20.277464675 +0000
++++ vim74/src/testdir/test75.in 2014-07-21 23:33:47.193447546 +0000
 @@ -1,8 +1,11 @@
 -" Tests for functions.
@@ -62275 +70664 @@
 diff -Naur vim74.orig/src/testdir/test75.ok vim74/src/testdir/test75.ok
 --- vim74.orig/src/testdir/test75.ok    2013-06-29 11:50:08.000000000 +0000
-+++ vim74/src/testdir/test75.ok 2014-06-01 00:43:20.294131299 +0000
++++ vim74/src/testdir/test75.ok 2014-07-21 23:33:47.200114196 +0000
 @@ -4,3 +4,4 @@
  {'silent': 0, 'noremap': 0, 'lhs': 'foo', 'mode': ' ', 'nowait': 1, 'expr': 0, 'sid': 0, 'rhs': 'bar', 'buffer': 1}
@@ -62283 +70672 @@
 diff -Naur vim74.orig/src/testdir/test77a.com vim74/src/testdir/test77a.com
 --- vim74.orig/src/testdir/test77a.com  1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test77a.com       2014-06-01 00:43:20.344131172 +0000
++++ vim74/src/testdir/test77a.com       2014-07-21 23:33:47.273447338 +0000
 @@ -0,0 +1,8 @@
 +$! test77a - help file creating checksum on VMS
@@ -62295 +70684 @@
 diff -Naur vim74.orig/src/testdir/test77a.in vim74/src/testdir/test77a.in
 --- vim74.orig/src/testdir/test77a.in   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test77a.in        2014-06-01 00:43:20.347464497 +0000
++++ vim74/src/testdir/test77a.in        2014-07-21 23:33:47.276780662 +0000
 @@ -0,0 +1,31 @@
 +Inserts 2 million lines with consecutive integers starting from 1
@@ -62330 +70719 @@
 diff -Naur vim74.orig/src/testdir/test77a.ok vim74/src/testdir/test77a.ok
 --- vim74.orig/src/testdir/test77a.ok   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test77a.ok        2014-06-01 00:43:20.347464497 +0000
++++ vim74/src/testdir/test77a.ok        2014-07-21 23:33:47.276780662 +0000
 @@ -0,0 +1 @@
 +  CHECKSUM$CHECKSUM = "844110470"
 diff -Naur vim74.orig/src/testdir/test79.in vim74/src/testdir/test79.in
 --- vim74.orig/src/testdir/test79.in    2013-04-13 09:16:38.000000000 +0000
-+++ vim74/src/testdir/test79.in 2014-06-01 00:43:20.380797745 +0000
++++ vim74/src/testdir/test79.in 2014-07-21 23:33:47.310113909 +0000
 @@ -1,6 +1,7 @@
  Test for *sub-replace-special* and *sub-replace-expression* on :substitute.
@@ -62404 +70793 @@
 diff -Naur vim74.orig/src/testdir/test79.ok vim74/src/testdir/test79.ok
 --- vim74.orig/src/testdir/test79.ok    2013-03-19 16:30:51.000000000 +0000
-+++ vim74/src/testdir/test79.ok 2014-06-01 00:43:20.387464395 +0000
++++ vim74/src/testdir/test79.ok 2014-07-21 23:33:47.316780558 +0000
 @@ -105,6 +105,7 @@
  
@@ -62431 +70820 @@
 diff -Naur vim74.orig/src/testdir/test80.in vim74/src/testdir/test80.in
 --- vim74.orig/src/testdir/test80.in    2013-03-19 16:30:51.000000000 +0000
-+++ vim74/src/testdir/test80.in 2014-06-01 00:43:20.430797618 +0000
++++ vim74/src/testdir/test80.in 2014-07-21 23:33:47.360113778 +0000
 @@ -117,6 +117,7 @@
  :set cpo&
@@ -62477 +70866 @@
 diff -Naur vim74.orig/src/testdir/test80.ok vim74/src/testdir/test80.ok
 --- vim74.orig/src/testdir/test80.ok    2013-03-19 16:31:45.000000000 +0000
-+++ vim74/src/testdir/test80.ok 2014-06-01 00:43:20.450797567 +0000
++++ vim74/src/testdir/test80.ok 2014-07-21 23:33:47.380113726 +0000
 @@ -90,6 +90,7 @@
  
@@ -62515 +70904 @@
 diff -Naur vim74.orig/src/testdir/test86.in vim74/src/testdir/test86.in
 --- vim74.orig/src/testdir/test86.in    2013-07-13 12:00:31.000000000 +0000
-+++ vim74/src/testdir/test86.in 2014-06-01 00:43:20.647463733 +0000
++++ vim74/src/testdir/test86.in 2014-07-21 23:33:47.566779906 +0000
 @@ -39,6 +39,7 @@
  py << EOF
@@ -62852 +71241 @@
 diff -Naur vim74.orig/src/testdir/test86.ok vim74/src/testdir/test86.ok
 --- vim74.orig/src/testdir/test86.ok    2013-06-23 14:38:39.000000000 +0000
-+++ vim74/src/testdir/test86.ok 2014-06-01 00:43:20.687463631 +0000
++++ vim74/src/testdir/test86.ok 2014-07-21 23:33:47.606779801 +0000
 @@ -41,6 +41,9 @@
  [2, 3]
@@ -63080 +71469 @@
 diff -Naur vim74.orig/src/testdir/test87.in vim74/src/testdir/test87.in
 --- vim74.orig/src/testdir/test87.in    2013-07-06 11:41:30.000000000 +0000
-+++ vim74/src/testdir/test87.in 2014-06-01 00:43:20.717463555 +0000
++++ vim74/src/testdir/test87.in 2014-07-21 23:33:47.646779697 +0000
 @@ -33,6 +33,7 @@
  py3 << EOF
@@ -63442 +71831 @@
 diff -Naur vim74.orig/src/testdir/test87.ok vim74/src/testdir/test87.ok
 --- vim74.orig/src/testdir/test87.ok    2013-06-23 14:38:39.000000000 +0000
-+++ vim74/src/testdir/test87.ok 2014-06-01 00:43:20.747463478 +0000
++++ vim74/src/testdir/test87.ok 2014-07-21 23:33:47.690112917 +0000
 @@ -41,6 +41,9 @@
  [2, 3]
@@ -63681 +72070 @@
 diff -Naur vim74.orig/src/testdir/test92.in vim74/src/testdir/test92.in
 --- vim74.orig/src/testdir/test92.in    2013-04-18 21:33:45.000000000 +0000
-+++ vim74/src/testdir/test92.in 2014-06-01 00:43:20.880796472 +0000
++++ vim74/src/testdir/test92.in 2014-07-21 23:33:47.820112578 +0000
 @@ -33,7 +33,7 @@
  :mksession! test.out
@@ -63693 +72082 @@
 diff -Naur vim74.orig/src/testdir/test93.in vim74/src/testdir/test93.in
 --- vim74.orig/src/testdir/test93.in    2013-02-26 16:13:01.000000000 +0000
-+++ vim74/src/testdir/test93.in 2014-06-01 00:43:20.904129746 +0000
++++ vim74/src/testdir/test93.in 2014-07-21 23:33:47.846779175 +0000
 @@ -33,7 +33,7 @@
  :mksession! test.out
@@ -63705 +72094 @@
 diff -Naur vim74.orig/src/testdir/test95.in vim74/src/testdir/test95.in
 --- vim74.orig/src/testdir/test95.in    2013-07-21 14:53:52.000000000 +0000
-+++ vim74/src/testdir/test95.in 2014-06-01 00:43:20.937462994 +0000
++++ vim74/src/testdir/test95.in 2014-07-21 23:33:47.903445694 +0000
 @@ -50,6 +50,12 @@
  :call add(tl, [2, ".\u05b9", " y\u05bb\u05b9 x\u05b9 ", "y\u05bb\u05b9"])
@@ -63750 +72139 @@
 diff -Naur vim74.orig/src/testdir/test95.ok vim74/src/testdir/test95.ok
 --- vim74.orig/src/testdir/test95.ok    2013-07-21 15:01:22.000000000 +0000
-+++ vim74/src/testdir/test95.ok 2014-06-01 00:43:20.940796319 +0000
++++ vim74/src/testdir/test95.ok 2014-07-21 23:33:47.920112317 +0000
 @@ -67,6 +67,24 @@
  OK 0 - .Ö¹Ö»
@@ -63778 +72167 @@
 diff -Naur vim74.orig/src/testdir/test97.in vim74/src/testdir/test97.in
 --- vim74.orig/src/testdir/test97.in    2013-08-02 12:55:50.000000000 +0000
-+++ vim74/src/testdir/test97.in 2014-06-01 00:43:20.960796268 +0000
++++ vim74/src/testdir/test97.in 2014-07-21 23:33:47.956778888 +0000
 @@ -3,14 +3,20 @@
  
@@ -63806 +72195 @@
 diff -Naur vim74.orig/src/testdir/test97.ok vim74/src/testdir/test97.ok
 --- vim74.orig/src/testdir/test97.ok    2013-07-03 14:14:50.000000000 +0000
-+++ vim74/src/testdir/test97.ok 2014-06-01 00:43:20.964129593 +0000
++++ vim74/src/testdir/test97.ok 2014-07-21 23:33:47.960112213 +0000
 @@ -3,3 +3,6 @@
  
@@ -63816 +72205 @@
 diff -Naur vim74.orig/src/testdir/test99.in vim74/src/testdir/test99.in
 --- vim74.orig/src/testdir/test99.in    1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test99.in 2014-06-01 00:43:21.017462791 +0000
++++ vim74/src/testdir/test99.in 2014-07-21 23:33:47.990112134 +0000
 @@ -0,0 +1,68 @@
 +Tests for regexp with multi-byte encoding and various magic settings.
@@ -63894 +72283 @@
 diff -Naur vim74.orig/src/testdir/test99.ok vim74/src/testdir/test99.ok
 --- vim74.orig/src/testdir/test99.ok    1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test99.ok 2014-06-01 00:43:21.020796116 +0000
++++ vim74/src/testdir/test99.ok 2014-07-21 23:33:47.993445459 +0000
 @@ -0,0 +1,24 @@
 +1 a aa abb abbcc
@@ -63927 +72316 @@
 diff -Naur vim74.orig/src/testdir/test_autoformat_join.in vim74/src/testdir/test_autoformat_join.in
 --- vim74.orig/src/testdir/test_autoformat_join.in      1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test_autoformat_join.in   2014-06-01 00:43:21.024129440 +0000
++++ vim74/src/testdir/test_autoformat_join.in   2014-07-21 23:33:47.996778784 +0000
 @@ -0,0 +1,23 @@
 +Tests for setting the '[,'] marks when joining lines.
@@ -63954 +72343 @@
 diff -Naur vim74.orig/src/testdir/test_autoformat_join.ok vim74/src/testdir/test_autoformat_join.ok
 --- vim74.orig/src/testdir/test_autoformat_join.ok      1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test_autoformat_join.ok   2014-06-01 00:43:21.024129440 +0000
++++ vim74/src/testdir/test_autoformat_join.ok   2014-07-21 23:33:48.000112108 +0000
 @@ -0,0 +1,8 @@
 +               O sodales, ludite, vos qui attamen consulite per voster honur.
@@ -63964 +72353 @@
 +First test: Start/End '[0, 16, 1, 0]/[0, 17, 1, 0]'
 +Second test: Start/End '[0, 19, 11, 0]/[0, 19, 67, 0]'
+diff -Naur vim74.orig/src/testdir/test_breakindent.in vim74/src/testdir/test_breakindent.in
+--- vim74.orig/src/testdir/test_breakindent.in  1970-01-01 00:00:00.000000000 +0000
++++ vim74/src/testdir/test_breakindent.in       2014-07-21 23:33:48.010112082 +0000
+@@ -0,0 +1,79 @@
++Test for breakindent
++
++STARTTEST
++:so small.vim
++:if !exists("+breakindent") | e! test.ok | w! test.out | qa! | endif
++:10new|:vsp|:vert resize 20
++:put =\"\tabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOP\"
++:set ts=4 sw=4 sts=4 breakindent
++:fu! ScreenChar(width)
++:      let c=''
++:      for i in range(1,a:width)
++:              let c.=nr2char(screenchar(line('.'), i))
++:      endfor
++:       let c.="\n"
++:      for i in range(1,a:width)
++:              let c.=nr2char(screenchar(line('.')+1, i))
++:      endfor
++:       let c.="\n"
++:      for i in range(1,a:width)
++:              let c.=nr2char(screenchar(line('.')+2, i))
++:      endfor
++:      return c
++:endfu
++:fu DoRecordScreen()
++:      wincmd l
++:      $put =printf(\"\n%s\", g:test)
++:      $put =g:line1
++:      wincmd p
++:endfu
++:let g:test="Test 1: Simple breakindent"
++:let line1=ScreenChar(8)
++:call DoRecordScreen()
++:let g:test="Test 2: Simple breakindent + sbr=>>"
++:set sbr=>>
++:let line1=ScreenChar(8)
++:call DoRecordScreen()
++:let g:test ="Test 3: Simple breakindent + briopt:sbr"
++:set briopt=sbr,min:0 sbr=++
++:let line1=ScreenChar(8)
++:call DoRecordScreen()
++:let g:test ="Test 4: Simple breakindent + min width: 18"
++:set sbr= briopt=min:18
++:let line1=ScreenChar(8)
++:call DoRecordScreen()
++:let g:test =" Test 5: Simple breakindent + shift by 2"
++:set briopt=shift:2,min:0
++:let line1=ScreenChar(8)
++:call DoRecordScreen()
++:let g:test=" Test 6: Simple breakindent + shift by -1"
++:set briopt=shift:-1,min:0
++:let line1=ScreenChar(8)
++:call DoRecordScreen()
++:let g:test=" Test 7: breakindent + shift by +1 + nu + sbr=? briopt:sbr"
++:set briopt=shift:1,sbr,min:0 nu sbr=? nuw=4
++:let line1=ScreenChar(10)
++:call DoRecordScreen()
++:let g:test=" Test 8: breakindent + shift:1 + nu + sbr=# list briopt:sbr"
++:set briopt=shift:1,sbr,min:0 nu sbr=# list
++:let line1=ScreenChar(10)
++:call DoRecordScreen()
++:let g:test=" Test 9: breakindent + shift by +1 + 'nu' + sbr=# list"
++:set briopt-=sbr
++:let line1=ScreenChar(10)
++:call DoRecordScreen()
++:let g:test=" Test 10: breakindent + shift by +1 + 'nu' + sbr=~ cpo+=n"
++:set cpo+=n sbr=~ nu nuw=4 nolist briopt=sbr,min:0
++:let line1=ScreenChar(10)
++:call DoRecordScreen()
++:wincmd p
++:let g:test="\n Test 11: strdisplaywidth when breakindent is on"
++:set cpo-=n sbr=>> nu nuw=4 nolist briopt= ts=4
++:let text=getline(2) "skip leading tab when calculating text width
++:let width = strlen(text[1:])+indent(2)*4+strlen(&sbr)*3 " text wraps 3 times
++:$put =g:test
++:$put =printf(\"strdisplaywidth: %d == calculated: %d\", strdisplaywidth(text), width)
++:%w! test.out
++:qa!
++ENDTEST
++dummy text
+diff -Naur vim74.orig/src/testdir/test_breakindent.ok vim74/src/testdir/test_breakindent.ok
+--- vim74.orig/src/testdir/test_breakindent.ok  1970-01-01 00:00:00.000000000 +0000
++++ vim74/src/testdir/test_breakindent.ok       2014-07-21 23:33:48.020112056 +0000
+@@ -0,0 +1,55 @@
++
++       abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOP
++
++Test 1: Simple breakindent
++    abcd
++    qrst
++    GHIJ
++
++Test 2: Simple breakindent + sbr=>>
++    abcd
++    >>qr
++    >>EF
++
++Test 3: Simple breakindent + briopt:sbr
++    abcd
++++  qrst
++++  GHIJ
++
++Test 4: Simple breakindent + min width: 18
++    abcd
++  qrstuv
++  IJKLMN
++
++ Test 5: Simple breakindent + shift by 2
++    abcd
++      qr
++      EF
++
++ Test 6: Simple breakindent + shift by -1
++    abcd
++   qrstu
++   HIJKL
++
++ Test 7: breakindent + shift by +1 + nu + sbr=? briopt:sbr
++  2     ab
++?        m
++?        x
++
++ Test 8: breakindent + shift:1 + nu + sbr=# list briopt:sbr
++  2 ^Iabcd
++#      opq
++#      BCD
++
++ Test 9: breakindent + shift by +1 + 'nu' + sbr=# list
++  2 ^Iabcd
++       #op
++       #AB
++
++ Test 10: breakindent + shift by +1 + 'nu' + sbr=~ cpo+=n
++  2     ab
++~       mn
++~       yz
++
++ Test 11: strdisplaywidth when breakindent is on
++strdisplaywidth: 46 == calculated: 64
 diff -Naur vim74.orig/src/testdir/test_eval.in vim74/src/testdir/test_eval.in
 --- vim74.orig/src/testdir/test_eval.in 1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test_eval.in      2014-06-01 00:43:21.027462765 +0000
++++ vim74/src/testdir/test_eval.in      2014-07-21 23:33:48.023445381 +0000
 @@ -0,0 +1,207 @@
 +Test for various eval features.   vim: set ft=vim :
@@ -64177 +72708 @@
 diff -Naur vim74.orig/src/testdir/test_eval.ok vim74/src/testdir/test_eval.ok
 --- vim74.orig/src/testdir/test_eval.ok 1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test_eval.ok      2014-06-01 00:43:21.030796090 +0000
++++ vim74/src/testdir/test_eval.ok      2014-07-21 23:33:48.026778705 +0000
 @@ -0,0 +1,350 @@
 +{{{1 let tests
@@ -64535 +73066 @@
 diff -Naur vim74.orig/src/testdir/test_eval_func.vim vim74/src/testdir/test_eval_func.vim
 --- vim74.orig/src/testdir/test_eval_func.vim   1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test_eval_func.vim        2014-06-01 00:43:21.034129415 +0000
++++ vim74/src/testdir/test_eval_func.vim        2014-07-21 23:33:48.030112030 +0000
 @@ -0,0 +1,10 @@
 +" Vim script used in test_eval.in.  Needed for script-local function.
@@ -64547 +73078 @@
 +$put ='Bar exists: ' . exists('Bar')
 +$put ='func Bar exists: ' . exists('*Bar')
+diff -Naur vim74.orig/src/testdir/test_listlbr.in vim74/src/testdir/test_listlbr.in
+--- vim74.orig/src/testdir/test_listlbr.in      1970-01-01 00:00:00.000000000 +0000
++++ vim74/src/testdir/test_listlbr.in   2014-07-21 23:33:48.030112030 +0000
+@@ -0,0 +1,52 @@
++Test for linebreak and list option (non-utf8)
++
++STARTTEST
++:so small.vim
++:if !exists("+linebreak") | e! test.ok | w! test.out | qa! | endif
++:10new|:vsp|:vert resize 20
++:put =\"\tabcdef hijklmn\tpqrstuvwxyz_1060ABCDEFGHIJKLMNOP \"
++:norm! zt
++:set ts=4 sw=4 sts=4 linebreak sbr=+ wrap
++:fu! ScreenChar(width)
++:      let c=''
++:      for j in range(1,4)
++:          for i in range(1,a:width)
++:              let c.=nr2char(screenchar(j, i))
++:          endfor
++:           let c.="\n"
++:      endfor
++:      return c
++:endfu
++:fu! DoRecordScreen()
++:      wincmd l
++:      $put =printf(\"\n%s\", g:test)
++:      $put =g:line
++:      wincmd p
++:endfu
++:let g:test="Test 1: set linebreak"
++:redraw!
++:let line=ScreenChar(winwidth(0))
++:call DoRecordScreen()
++:let g:test="Test 2: set linebreak + set list"
++:set linebreak list listchars=
++:redraw!
++:let line=ScreenChar(winwidth(0))
++:call DoRecordScreen()
++:let g:test ="Test 3: set linebreak nolist"
++:set nolist linebreak
++:redraw!
++:let line=ScreenChar(winwidth(0))
++:call DoRecordScreen()
++:let g:test ="Test 4: set linebreak with tab and 1 line as long as screen: should break!"
++:set nolist linebreak ts=8
++:let line="1\t".repeat('a', winwidth(0)-2)
++:$put =line
++:$
++:norm! zt
++:redraw!
++:let line=ScreenChar(winwidth(0))
++:call DoRecordScreen()
++:%w! test.out
++:qa!
++ENDTEST
++dummy text
+diff -Naur vim74.orig/src/testdir/test_listlbr.ok vim74/src/testdir/test_listlbr.ok
+--- vim74.orig/src/testdir/test_listlbr.ok      1970-01-01 00:00:00.000000000 +0000
++++ vim74/src/testdir/test_listlbr.ok   2014-07-21 23:33:48.036778679 +0000
+@@ -0,0 +1,27 @@
++
++       abcdef hijklmn  pqrstuvwxyz_1060ABCDEFGHIJKLMNOP 
++
++Test 1: set linebreak
++    abcdef          
+++hijklmn            
+++pqrstuvwxyz_1060ABC
+++DEFGHIJKLMNOP      
++
++Test 2: set linebreak + set list
++^Iabcdef hijklmn^I  
+++pqrstuvwxyz_1060ABC
+++DEFGHIJKLMNOP      
++                    
++
++Test 3: set linebreak nolist
++    abcdef          
+++hijklmn            
+++pqrstuvwxyz_1060ABC
+++DEFGHIJKLMNOP      
++1      aaaaaaaaaaaaaaaaaa
++
++Test 4: set linebreak with tab and 1 line as long as screen: should break!
++1                   
+++aaaaaaaaaaaaaaaaaa 
++~                   
++~                   
+diff -Naur vim74.orig/src/testdir/test_listlbr_utf8.in vim74/src/testdir/test_listlbr_utf8.in
+--- vim74.orig/src/testdir/test_listlbr_utf8.in 1970-01-01 00:00:00.000000000 +0000
++++ vim74/src/testdir/test_listlbr_utf8.in      2014-07-21 23:33:48.040112004 +0000
+@@ -0,0 +1,41 @@
++Test for linebreak and list option in utf-8 mode
++
++STARTTEST
++:so small.vim
++:if !exists("+linebreak") | e! test.ok | w! test.out | qa! | endif
++:so mbyte.vim
++:if &enc !=? 'utf-8'|:e! test.ok|:w! test.out|qa!|endif
++:10new|:vsp|:vert resize 20
++:put =\"\tabcdef hijklmn\tpqrstuvwxyz\u00a01060ABCDEFGHIJKLMNOP \"
++:norm! zt
++:set ts=4 sw=4 sts=4 linebreak sbr=+ wrap
++:fu! ScreenChar(width)
++:      let c=''
++:      for j in range(1,4)
++:          for i in range(1,a:width)
++:              let c.=nr2char(screenchar(j, i))
++:          endfor
++:           let c.="\n"
++:      endfor
++:      return c
++:endfu
++:fu! DoRecordScreen()
++:      wincmd l
++:      $put =printf(\"\n%s\", g:test)
++:      $put =g:line
++:      wincmd p
++:endfu
++:let g:test ="Test 1: set linebreak + set list + fancy listchars"
++:exe "set linebreak list listchars=nbsp:\u2423,tab:\u2595\u2014,trail:\u02d1,eol:\ub6"
++:redraw!
++:let line=ScreenChar(winwidth(0))
++:call DoRecordScreen()
++:let g:test ="Test 2: set nolinebreak list"
++:set list nolinebreak
++:redraw!
++:let line=ScreenChar(winwidth(0))
++:call DoRecordScreen()
++:%w! test.out
++:qa!
++ENDTEST
++dummy text
+diff -Naur vim74.orig/src/testdir/test_listlbr_utf8.ok vim74/src/testdir/test_listlbr_utf8.ok
+--- vim74.orig/src/testdir/test_listlbr_utf8.ok 1970-01-01 00:00:00.000000000 +0000
++++ vim74/src/testdir/test_listlbr_utf8.ok      2014-07-21 23:33:48.043445329 +0000
+@@ -0,0 +1,14 @@
++
++       abcdef hijklmn  pqrstuvwxyz 1060ABCDEFGHIJKLMNOP 
++
++Test 1: set linebreak + set list + fancy listchars
++▕———abcdef          
+++hijklmn▕———        
+++pqrstuvwxyz␣1060ABC
+++DEFGHIJKLMNOPˑ¶    
++
++Test 2: set nolinebreak list
++▕———abcdef hijklmn▕—
+++pqrstuvwxyz␣1060ABC
+++DEFGHIJKLMNOPˑ¶    
++¶                   
 diff -Naur vim74.orig/src/testdir/test_options.in vim74/src/testdir/test_options.in
 --- vim74.orig/src/testdir/test_options.in      1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test_options.in   2014-06-01 00:43:21.050796039 +0000
++++ vim74/src/testdir/test_options.in   2014-07-21 23:33:48.046778653 +0000
 @@ -0,0 +1,17 @@
 +Test for ":options".
@@ -64570 +73251 @@
 diff -Naur vim74.orig/src/testdir/test_options.ok vim74/src/testdir/test_options.ok
 --- vim74.orig/src/testdir/test_options.ok      1970-01-01 00:00:00.000000000 +0000
-+++ vim74/src/testdir/test_options.ok   2014-06-01 00:43:21.050796039 +0000
++++ vim74/src/testdir/test_options.ok   2014-07-21 23:33:48.080111900 +0000
 @@ -0,0 +1,2 @@
 +result
@@ -64576 +73257 @@
 diff -Naur vim74.orig/src/ui.c vim74/src/ui.c
 --- vim74.orig/src/ui.c 2013-07-13 18:57:08.000000000 +0000
-+++ vim74/src/ui.c      2014-06-01 00:43:21.167462409 +0000
++++ vim74/src/ui.c      2014-07-21 23:33:48.650110412 +0000
+@@ -2324,7 +2324,7 @@
+     if (       *target != XA_STRING
+ #ifdef FEAT_MBYTE
+            && *target != vimenc_atom
+-           && *target != utf8_atom
++           && (*target != utf8_atom || !enc_utf8)
+ #endif
+            && *target != vim_atom
+            && *target != text_atom
 @@ -2610,13 +2610,11 @@
         if (on_sep_line)
@@ -64663 +73353 @@
      curwin->w_curswant = col;
      curwin->w_set_curswant = FALSE;    /* May still have been TRUE */
+@@ -3170,15 +3162,15 @@
+     /* try to advance to the specified column */
+     int                count = 0;
+     char_u     *ptr;
+-    char_u     *start;
++    char_u     *line;
+ 
+-    start = ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
++    line = ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
+     while (count < vcol && *ptr != NUL)
+     {
+-       count += win_lbr_chartabsize(wp, ptr, count, NULL);
++       count += win_lbr_chartabsize(wp, line, ptr, count, NULL);
+        mb_ptr_adv(ptr);
+     }
+-    return (int)(ptr - start);
++    return (int)(ptr - line);
+ }
+ #endif
+ 
 diff -Naur vim74.orig/src/undo.c vim74/src/undo.c
 --- vim74.orig/src/undo.c       2013-06-10 18:13:37.000000000 +0000
-+++ vim74/src/undo.c    2014-06-01 00:43:21.194129007 +0000
++++ vim74/src/undo.c    2014-07-21 23:33:48.666777036 +0000
 @@ -83,6 +83,7 @@
  
@@ -64897 +73607 @@
 diff -Naur vim74.orig/src/version.c vim74/src/version.c
 --- vim74.orig/src/version.c    2013-08-10 11:29:20.000000000 +0000
-+++ vim74/src/version.c 2014-06-01 00:43:21.227462256 +0000
++++ vim74/src/version.c 2014-07-21 23:33:48.780110073 +0000
 @@ -60,6 +60,11 @@
  
@@ -64941 +73651 @@
         NULL
  };
-@@ -728,6 +735,638 @@
+@@ -728,6 +735,752 @@
  static int included_patches[] =
  {   /* Add new patch number below this line */
  /**/
++    373,
++/**/
++    372,
++/**/
++    371,
++/**/
++    370,
++/**/
++    369,
++/**/
++    368,
++/**/
++    367,
++/**/
++    366,
++/**/
++    365,
++/**/
++    364,
++/**/
++    363,
++/**/
++    362,
++/**/
++    361,
++/**/
++    360,
++/**/
++    359,
++/**/
++    358,
++/**/
++    357,
++/**/
++    356,
++/**/
++    355,
++/**/
++    354,
++/**/
++    353,
++/**/
++    352,
++/**/
++    351,
++/**/
++    350,
++/**/
++    349,
++/**/
++    348,
++/**/
++    347,
++/**/
++    346,
++/**/
++    345,
++/**/
++    344,
++/**/
++    343,
++/**/
++    342,
++/**/
++    341,
++/**/
++    340,
++/**/
++    339,
++/**/
++    338,
++/**/
++    337,
++/**/
++    336,
++/**/
++    335,
++/**/
++    334,
++/**/
++    333,
++/**/
++    332,
++/**/
++    331,
++/**/
++    330,
++/**/
++    329,
++/**/
++    328,
++/**/
++    327,
++/**/
++    326,
++/**/
++    325,
++/**/
++    324,
++/**/
++    323,
++/**/
++    322,
++/**/
++    321,
++/**/
++    320,
++/**/
++    319,
++/**/
++    318,
++/**/
++    317,
++/**/
 +    316,
 +/**/
@@ -65582 +74406 @@
 diff -Naur vim74.orig/src/vim.h vim74/src/vim.h
 --- vim74.orig/src/vim.h        2013-08-02 14:02:27.000000000 +0000
-+++ vim74/src/vim.h     2014-06-01 00:43:21.297462078 +0000
++++ vim74/src/vim.h     2014-07-21 23:33:48.826776618 +0000
 @@ -43,7 +43,7 @@
   * it becomes zero.  This is likely a problem of not being able to run the
@@ -65744 +74568 @@
 diff -Naur vim74.orig/src/winclip.c vim74/src/winclip.c
 --- vim74.orig/src/winclip.c    2013-07-01 19:05:53.000000000 +0000
-+++ vim74/src/winclip.c 2014-06-01 00:43:21.514128193 +0000
++++ vim74/src/winclip.c 2014-07-21 23:33:49.033442746 +0000
 @@ -797,4 +797,29 @@
         vim_free(widestr);
@@ -65777 +74601 @@
 diff -Naur vim74.orig/src/window.c vim74/src/window.c
 --- vim74.orig/src/window.c     2013-07-24 15:38:29.000000000 +0000
-+++ vim74/src/window.c  2014-06-01 00:43:21.530794817 +0000
++++ vim74/src/window.c  2014-07-21 23:33:49.070109317 +0000
 @@ -130,9 +130,7 @@
      case Ctrl_S:
@@ -65896 +74720 @@
                             postponed_split = Prenum;
                         else
-@@ -1216,8 +1192,8 @@
+@@ -710,6 +686,8 @@
+     int                layout;
+     frame_T    *frp, *curfrp;
+     int                before;
++    int                minheight;
++    int                wmh1;
+ 
+     if (flags & WSP_TOP)
+        oldwin = firstwin;
+@@ -738,22 +716,32 @@
+ #ifdef FEAT_VERTSPLIT
+     if (flags & WSP_VERT)
+     {
++       int     wmw1;
++       int     minwidth;
++
+        layout = FR_ROW;
+ 
+        /*
+         * Check if we are able to split the current window and compute its
+         * width.
+         */
+-       needed = p_wmw + 1;
++       /* Current window requires at least 1 space. */
++       wmw1 = (p_wmw == 0 ? 1 : p_wmw);
++       needed = wmw1 + 1;
+        if (flags & WSP_ROOM)
+-           needed += p_wiw - p_wmw;
++           needed += p_wiw - wmw1;
+        if (p_ea || (flags & (WSP_BOT | WSP_TOP)))
+        {
++           minwidth = frame_minwidth(topframe, NOWIN);
+            available = topframe->fr_width;
+-           needed += frame_minwidth(topframe, NULL);
++           needed += minwidth;
+        }
+        else
+-           available = oldwin->w_width;
++       {
++           minwidth = frame_minwidth(oldwin->w_frame, NOWIN);
++           available = oldwin->w_frame->fr_width;
++           needed += minwidth;
++       }
+        if (available < needed && new_wp == NULL)
+        {
+            EMSG(_(e_noroom));
+@@ -761,10 +749,10 @@
+        }
+        if (new_size == 0)
+            new_size = oldwin->w_width / 2;
+-       if (new_size > oldwin->w_width - p_wmw - 1)
+-           new_size = oldwin->w_width - p_wmw - 1;
+-       if (new_size < p_wmw)
+-           new_size = p_wmw;
++       if (new_size > available - minwidth - 1)
++           new_size = available - minwidth - 1;
++       if (new_size < wmw1)
++           new_size = wmw1;
+ 
+        /* if it doesn't fit in the current window, need win_equal() */
+        if (oldwin->w_width - new_size - 1 < p_wmw)
+@@ -805,18 +793,22 @@
+         * Check if we are able to split the current window and compute its
+         * height.
+         */
+-       needed = p_wmh + STATUS_HEIGHT + need_status;
++       /* Current window requires at least 1 space. */
++       wmh1 = (p_wmh == 0 ? 1 : p_wmh);
++       needed = wmh1 + STATUS_HEIGHT;
+        if (flags & WSP_ROOM)
+-           needed += p_wh - p_wmh;
++           needed += p_wh - wmh1;
+        if (p_ea || (flags & (WSP_BOT | WSP_TOP)))
+        {
++           minheight = frame_minheight(topframe, NOWIN) + need_status;
+            available = topframe->fr_height;
+-           needed += frame_minheight(topframe, NULL);
++           needed += minheight;
+        }
+        else
+        {
+-           available = oldwin->w_height;
+-           needed += p_wmh;
++           minheight = frame_minheight(oldwin->w_frame, NOWIN) + need_status;
++           available = oldwin->w_frame->fr_height;
++           needed += minheight;
+        }
+        if (available < needed && new_wp == NULL)
+        {
+@@ -831,11 +823,10 @@
+        }
+        if (new_size == 0)
+            new_size = oldwin_height / 2;
+-
+-       if (new_size > oldwin_height - p_wmh - STATUS_HEIGHT)
+-           new_size = oldwin_height - p_wmh - STATUS_HEIGHT;
+-       if (new_size < p_wmh)
+-           new_size = p_wmh;
++       if (new_size > available - minheight - STATUS_HEIGHT)
++           new_size = available - minheight - STATUS_HEIGHT;
++       if (new_size < wmh1)
++           new_size = wmh1;
+ 
+        /* if it doesn't fit in the current window, need win_equal() */
+        if (oldwin_height - new_size - STATUS_HEIGHT < p_wmh)
+@@ -1216,8 +1207,8 @@
      else
         copy_loclist(oldp, newp);
@@ -65907 +74836 @@
      /* copy tagstack and folds */
      for (i = 0; i < oldp->w_tagstacklen; i++)
-@@ -2172,8 +2148,9 @@
+@@ -2172,8 +2163,9 @@
   * If "free_buf" is TRUE related buffer may be unloaded.
   *
@@ -65918 +74847 @@
      win_T      *win;
      int                free_buf;
-@@ -2190,21 +2167,21 @@
+@@ -2190,21 +2182,21 @@
      if (last_window())
      {
@@ -65944 +74873 @@
  #endif
  
-@@ -2212,7 +2189,7 @@
+@@ -2212,7 +2204,7 @@
       * and then close the window and the tab page to avoid that curwin and
       * curtab are invalid while we are freeing memory. */
@@ -65953 +74882 @@
      /* When closing the help window, try restoring a snapshot after closing
       * the window.  Otherwise clear the snapshot, it's now invalid. */
-@@ -2240,22 +2217,22 @@
+@@ -2240,22 +2232,22 @@
             win->w_closing = TRUE;
             apply_autocmds(EVENT_BUFLEAVE, NULL, NULL, FALSE, curbuf);
@@ -65981 +74910 @@
      }
  #endif
-@@ -2303,7 +2280,7 @@
+@@ -2303,7 +2295,7 @@
       * other window or moved to another tab page. */
      else if (!win_valid(win) || last_window() || curtab != prev_curtab
@@ -65990 +74919 @@
      /* Free the memory used for the window and get the window that received
       * the screen space. */
-@@ -2383,6 +2360,7 @@
+@@ -2383,6 +2375,7 @@
  #endif
  
@@ -65998 +74927 @@
  
  /*
-@@ -3724,9 +3702,7 @@
+@@ -2499,6 +2492,10 @@
+ 
+     while (firstwin != NULL)
+        (void)win_free_mem(firstwin, &dummy, NULL);
++
++    /* No window should be used after this. Set curwin to NULL to crash
++     * instead of using freed memory. */
++    curwin = NULL;
+ }
+ #endif
+ 
+@@ -3724,9 +3721,7 @@
  {
      tabpage_T  *tp = curtab;
@@ -66008 +74948 @@
      if (trigger_leave_autocmds)
      {
-@@ -4027,12 +4003,10 @@
+@@ -4027,12 +4022,10 @@
         return;
  #endif
@@ -66021 +74961 @@
  #ifdef FEAT_GUI
      need_mouse_correct = TRUE;
-@@ -5649,7 +5623,7 @@
+@@ -4276,6 +4269,11 @@
+     /* sync undo before leaving the current buffer */
+     if (undo_sync && curbuf != wp->w_buffer)
+        u_sync(FALSE);
++
++    /* Might need to scroll the old window before switching, e.g., when the
++     * cursor was moved. */
++    update_topline();
++
+     /* may have to copy the buffer options when 'cpo' contains 'S' */
+     if (wp->w_buffer != curbuf)
+        buf_copy_options(wp->w_buffer, BCO_ENTER | BCO_NOHELP);
+@@ -4623,7 +4621,15 @@
+     if (wp != aucmd_win)
+ #endif
+        win_remove(wp, tp);
+-    vim_free(wp);
++#ifdef FEAT_AUTOCMD
++    if (autocmd_busy)
++    {
++       wp->w_next = au_pending_free_win;
++       au_pending_free_win = wp;
++    }
++    else
++#endif
++       vim_free(wp);
+ 
+ #ifdef FEAT_AUTOCMD
+     unblock_autocmds();
+@@ -4747,8 +4753,12 @@
+ win_free_lsize(wp)
+     win_T      *wp;
+ {
+-    vim_free(wp->w_lines);
+-    wp->w_lines = NULL;
++    /* TODO: why would wp be NULL here? */
++    if (wp != NULL)
++    {
++       vim_free(wp->w_lines);
++       wp->w_lines = NULL;
++    }
+ }
+ 
+ /*
+@@ -4845,15 +4855,20 @@
+     garray_T   *gap;
+ {
+     win_T      *wp;
+-    int                i;
++    int                i, j;
+ 
+     if (win_count() * 2 == gap->ga_len)
+     {
+-       i = 0;
+-       for (wp = firstwin; wp != NULL; wp = wp->w_next)
++       /* The order matters, because frames contain other frames, but it's
++        * difficult to get right. The easy way out is to do it twice. */
++       for (j = 0; j < 2; ++j)
+        {
+-           frame_setwidth(wp->w_frame, ((int *)gap->ga_data)[i++]);
+-           win_setheight_win(((int *)gap->ga_data)[i++], wp);
++           i = 0;
++           for (wp = firstwin; wp != NULL; wp = wp->w_next)
++           {
++               frame_setwidth(wp->w_frame, ((int *)gap->ga_data)[i++]);
++               win_setheight_win(((int *)gap->ga_data)[i++], wp);
++           }
+        }
+        /* recompute the window positions */
+        (void)win_comp_pos();
+@@ -5649,7 +5664,7 @@
      win_T      *wp;
  {
@@ -66030 +75040 @@
  
  /*
-@@ -5664,6 +5638,7 @@
+@@ -5664,6 +5679,7 @@
  {
      linenr_T   lnum;
@@ -66038 +75048 @@
      /* Don't want a negative height.  Happens when splitting a tiny window.
       * Will equalize heights soon to fix it. */
-@@ -5672,8 +5647,13 @@
+@@ -5672,8 +5688,18 @@
      if (wp->w_height == height)
         return;     /* nothing to do */
@@ -66047 +75057 @@
 +    {
 +       if (wp == curwin)
-+           validate_cursor();          /* w_wrow needs to be valid */
++           /* w_wrow needs to be valid. When setting 'laststatus' this may
++            * call win_new_height() recursively. */
++           validate_cursor();
++       if (wp->w_height != prev_height)
++           return;  /* Recursive call already changed the size, bail out here
++                       to avoid the following to mess things up. */
 +       if (wp->w_wrow != wp->w_prev_fraction_row)
 +           set_fraction(wp);
@@ -66054 +75069 @@
      wp->w_height = height;
      wp->w_skipcol = 0;
-@@ -5693,7 +5673,8 @@
+@@ -5693,7 +5719,8 @@
         lnum = wp->w_cursor.lnum;
         if (lnum < 1)           /* can happen when starting up */
@@ -66064 +75079 @@
         sline = wp->w_wrow - line_size;
  
-@@ -5729,8 +5710,9 @@
+@@ -5729,8 +5756,9 @@
                     --wp->w_wrow;
                 }
             }
-+            set_topline(wp, lnum);
++           set_topline(wp, lnum);
         }
 -       else
@@ -66075 +75090 @@
             while (sline > 0 && lnum > 1)
             {
-@@ -5773,8 +5755,9 @@
+@@ -5773,8 +5801,9 @@
                 lnum = 1;
                 wp->w_wrow -= sline;
             }
 +
-+            set_topline(wp, lnum);
++           set_topline(wp, lnum);
         }
 -       set_topline(wp, lnum);
@@ -66086 +75101 @@
  
      if (wp == curwin)
-@@ -5783,7 +5766,8 @@
+@@ -5783,7 +5812,8 @@
             update_topline();
         curs_columns(FALSE);    /* validate w_wrow */
@@ -66096 +75111 @@
      win_comp_scroll(wp);
      redraw_win_later(wp, SOME_VALID);
-@@ -6035,7 +6019,6 @@
+@@ -6035,7 +6065,6 @@
      long       count;
      linenr_T   *file_lnum;
@@ -66104 +75119 @@
      {
         int     len;
-@@ -6046,7 +6029,6 @@
+@@ -6046,7 +6075,6 @@
         return find_file_name_in_path(ptr, len,
                      FNAME_MESS|FNAME_EXP|FNAME_REL, count, curbuf->b_ffname);
@@ -66112 +75127 @@
                                file_lnum);
  
+@@ -6747,20 +6775,22 @@
+  * Return ID of added match, -1 on failure.
+  */
+     int
+-match_add(wp, grp, pat, prio, id)
++match_add(wp, grp, pat, prio, id, pos_list)
+     win_T      *wp;
+     char_u     *grp;
+     char_u     *pat;
+     int                prio;
+     int                id;
++    list_T     *pos_list;
+ {
+-    matchitem_T *cur;
+-    matchitem_T *prev;
+-    matchitem_T *m;
++    matchitem_T        *cur;
++    matchitem_T        *prev;
++    matchitem_T        *m;
+     int                hlg_id;
+-    regprog_T  *regprog;
++    regprog_T  *regprog = NULL;
++    int                rtype = SOME_VALID;
+ 
+-    if (*grp == NUL || *pat == NUL)
++    if (*grp == NUL || (pat != NULL && *pat == NUL))
+        return -1;
+     if (id < -1 || id == 0)
+     {
+@@ -6785,7 +6815,7 @@
+        EMSG2(_(e_nogroup), grp);
+        return -1;
+     }
+-    if ((regprog = vim_regcomp(pat, RE_MAGIC)) == NULL)
++    if (pat != NULL && (regprog = vim_regcomp(pat, RE_MAGIC)) == NULL)
+     {
+        EMSG2(_(e_invarg2), pat);
+        return -1;
+@@ -6803,15 +6833,112 @@
+     }
+ 
+     /* Build new match. */
+-    m = (matchitem_T *)alloc(sizeof(matchitem_T));
++    m = (matchitem_T *)alloc_clear(sizeof(matchitem_T));
+     m->id = id;
+     m->priority = prio;
+-    m->pattern = vim_strsave(pat);
++    m->pattern = pat == NULL ? NULL : vim_strsave(pat);
+     m->hlg_id = hlg_id;
+     m->match.regprog = regprog;
+     m->match.rmm_ic = FALSE;
+     m->match.rmm_maxcol = 0;
+ 
++    /* Set up position matches */
++    if (pos_list != NULL)
++    {
++       linenr_T        toplnum = 0;
++       linenr_T        botlnum = 0;
++       listitem_T      *li;
++       int             i;
++
++       for (i = 0, li = pos_list->lv_first; li != NULL && i < MAXPOSMATCH;
++                                                       i++, li = li->li_next)
++       {
++           linenr_T    lnum = 0;
++           colnr_T     col = 0;
++           int         len = 1;
++           list_T      *subl;
++           listitem_T  *subli;
++           int         error = FALSE;
++
++           if (li->li_tv.v_type == VAR_LIST)
++           {
++               subl = li->li_tv.vval.v_list;
++               if (subl == NULL)
++                   goto fail;
++               subli = subl->lv_first;
++               if (subli == NULL)
++                   goto fail;
++               lnum = get_tv_number_chk(&subli->li_tv, &error);
++               if (error == TRUE)
++                   goto fail;
++               if (lnum == 0)
++               {
++                   --i;
++                   continue;
++               }
++               m->pos.pos[i].lnum = lnum;
++               subli = subli->li_next;
++               if (subli != NULL)
++               {
++                   col = get_tv_number_chk(&subli->li_tv, &error);
++                   if (error == TRUE)
++                       goto fail;
++                   subli = subli->li_next;
++                   if (subli != NULL)
++                   {
++                       len = get_tv_number_chk(&subli->li_tv, &error);
++                       if (error == TRUE)
++                           goto fail;
++                   }
++               }
++               m->pos.pos[i].col = col;
++               m->pos.pos[i].len = len;
++           }
++           else if (li->li_tv.v_type == VAR_NUMBER)
++           {
++               if (li->li_tv.vval.v_number == 0)
++               {
++                   --i;
++                   continue;
++               }
++               m->pos.pos[i].lnum = li->li_tv.vval.v_number;
++               m->pos.pos[i].col = 0;
++               m->pos.pos[i].len = 0;
++           }
++           else
++           {
++               EMSG(_("List or number required"));
++               goto fail;
++           }
++           if (toplnum == 0 || lnum < toplnum)
++               toplnum = lnum;
++           if (botlnum == 0 || lnum >= botlnum)
++               botlnum = lnum + 1;
++       }
++
++       /* Calculate top and bottom lines for redrawing area */
++       if (toplnum != 0)
++       {
++           if (wp->w_buffer->b_mod_set)
++           {
++               if (wp->w_buffer->b_mod_top > toplnum)
++                   wp->w_buffer->b_mod_top = toplnum;
++               if (wp->w_buffer->b_mod_bot < botlnum)
++                   wp->w_buffer->b_mod_bot = botlnum;
++           }
++           else
++           {
++               wp->w_buffer->b_mod_set = TRUE;
++               wp->w_buffer->b_mod_top = toplnum;
++               wp->w_buffer->b_mod_bot = botlnum;
++               wp->w_buffer->b_mod_xlines = 0;
++           }
++           m->pos.toplnum = toplnum;
++           m->pos.botlnum = botlnum;
++           rtype = VALID;
++       }
++    }
++
+     /* Insert new match.  The match list is in ascending order with regard to
+      * the match priorities. */
+     cur = wp->w_match_head;
+@@ -6827,8 +6954,12 @@
+        prev->next = m;
+     m->next = cur;
+ 
+-    redraw_later(SOME_VALID);
++    redraw_later(rtype);
+     return id;
++
++fail:
++    vim_free(m);
++    return -1;
+ }
+ 
+ /*
+@@ -6841,8 +6972,9 @@
+     int                id;
+     int                perr;
+ {
+-    matchitem_T *cur = wp->w_match_head;
+-    matchitem_T *prev = cur;
++    matchitem_T        *cur = wp->w_match_head;
++    matchitem_T        *prev = cur;
++    int                rtype = SOME_VALID;
+ 
+     if (id < 1)
+     {
+@@ -6868,8 +7000,26 @@
+        prev->next = cur->next;
+     vim_regfree(cur->match.regprog);
+     vim_free(cur->pattern);
++    if (cur->pos.toplnum != 0)
++    {
++       if (wp->w_buffer->b_mod_set)
++       {
++           if (wp->w_buffer->b_mod_top > cur->pos.toplnum)
++               wp->w_buffer->b_mod_top = cur->pos.toplnum;
++           if (wp->w_buffer->b_mod_bot < cur->pos.botlnum)
++               wp->w_buffer->b_mod_bot = cur->pos.botlnum;
++       }
++       else
++       {
++           wp->w_buffer->b_mod_set = TRUE;
++           wp->w_buffer->b_mod_top = cur->pos.toplnum;
++           wp->w_buffer->b_mod_bot = cur->pos.botlnum;
++           wp->w_buffer->b_mod_xlines = 0;
++       }
++       rtype = VALID;
++    }
+     vim_free(cur);
+-    redraw_later(SOME_VALID);
++    redraw_later(rtype);
+     return 0;
+ }
+ 
 diff -Naur vim74.orig/src/xxd/Make_cyg.mak vim74/src/xxd/Make_cyg.mak
 --- vim74.orig/src/xxd/Make_cyg.mak     2010-05-15 11:04:06.000000000 +0000
-+++ vim74/src/xxd/Make_cyg.mak  2014-06-01 00:43:21.840794027 +0000
++++ vim74/src/xxd/Make_cyg.mak  2014-07-21 23:33:49.350108586 +0000
 @@ -8,7 +8,7 @@
  DEFINES =