Changeset 350ab24 for patches

Timestamp:

Apr 28, 2014, 8:56:46 PM (11 years ago)

Author:

Chris Staub <chris@…>

Parents:

5c8e74d (diff), 31cfd067 (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:

Merged latest systemd branch changes

Location:

patches

Files:

• bash-4.3-branch_update-2.patch (moved) (moved from patches/bash-4.3-branch_update-1.patch ) (10 diffs)
• iproute2-3.14.0-libdir-1.patch (moved) (moved from patches/iproute2-3.12.0-libdir-1.patch ) (1 diff)
• readline-6.3-branch_update-1.patch (deleted)
• readline-6.3-branch_update-2.patch (added)
• vim-7.4-branch_update-3.patch (moved) (moved from patches/vim-7.4-branch_update-2.patch ) (958 diffs)

patches/bash-4.3-branch_update-2.patch

@@ -4 +4 @@
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 4.3-008
+Description: Contains all upstream patches up to 4.3-011
 
 diff -Naur bash-4.3.orig/arrayfunc.c bash-4.3/arrayfunc.c
 --- bash-4.3.orig/arrayfunc.c   2013-08-02 15:19:59.000000000 -0500
-+++ bash-4.3/arrayfunc.c        2014-03-30 08:38:16.233599982 -0500
++++ bash-4.3/arrayfunc.c        2014-04-24 20:08:49.474314102 -0500
 @@ -597,6 +597,11 @@
        if (assoc_p (var))
@@ -21 +21 @@
         }
  
+diff -Naur bash-4.3.orig/externs.h bash-4.3/externs.h
+--- bash-4.3.orig/externs.h     2014-01-02 13:58:20.000000000 -0600
++++ bash-4.3/externs.h  2014-04-24 20:08:54.927367945 -0500
+@@ -324,6 +324,7 @@
+ extern char *sh_backslash_quote __P((char *, const char *, int));
+ extern char *sh_backslash_quote_for_double_quotes __P((char *));
+ extern int sh_contains_shell_metas __P((char *));
++extern int sh_contains_quotes __P((char *));
+ 
+ /* declarations for functions defined in lib/sh/spell.c */
+ extern int spname __P((char *, char *));
 diff -Naur bash-4.3.orig/jobs.c bash-4.3/jobs.c
 --- bash-4.3.orig/jobs.c        2014-01-10 08:05:34.000000000 -0600
-+++ bash-4.3/jobs.c     2014-03-30 08:38:14.340206206 -0500
++++ bash-4.3/jobs.c     2014-04-24 20:08:47.897732294 -0500
 @@ -4374,7 +4374,7 @@
  void
@@ -35 +46 @@
 diff -Naur bash-4.3.orig/lib/glob/glob.c bash-4.3/lib/glob/glob.c
 --- bash-4.3.orig/lib/glob/glob.c       2014-01-31 20:43:51.000000000 -0600
-+++ bash-4.3/lib/glob/glob.c    2014-03-30 08:38:18.153657420 -0500
++++ bash-4.3/lib/glob/glob.c    2014-04-24 20:08:51.054232810 -0500
 @@ -179,42 +179,50 @@
       char *pat, *dname;
@@ -147 +158 @@
 diff -Naur bash-4.3.orig/lib/glob/gmisc.c bash-4.3/lib/glob/gmisc.c
 --- bash-4.3.orig/lib/glob/gmisc.c      2013-10-28 13:45:25.000000000 -0500
-+++ bash-4.3/lib/glob/gmisc.c   2014-03-30 08:38:18.153657420 -0500
++++ bash-4.3/lib/glob/gmisc.c   2014-04-24 20:08:51.054232810 -0500
 @@ -210,6 +210,7 @@
      case '+':
@@ -156 +167 @@
      default:
        return 0;
+diff -Naur bash-4.3.orig/lib/readline/display.c bash-4.3/lib/readline/display.c
+--- bash-4.3.orig/lib/readline/display.c        2013-12-27 12:10:56.000000000 -0600
++++ bash-4.3/lib/readline/display.c     2014-04-24 20:08:56.493955444 -0500
+@@ -2677,7 +2677,8 @@
+ {
+   if (_rl_echoing_p)
+     {
+-      _rl_move_vert (_rl_vis_botlin);
++      if (_rl_vis_botlin > 0)  /* minor optimization plus bug fix */
++       _rl_move_vert (_rl_vis_botlin);
+       _rl_vis_botlin = 0;
+       fflush (rl_outstream);
+       rl_restart_output (1, 0);
 diff -Naur bash-4.3.orig/lib/readline/readline.c bash-4.3/lib/readline/readline.c
 --- bash-4.3.orig/lib/readline/readline.c       2013-10-28 13:58:06.000000000 -0500
-+++ bash-4.3/lib/readline/readline.c    2014-03-30 08:38:10.556751185 -0500
++++ bash-4.3/lib/readline/readline.c    2014-04-24 20:08:44.507909810 -0500
 @@ -744,7 +744,8 @@
      r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ));
@@ -178 +202 @@
      _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
  #endif
+diff -Naur bash-4.3.orig/lib/sh/shquote.c bash-4.3/lib/sh/shquote.c
+--- bash-4.3.orig/lib/sh/shquote.c      2013-03-31 20:53:32.000000000 -0500
++++ bash-4.3/lib/sh/shquote.c   2014-04-24 20:08:54.927367945 -0500
+@@ -311,3 +311,17 @@
+ 
+   return (0);
+ }
++
++int
++sh_contains_quotes (string)
++     char *string;
++{
++  char *s;
++
++  for (s = string; s && *s; s++)
++    {
++      if (*s == '\'' || *s == '"' || *s == '\\')
++       return 1;
++    }
++  return 0;
++}
 diff -Naur bash-4.3.orig/parse.y bash-4.3/parse.y
 --- bash-4.3.orig/parse.y       2014-02-11 08:42:10.000000000 -0600
-+++ bash-4.3/parse.y    2014-03-30 08:38:12.463477417 -0500
++++ bash-4.3/parse.y    2014-04-24 20:08:52.607486462 -0500
+@@ -2424,7 +2424,7 @@
+         not already end in an EOF character.  */
+       if (shell_input_line_terminator != EOF)
+        {
+-         if (shell_input_line_size < SIZE_MAX && shell_input_line_len > shell_input_line_size - 3)
++         if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 > shell_input_line_size))
+            shell_input_line = (char *)xrealloc (shell_input_line,
+                                        1 + (shell_input_line_size += 2));
+ 
 @@ -3398,7 +3398,7 @@
           within a double-quoted ${...} construct "an even number of
@@ -192 +246 @@
 diff -Naur bash-4.3.orig/patchlevel.h bash-4.3/patchlevel.h
 --- bash-4.3.orig/patchlevel.h  2012-12-29 09:47:57.000000000 -0600
-+++ bash-4.3/patchlevel.h       2014-03-30 08:38:18.153657420 -0500
++++ bash-4.3/patchlevel.h       2014-04-24 20:08:56.493955444 -0500
 @@ -25,6 +25,6 @@
     regexp `^#define[   ]*PATCHLEVEL', since that's what support/mkversion.sh
@@ -198 +252 @@
  
 -#define PATCHLEVEL 0
-+#define PATCHLEVEL 8
++#define PATCHLEVEL 11
  
  #endif /* _PATCHLEVEL_H_ */
+diff -Naur bash-4.3.orig/pcomplete.c bash-4.3/pcomplete.c
+--- bash-4.3.orig/pcomplete.c   2013-08-26 14:23:45.000000000 -0500
++++ bash-4.3/pcomplete.c        2014-04-24 20:08:54.927367945 -0500
+@@ -183,6 +183,7 @@
+ 
+ COMPSPEC *pcomp_curcs;
+ const char *pcomp_curcmd;
++const char *pcomp_curtxt;
+ 
+ #ifdef DEBUG
+ /* Debugging code */
+@@ -753,6 +754,32 @@
+             quoted strings. */
+          dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
+        }
++      /* Intended to solve a mismatched assumption by bash-completion.  If
++        the text to be completed is empty, but bash-completion turns it into
++        a quoted string ('') assuming that this code will dequote it before
++        calling readline, do the dequoting. */
++      else if (iscompgen && iscompleting &&
++              pcomp_curtxt && *pcomp_curtxt == 0 &&
++              text && (*text == '\'' || *text == '"') && text[1] == text[0] && text[2] == 0 && 
++              rl_filename_dequoting_function)
++       dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
++      /* Another mismatched assumption by bash-completion.  If compgen is being
++        run as part of bash-completion, and the argument to compgen is not
++        the same as the word originally passed to the programmable completion
++        code, dequote the argument if it has quote characters.  It's an
++        attempt to detect when bash-completion is quoting its filename
++        argument before calling compgen. */
++      /* We could check whether gen_shell_function_matches is in the call
++        stack by checking whether the gen-shell-function-matches tag is in
++        the unwind-protect stack, but there's no function to do that yet.
++        We could simply check whether we're executing in a function by
++        checking variable_context, and may end up doing that. */
++      else if (iscompgen && iscompleting && rl_filename_dequoting_function &&
++              pcomp_curtxt && text &&
++              STREQ (pcomp_curtxt, text) == 0 &&
++              variable_context &&
++              sh_contains_quotes (text))       /* guess */
++       dfn = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
+       else
+        dfn = savestring (text);
+     }
+@@ -1522,7 +1549,7 @@
+      COMPSPEC **lastcs;
+ {
+   COMPSPEC *cs, *oldcs;
+-  const char *oldcmd;
++  const char *oldcmd, *oldtxt;
+   STRINGLIST *ret;
+ 
+   cs = progcomp_search (ocmd);
+@@ -1545,14 +1572,17 @@
+ 
+   oldcs = pcomp_curcs;
+   oldcmd = pcomp_curcmd;
++  oldtxt = pcomp_curtxt;
+ 
+   pcomp_curcs = cs;
+   pcomp_curcmd = cmd;
++  pcomp_curtxt = word;
+ 
+   ret = gen_compspec_completions (cs, cmd, word, start, end, foundp);
+ 
+   pcomp_curcs = oldcs;
+   pcomp_curcmd = oldcmd;
++  pcomp_curtxt = oldtxt;
+ 
+   /* We need to conditionally handle setting *retryp here */
+   if (retryp)
 diff -Naur bash-4.3.orig/test.c bash-4.3/test.c
 --- bash-4.3.orig/test.c        2014-02-04 15:52:58.000000000 -0600
-+++ bash-4.3/test.c     2014-03-30 08:38:04.859903460 -0500
++++ bash-4.3/test.c     2014-04-24 20:08:39.174864532 -0500
 @@ -646,8 +646,8 @@
        return (v && invisible_p (v) == 0 && var_isset (v) ? TRUE : FALSE);
@@ -225 +350 @@
 diff -Naur bash-4.3.orig/trap.c bash-4.3/trap.c
 --- bash-4.3.orig/trap.c        2014-02-05 09:03:21.000000000 -0600
-+++ bash-4.3/trap.c     2014-03-30 08:38:06.756626741 -0500
++++ bash-4.3/trap.c     2014-04-24 20:08:41.401408370 -0500
 @@ -920,7 +920,8 @@
        subst_assign_varlist = 0;
@@ -248 +373 @@
 diff -Naur bash-4.3.orig/y.tab.c bash-4.3/y.tab.c
 --- bash-4.3.orig/y.tab.c       2014-02-11 09:57:47.000000000 -0600
-+++ bash-4.3/y.tab.c    2014-03-30 08:38:12.463477417 -0500
++++ bash-4.3/y.tab.c    2014-04-24 20:08:52.607486462 -0500
+@@ -4736,7 +4736,7 @@
+         not already end in an EOF character.  */
+       if (shell_input_line_terminator != EOF)
+        {
+-         if (shell_input_line_size < SIZE_MAX && shell_input_line_len > shell_input_line_size - 3)
++         if (shell_input_line_size < SIZE_MAX-3 && (shell_input_line_len+3 > shell_input_line_size))
+            shell_input_line = (char *)xrealloc (shell_input_line,
+                                        1 + (shell_input_line_size += 2));
+ 
 @@ -5710,7 +5710,7 @@
           within a double-quoted ${...} construct "an even number of

patches/iproute2-3.14.0-libdir-1.patch

@@ -12 +12 @@
              Rediffed for Iproute2-3.8.0 by William Harrington
              Renamed for Iproute2-3.12.0 by William Harrington
+             Renamed for Iproute2-3.14.0 by William Harrington
 
 diff -Naur iproute2-3.8.0.orig/Makefile iproute2-3.8.0/Makefile

patches/vim-7.4-branch_update-3.patch

@@ -1 +1 @@
 Submitted By: William Harrington (kb0iic at cross-lfs dot org)
-Date: 2014-03-30
+Date: 2014-04-26
 Initial Package Version: 7.4
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 7.4.229.
+Description: Contains all upstream patches up to 7.4.265.
 
 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-03-30 20:09:03.492688818 +0000
++++ vim74/.hg_archival.txt      2014-04-27 05:20:57.181745403 +0000
 @@ -0,0 +1,5 @@
 +repo: 770908d1cb47c04be0aef5c173b17ab8be6b6476
-+node: 7b76ad980f09c46169798844dfb7e1e654591d6a
++node: 01f2b7e6b33ca4da4fbe2a5b8e9184ea2749d64e
 +branch: default
-+latesttag: v7-4-229
++latesttag: v7-4-265
 +latesttagdistance: 1
 diff -Naur vim74.orig/.hgignore vim74/.hgignore
 --- vim74.orig/.hgignore        1970-01-01 00:00:00.000000000 +0000
-+++ vim74/.hgignore     2014-03-30 20:09:03.499355704 +0000
++++ vim74/.hgignore     2014-04-27 05:20:57.188412237 +0000
 @@ -0,0 +1,74 @@
 +syntax: glob
@@ -95 +95 @@
 diff -Naur vim74.orig/.hgtags vim74/.hgtags
 --- vim74.orig/.hgtags  1970-01-01 00:00:00.000000000 +0000
-+++ vim74/.hgtags       2014-03-30 20:09:03.506022591 +0000
-@@ -0,0 +1,2954 @@
++++ vim74/.hgtags       2014-04-27 05:20:57.195079070 +0000
+@@ -0,0 +1,2990 @@
 +004eb98eb3c30714cb6a24ec3e810275080a8413 v7-1-117
 +006e9c8a6a8ad354a5cb6adcce6ebfceddeb20ee v7-0079
@@ -3051 +3051 @@
 +3ee5808a293c7436e34a696a09ed29ce38750d9a v7-4-228
 +839cca5ec18d560e3714065e54ed38b6e812aaf7 v7-4-229
++57ecd7a8c0f052296b41b916eb1ae7f2a9a48b27 v7-4-230
++0a295a3c9e473512ad3b006a0fb752ad43d19094 v7-4-231
++845608965bd9d0b2755997a7be812746885ff105 v7-4-232
++22a1d5762ba3a75984e89dcc47a65498f63a6c2c v7-4-233
++d2286df8719d6e99c743e3bf6ac14d1f9debc84d v7-4-234
++5ab2946f7ce560985830fbc3c453bb0f7a01f385 v7-4-235
++a44087db72386d080e9da870d751daf498004be8 v7-4-236
++71b165a378ad580818f6d497ecf0f8ad054a9683 v7-4-237
++410ef4f1a3d2f4a6ecad9aaa87dae645d1578a19 v7-4-238
++98bfec9ea7608f312129475d4ca0ae6d1c6c232e v7-4-239
++8d1ba0a23588932d22ad37cbd87ae3bbd4bfeff8 v7-4-240
++a63d0cd691dc925283815d17d62f4e948d723a59 v7-4-241
++f084024c0ddbba46aabfafa2996c3f7d13080ab6 v7-4-242
++9f8fa56f1906f4f634cd602a7a2b4f8631faf526 v7-4-243
++da17c7de616e3829e4f59923ffa138a067928d9e v7-4-244
++80421d934ebde183ce545ab8d9eb3a4c2065c169 v7-4-245
++2cbac5608217cdce725a0f04d397d4466a3322fe v7-4-246
++76863b4b48a3684905527dcc688e5a8c4c5e23d9 v7-4-247
++e5f1f2ea0b4a4834791924880f78272ef52eb087 v7-4-248
++0b9a66ea49f435536745be0e0a6154be7b607249 v7-4-249
++a8f3f45896288bd7e0a27e0c28c3cc3457ccc507 v7-4-250
++29eb4c2a33ac701bfcd4d2e2bed7864eba876e0e v7-4-251
++a43a8262e1ceffc393625c53a1ffed9e6bcaba62 v7-4-252
++4901a36479f200b2e6700ad91c26911d92deb886 v7-4-253
++251acc686ca41e4bccb037ef44cd7b486774d580 v7-4-254
++5595506b985a198abae41ab0150ee50b8bf1686c v7-4-255
++afb542ea210cb9fc5fa8c5359bb4814370024b80 v7-4-256
++17903ded5e9a9d49ca73b324657b944f2954d4fd v7-4-257
++e8ffd1e6c8dc62c604d34e879791404bd15cab33 v7-4-258
++e4cd5bb75029d2c1208f3e31ebde4e03b16e8123 v7-4-259
++6bc874e4789a0f912b4fd6b23afecf19d80b1605 v7-4-260
++43c6cd07c8defd8505acbe479c6970764c08e6f9 v7-4-261
++0ea551fa607dc443b97c2fba97dc0c9cb0bcf303 v7-4-262
++af1bb39774f41c28eabd24d80cffc775695bc124 v7-4-263
++00acac0af680c2d8c82db5258474b121a5908926 v7-4-264
++8ec9d2196bee0c5108f2d2c196a660a7f4e5f29f v7-4-265
 diff -Naur vim74.orig/Filelist vim74/Filelist
 --- vim74.orig/Filelist 2013-07-13 13:23:38.000000000 +0000
-+++ vim74/Filelist      2014-03-30 20:09:03.506022591 +0000
-@@ -80,6 +80,7 @@
++++ vim74/Filelist      2014-04-27 05:20:57.198412485 +0000
+@@ -80,10 +80,14 @@
                 src/main.aap \
                 src/testdir/main.aap \
@@ -3060 +3096 @@
 +               src/testdir/sautest/autoload/*.vim \
                 src/testdir/test[0-9]*.ok \
++               src/testdir/test[0-9]*a.ok \
++               src/testdir/test_[a-z]*.ok \
                 src/testdir/test49.vim \
                 src/testdir/test60.vim \
+                src/testdir/test83-tags? \
++               src/testdir/test77a.com \
+                src/testdir/python2/*.py \
+                src/testdir/python3/*.py \
+                src/testdir/pythonx/*.py \
 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-03-30 20:09:03.546023908 +0000
++++ vim74/runtime/autoload/clojurecomplete.vim  2014-04-27 05:20:57.231746647 +0000
 @@ -1,20 +1,22 @@
  " Vim completion script
@@ -3105 +3148 @@
 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-03-30 20:09:03.546023908 +0000
++++ vim74/runtime/autoload/getscript.vim        2014-04-27 05:20:57.235080063 +0000
 @@ -1,8 +1,8 @@
  " ---------------------------------------------------------------------
@@ -3139 +3182 @@
 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-03-30 20:09:03.559357680 +0000
++++ vim74/runtime/autoload/netrw.vim    2014-04-27 05:20:57.241746894 +0000
 @@ -1,10 +1,10 @@
  " netrw.vim: Handles file transfer and remote directory listing across
@@ -14717 +14760 @@
 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-03-30 20:09:03.559357680 +0000
++++ vim74/runtime/autoload/netrwSettings.vim    2014-04-27 05:20:57.241746894 +0000
 @@ -1,7 +1,7 @@
  " netrwSettings.vim: makes netrw settings simpler
@@ -14751 +14794 @@
 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-03-30 20:09:03.559357680 +0000
++++ vim74/runtime/autoload/netrw_gitignore.vim  2014-04-27 05:20:57.245080310 +0000
 @@ -0,0 +1,71 @@
 +" netrw_gitignore#Hide: gitignore-based hiding
@@ -14826 +14869 @@
 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-03-30 20:09:03.562691123 +0000
++++ vim74/runtime/autoload/phpcomplete.vim      2014-04-27 05:20:57.248413727 +0000
 @@ -1,27 +1,99 @@
  " Vim completion script
@@ -22387 +22430 @@
 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-03-30 20:09:03.579358338 +0000
++++ vim74/runtime/colors/README.txt     2014-04-27 05:20:57.261747391 +0000
 @@ -36,6 +36,14 @@
  removed in your color scheme.  Use something like "gui=NONE" to remove the
@@ -22405 +22448 @@
 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-03-30 20:09:03.579358338 +0000
++++ vim74/runtime/colors/delek.vim      2014-04-27 05:20:57.261747391 +0000
 @@ -1,10 +1,10 @@
  " Vim color file
@@ -22435 +22478 @@
 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-03-30 20:09:03.582691781 +0000
++++ vim74/runtime/colors/industry.vim   2014-04-27 05:20:57.265080808 +0000
 @@ -0,0 +1,40 @@
 +" Vim color file
@@ -22479 +22522 @@
 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-03-30 20:09:03.592692111 +0000
++++ vim74/runtime/compiler/gcc.vim      2014-04-27 05:20:57.275081056 +0000
 @@ -25,10 +25,10 @@
        \%f:%l:\ %tarning:\ %m,
@@ -22497 +22540 @@
 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-03-30 20:09:03.612692769 +0000
++++ vim74/runtime/doc/autocmd.txt       2014-04-27 05:20:57.295081553 +0000
 @@ -1,4 +1,4 @@
 -*autocmd.txt*   For Vim version 7.4.  Last change: 2013 Aug 04
@@ -22548 +22591 @@
 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-03-30 20:09:03.616026212 +0000
++++ vim74/runtime/doc/change.txt        2014-04-27 05:20:57.295081553 +0000
 @@ -1,4 +1,4 @@
 -*change.txt*    For Vim version 7.4.  Last change: 2013 Jul 17
@@ -22617 +22660 @@
 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-03-30 20:09:03.616026212 +0000
++++ vim74/runtime/doc/cmdline.txt       2014-04-27 05:20:57.298414969 +0000
 @@ -1,4 +1,4 @@
 -*cmdline.txt*   For Vim version 7.4.  Last change: 2013 Mar 16
@@ -22667 +22710 @@
 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-03-30 20:09:03.619359655 +0000
++++ vim74/runtime/doc/develop.txt       2014-04-27 05:20:57.298414969 +0000
 @@ -1,4 +1,4 @@
 -*develop.txt*   For Vim version 7.4.  Last change: 2013 Apr 27
@@ -22684 +22727 @@
 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-03-30 20:09:03.619359655 +0000
++++ vim74/runtime/doc/diff.txt  2014-04-27 05:20:57.301748385 +0000
 @@ -1,4 +1,4 @@
 -*diff.txt*      For Vim version 7.4.  Last change: 2013 Jul 07
@@ -22710 +22753 @@
 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-03-30 20:09:03.619359655 +0000
++++ vim74/runtime/doc/digraph.txt       2014-04-27 05:20:57.301748385 +0000
 @@ -1,4 +1,4 @@
 -*digraph.txt*   For Vim version 7.4.  Last change: 2011 Jan 15
@@ -22728 +22771 @@
 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-03-30 20:09:03.622693098 +0000
++++ vim74/runtime/doc/editing.txt       2014-04-27 05:20:57.301748385 +0000
 @@ -1,4 +1,4 @@
 -*editing.txt*   For Vim version 7.4.  Last change: 2013 Aug 03
@@ -22745 +22788 @@
 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-03-30 20:09:03.626026541 +0000
++++ vim74/runtime/doc/eval.txt  2014-04-27 05:20:57.308415217 +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 Mar 27
++*eval.txt*     For Vim version 7.4.  Last change: 2014 Apr 06
  
  
@@ -22760 +22803 @@
  
  A special case is defining a function and directly assigning its Funcref to a
+@@ -147,7 +148,7 @@
+ 
+ 
+ 1.3 Lists ~
+-                                                       *List* *Lists* *E686*
++                                               *list* *List* *Lists* *E686*
+ A List is an ordered sequence of items.  An item can be of any type.  Items
+ can be accessed by their index number. Items can be added and removed at any
+ position in the sequence.
 @@ -326,6 +327,7 @@
  Changing the order of items in a list: >
@@ -22768 +22820 @@
  
  For loop ~
+@@ -392,7 +394,7 @@
+ 
+ 
+ 1.4 Dictionaries ~
+-                                               *Dictionaries* *Dictionary*
++                                       *dict* *Dictionaries* *Dictionary*
+ A Dictionary is an associative array: Each entry has a key and a value.  The
+ entry can be located with the key.  The entries are stored without a specific
+ ordering.
+@@ -1003,7 +1005,7 @@
+ 
+ 
+ 
+-string                                                 *expr-string* *E114*
++string                                         *string* *expr-string* *E114*
+ ------
+ "string"               string constant         *expr-quote*
+ 
+@@ -1142,7 +1144,7 @@
+ |local-variable|     l:          Local to a function.
+ |script-variable|    s:          Local to a |:source|'ed Vim script.
+ |function-argument|  a:          Function argument (only inside a function).
+-|vim-variable|      v:   Global, predefined by Vim.
++|vim-variable|       v:          Global, predefined by Vim.
+ 
+ The scope name by itself can be used as a |Dictionary|.  For example, to
+ delete all script-local variables: >
 @@ -1454,6 +1456,13 @@
  v:foldstart    Used for 'foldtext': first line of closed fold.
@@ -22790 +22869 @@
                 The List can be modified, but this has no effect on what is
                 stored in the |viminfo| file later.  If you use values other
-@@ -1712,6 +1722,7 @@
+@@ -1548,6 +1558,16 @@
+                |evim| etc., or any other name you might symlink to Vim.
+                Read-only.
+ 
++                                       *v:progpath* *progpath-variable*
++v:progpath     Contains the command with which Vim was invoked, including the
++               path.  Useful if you want to message a Vim server using a
++               |--remote-expr|.
++               To get the full path use: >
++                       echo exepath(v:progpath)
++<              NOTE: This does not work when the command is a relative path
++               and the current directory has changed.
++               Read-only.
++
+                                        *v:register* *register-variable*
+ v:register     The name of the register in effect for the current normal mode
+                command (regardless of whether that command actually used a
+@@ -1662,7 +1682,7 @@
+                is 501.  Read-only.  "version" also works, for backwards
+                compatibility.
+                Use |has()| to check if a certain patch was included, e.g.: >
+-                       if has("patch123")
++                       if has("patch-7.4.123")
+ <              Note that patch numbers are specific to the version, thus both
+                version 5.0 and 5.1 may have a patch 123, but these are
+                completely different.
+@@ -1712,6 +1732,7 @@
  bufwinnr( {expr})              Number  window number of buffer {expr}
  byte2line( {byte})             Number  line number at byte count {byte}
@@ -22798 +22903 @@
                                 any     call {func} with arguments {arglist}
  ceil( {expr})                  Float   round {expr} up
-@@ -1735,7 +1746,7 @@
+@@ -1735,7 +1756,7 @@
  cursor( {lnum}, {col} [, {coladd}])
                                 Number  move cursor to {lnum}, {col}, {coladd}
@@ -22807 +22912 @@
  did_filetype()                 Number  TRUE if FileType autocommand event used
  diff_filler( {lnum})           Number  diff filler lines about {lnum}
-@@ -1995,6 +2006,8 @@
+@@ -1745,6 +1766,7 @@
+ eval( {string})                        any     evaluate {string} into its value
+ eventhandler( )                        Number  TRUE if inside an event handler
+ executable( {expr})            Number  1 if executable {expr} exists
++exepath( {expr})               String  full path of the command {expr}
+ exists( {expr})                        Number  TRUE if {expr} exists
+ extend( {expr1}, {expr2} [, {expr3}])
+                                List/Dict insert items of {expr2} into {expr1}
+@@ -1797,7 +1819,8 @@
+ getpid()                       Number  process ID of Vim
+ getpos( {expr})                        List    position of cursor, mark, etc.
+ getqflist()                    List    list of quickfix items
+-getreg( [{regname} [, 1]])     String  contents of register
++getreg( [{regname} [, 1 [, {list}]]])
++                               String or List   contents of register
+ getregtype( [{regname}])       String  type of register
+ gettabvar( {nr}, {varname} [, {def}])
+                                any     variable {varname} in tab {nr} or {def}
+@@ -1968,7 +1991,8 @@
+                                Number  last index of {needle} in {haystack}
+ strtrans( {expr})              String  translate string to make it printable
+ strwidth( {expr})              Number  display cell length of the String {expr}
+-submatch( {nr})                        String  specific match in ":s" or substitute()
++submatch( {nr}[, {list}])      String or List
++                                       specific match in ":s" or substitute()
+ substitute( {expr}, {pat}, {sub}, {flags})
+                                String  all {pat} in {expr} replaced with {sub}
+ synID( {lnum}, {col}, {trans}) Number  syntax ID at {lnum} and {col}
+@@ -1978,6 +2002,7 @@
+ synconcealed( {lnum}, {col})   List    info about concealing
+ synstack( {lnum}, {col})       List    stack of syntax IDs at {lnum} and {col}
+ system( {expr} [, {input}])    String  output of shell command/filter {expr}
++systemlist( {expr} [, {input}])        List    output of shell command/filter {expr}
+ tabpagebuflist( [{arg}])       List    list of buffer numbers in tab page
+ tabpagenr( [{arg}])            Number  number of current or last tab page
+ tabpagewinnr( {tabarg}[, {arg}])
+@@ -1995,6 +2020,8 @@
  type( {name})                  Number  type of variable {name}
  undofile( {name})              String  undo file name for {name}
@@ -22816 +22957 @@
  virtcol( {expr})               Number  screen column of cursor or mark
  visualmode( [expr])            String  last visual mode used
-@@ -2260,7 +2273,10 @@
+@@ -2260,7 +2287,10 @@
                 {expr}.  Use zero for the first character, it returns zero.
                 This function is only useful when there are multibyte
@@ -22828 +22969 @@
                         echo matchstr(str, ".", byteidx(str, 3))
  <              will display the fourth character.  Another way to do the
-@@ -2269,7 +2285,20 @@
+@@ -2269,7 +2299,20 @@
                         echo strpart(s, 0, byteidx(s, 1))
  <              If there are less than {nr} characters -1 is returned.
@@ -22850 +22991 @@
  call({func}, {arglist} [, {dict}])                     *call()* *E699*
                 Call function {func} with the items in |List| {arglist} as
-@@ -2789,7 +2818,7 @@
+@@ -2671,6 +2714,15 @@
+                        0       does not exist
+                        -1      not implemented on this system
+ 
++exepath({expr})                                                *exepath()*
++               If {expr} is an executable and is either an absolute path, a
++               relative path or found in $PATH, return the full path.
++               Note that the current directory is used when {expr} starts
++               with "./", which may be a problem for Vim: >
++                       echo exepath(v:progpath)
++<              If {expr} cannot be found in $PATH or is not executable then
++               an empty string is returned.
++
+                                                        *exists()*
+ exists({expr}) The result is a Number, which is non-zero if {expr} is
+                defined, zero otherwise.  The {expr} argument is a string,
+@@ -2789,7 +2841,7 @@
                         <afile>         autocmd file name
                         <abuf>          autocmd buffer number (as a String!)
@@ -22859 +23016 @@
                         <cword>         word under the cursor
                         <cWORD>         WORD under the cursor
-@@ -3175,7 +3204,7 @@
+@@ -3175,7 +3227,7 @@
                 If [expr] is 1, only check if a character is available, it is
                         not consumed.  Return zero if no character available.
@@ -22868 +23025 @@
                 result is a number.  Use nr2char() to convert it to a String.
                 Otherwise a String is returned with the encoded character.
-@@ -3185,7 +3214,7 @@
+@@ -3185,7 +3237,7 @@
                 String when a modifier (shift, control, alt) was used that is
                 not included in the character.
@@ -22877 +23034 @@
                 Use nr2char() to convert it to a String.
  
-@@ -3435,7 +3464,7 @@
+@@ -3417,7 +3469,7 @@
+                        :endfor
+ 
+ 
+-getreg([{regname} [, 1]])                              *getreg()*
++getreg([{regname} [, 1 [, {list}]]])                   *getreg()*
+                The result is a String, which is the contents of register
+                {regname}.  Example: >
+                        :let cliptext = getreg('*')
+@@ -3426,6 +3478,11 @@
+                getreg('=', 1) returns the expression itself, so that it can
+                be restored with |setreg()|.  For other registers the extra
+                argument is ignored, thus you can always give it.
++               If {list} is present and non-zero result type is changed to 
++               |List|. Each list item is one text line. Use it if you care
++               about zero bytes possibly present inside register: without
++               third argument both NLs and zero bytes are represented as NLs
++               (see |NL-used-for-Nul|).
+                If {regname} is not specified, |v:register| is used.
+ 
+ 
+@@ -3435,7 +3492,7 @@
                     "v"                 for |characterwise| text
                     "V"                 for |linewise| text
@@ -22886 +23064 @@
                 If {regname} is not specified, |v:register| is used.
  
-@@ -4109,6 +4138,8 @@
+@@ -4109,6 +4166,8 @@
                                      (|mapmode-ic|)
                   "sid"      The script local ID, used for <sid> mappings
@@ -22895 +23073 @@
                 The mappings local to the current buffer are checked first,
                 then the global mappings.
-@@ -4210,6 +4241,9 @@
+@@ -4210,6 +4269,9 @@
                 "match").  It will be highlighted with {group}.  Returns an
                 identification number (ID), which can be used to delete the
@@ -22905 +23083 @@
                 The optional {priority} argument assigns a priority to the
                 match.  A match with a high priority will have its
-@@ -4419,6 +4453,9 @@
+@@ -4419,6 +4481,9 @@
                 it is the offset in screen columns from the start of the
                 character.  E.g., a position within a <Tab> or after the last
@@ -22915 +23093 @@
                         let save_cursor = getpos(".")
                         MoveTheCursorAround
-@@ -5242,6 +5279,10 @@
+@@ -5242,6 +5307,10 @@
                 character.  E.g., a position within a <Tab> or after the last
                 character.
@@ -22926 +23104 @@
                 An error message is given if {expr} is invalid.
  
-@@ -5390,6 +5431,7 @@
+@@ -5300,6 +5369,8 @@
+                                                        *setreg()*
+ setreg({regname}, {value} [,{options}])
+                Set the register {regname} to {value}.
++               {value} may be any value returned by |getreg()|, including 
++               a |List|.
+                If {options} contains "a" or {regname} is upper case,
+                then the value is appended.
+                {options} can also contain a register type specification:
+@@ -5312,10 +5383,15 @@
+                in the longest line (counting a <Tab> as 1 character).
+ 
+                If {options} contains no register settings, then the default
+-               is to use character mode unless {value} ends in a <NL>.
+-               Setting the '=' register is not possible, but you can use >
+-                       :let @= = var_expr
+-<              Returns zero for success, non-zero for failure.
++               is to use character mode unless {value} ends in a <NL> for 
++               string {value} and linewise mode for list {value}. Blockwise 
++               mode is never selected automatically.
++               Returns zero for success, non-zero for failure.
++
++                                                       *E883*
++               Note: you may not use |List| containing more then one item to 
++                     set search and expression registers. Lists containing no 
++                     items act like empty strings.
+ 
+                Examples: >
+                        :call setreg(v:register, @*)
+@@ -5323,8 +5399,11 @@
+                        :call setreg('a', "1\n2\n3", 'b5')
+ 
+ <              This example shows using the functions to save and restore a
+-               register. >
+-                       :let var_a = getreg('a', 1)
++               register (note: you may not reliably restore register value 
++               without using the third argument to |getreg()| as without it 
++               newlines are represented as newlines AND Nul bytes are 
++               represented as newlines as well, see |NL-used-for-Nul|). >
++                       :let var_a = getreg('a', 1, 1)
+                        :let var_amode = getregtype('a')
+                            ....
+                        :call setreg('a', var_a, var_amode)
+@@ -5390,6 +5469,7 @@
  <              This results in a directory listing for the file under the
                 cursor.  Example of use with |system()|: >
@@ -22934 +23155 @@
  
  shiftwidth()                                           *shiftwidth()*
-@@ -5449,20 +5491,26 @@
+@@ -5449,20 +5529,26 @@
  
  
@@ -22965 +23186 @@
                         func MyCompare(i1, i2)
                            return a:i1 == a:i2 ? 0 : a:i1 > a:i2 ? 1 : -1
-@@ -5604,7 +5652,7 @@
+@@ -5604,7 +5690,7 @@
  
  strdisplaywidth({expr}[, {col}])                       *strdisplaywidth()*
@@ -22974 +23195 @@
                 screen column where to start.  This matters for Tab
                 characters.
-@@ -5872,14 +5920,16 @@
-                passed as stdin to the command.  The string is written as-is,
-                you need to take care of using the correct line separators
-                yourself.  Pipes are not used.
+@@ -5729,12 +5815,23 @@
+                Ambiguous, this function's return value depends on 'ambiwidth'.
+                Also see |strlen()|, |strdisplaywidth()| and |strchars()|.
+ 
+-submatch({nr})                                         *submatch()*
++submatch({nr}[, {list}])                               *submatch()*
+                Only for an expression in a |:substitute| command or
+                substitute() function.
+                Returns the {nr}'th submatch of the matched text.  When {nr}
+                is 0 the whole matched text is returned.
++               Note that a NL in the string can stand for a line break of a
++               multi-line match or a NUL character in the text.
+                Also see |sub-replace-expression|.
++
++               If {list} is present and non-zero then submatch() returns 
++               a list of strings, similar to |getline()| with two arguments. 
++               NL characters in the text represent NUL characters in the
++               text.
++               Only returns more than one item for |:substitute|, inside
++               |substitute()| this list will always contain one or zero
++               items, since there are no real line breaks.
++
+                Example: >
+                        :s/\d\+/\=submatch(0) + 1/
+ <              This finds the first number in the line and adds one to it.
+@@ -5867,19 +5964,29 @@
+                valid positions.
+ 
+ system({expr} [, {input}])                             *system()* *E677*
+-               Get the output of the shell command {expr}.
+-               When {input} is given, this string is written to a file and
+-               passed as stdin to the command.  The string is written as-is,
+-               you need to take care of using the correct line separators
+-               yourself.  Pipes are not used.
 -               Note: Use |shellescape()| to escape special characters in a
 -               command argument.  Newlines in {expr} may cause the command to
 -               fail.  The characters in 'shellquote' and 'shellxquote' may
 -               also cause trouble.
++               Get the output of the shell command {expr} as a string.  See
++               |systemlist()| to get the output as a List.
++
++               When {input} is given and is a string this string is written 
++               to a file and passed as stdin to the command.  The string is 
++               written as-is, you need to take care of using the correct line 
++               separators yourself.
++               If {input} is given and is a |List| it is written to the file
++               in a way |writefile()| does with {binary} set to "b" (i.e.
++               with a newline between each list item with newlines inside
++               list items converted to NULs).  
++               Pipes are not used.
++
 +               Note: Use |shellescape()| or |::S| with |expand()| or 
 +               |fnamemodify()| to escape special characters in a command 
@@ -22995 +23259 @@
  <              To make the result more system-independent, the shell output
                 is filtered to replace <CR> with <NL> for Macintosh, and
-@@ -5928,7 +5978,7 @@
+@@ -5906,6 +6013,16 @@
+                Use |:checktime| to force a check.
+ 
+ 
++systemlist({expr} [, {input}])                         *systemlist()*
++               Same as |system()|, but returns a |List| with lines (parts of 
++               output separated by NL) with NULs transformed into NLs. Output 
++               is the same as |readfile()| will output with {binary} argument 
++               set to "b".
++
++               Returns an empty string on error, so be careful not to run 
++               into |E706|.
++
++
+ tabpagebuflist([{arg}])                                        *tabpagebuflist()*
+                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 +6045,7 @@
                 The number can be used with the |:tab| command.
  
@@ -23004 +23285 @@
                 {tabarg} specifies the number of tab page to be used.
                 {arg} is used like with |winnr()|:
-@@ -6128,6 +6178,14 @@
+@@ -6128,6 +6245,14 @@
                                 blocks.  Each item may again have an "alt"
                                 item.
@@ -23019 +23300 @@
                 Return a |List| with all the values of {dict}.  The |List| is
                 in arbitrary order.
-@@ -6337,6 +6395,7 @@
- <   Note that it's possible for patch 147 to be omitted even though 148 is
+@@ -6330,13 +6455,23 @@
+     Example: >
+        :if has("gui_running")
+ <                                                      *has-patch*
+-3.  Included patches.  First check |v:version| for the version of Vim.
+-    Then the "patch123" feature means that patch 123 has been included for
+-    this version.  Example (checking version 6.2.148 or later): >
++3.  Included patches.  The "patch123" feature means that patch 123 has been
++    included.  Note that this form does not check the version of Vim, you need
++    to inspect |v:version| for that.
++    Example (checking version 6.2.148 or later): >
+        :if v:version > 602 || v:version == 602 && has("patch148")
+-<   Note that it's possible for patch 147 to be omitted even though 148 is
++<    Note that it's possible for patch 147 to be omitted even though 148 is
      included.
  
++4.  Beyond a certain version or at a certain version and including a specific
++    patch.  The "patch-7.4.123" feature means that the Vim version is 7.5 or
++    later, or it is version 7.4 and patch 123 was included.
++    The example above can be simplified to: >
++       :if has("patch-6.2.148")
++<    Note that it's possible for patch 147 to be omitted even though 148 is
++    included.
++
 +acl                    Compiled with |ACL| support.
  all_builtin_terms      Compiled with all builtin terminals enabled.
  amiga                  Amiga version of Vim.
  arabic                 Compiled with Arabic support |Arabic|.
-@@ -6503,7 +6562,9 @@
+@@ -6503,7 +6638,9 @@
  writebackup            Compiled with 'writebackup' default on.
  xfontset               Compiled with X fontset support |xfontset|.
@@ -23038 +23339 @@
  xsmp_interact          Compiled with interactive X session management support.
  xterm_clipboard                Compiled with support for xterm clipboard.
-@@ -6580,7 +6641,8 @@
+@@ -6580,7 +6717,8 @@
  :fu[nction][!] {name}([arguments]) [range] [abort] [dict]
                         Define a new function by the name {name}.  The name
@@ -23048 +23349 @@
                         {name} can also be a |Dictionary| entry that is a
                         |Funcref|: >
-@@ -6599,7 +6661,7 @@
+@@ -6599,7 +6737,7 @@
  
                         For the {arguments} see |function-argument|.
@@ -23057 +23358 @@
                         expected to take care of a range itself.  The range is
                         passed as "a:firstline" and "a:lastline".  If [range]
-@@ -6608,10 +6670,10 @@
+@@ -6608,10 +6746,10 @@
                         of each line.  See |function-range-example|.
                         The cursor is still moved to the first line of the
@@ -23070 +23371 @@
                         be invoked through an entry in a |Dictionary|.  The
                         local variable "self" will then be set to the
-@@ -7416,13 +7478,22 @@
+@@ -7273,6 +7411,8 @@
+                        {pattern}, so long as it does not have a special
+                        meaning (e.g., '|' or '"') and doesn't occur inside
+                        {pattern}.
++                       Information about the exception is available in
++                       |v:exception|.  Also see |throw-variables|.
+                        NOTE: It is not reliable to ":catch" the TEXT of
+                        an error message because it may vary in different
+                        locales.
+@@ -7416,13 +7556,22 @@
                         for Vim commands, |shellescape()| for |:!| commands.
                         Examples: >
@@ -23100 +23410 @@
 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-03-30 20:09:03.632693428 +0000
++++ vim74/runtime/doc/filetype.txt      2014-04-27 05:20:57.315082050 +0000
 @@ -1,4 +1,4 @@
 -*filetype.txt*  For Vim version 7.4.  Last change: 2013 May 25
@@ -23138 +23448 @@
 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-03-30 20:09:03.632693428 +0000
++++ vim74/runtime/doc/fold.txt  2014-04-27 05:20:57.315082050 +0000
 @@ -1,4 +1,4 @@
 -*fold.txt*      For Vim version 7.4.  Last change: 2010 May 13
@@ -23161 +23471 @@
 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-03-30 20:09:03.632693428 +0000
++++ vim74/runtime/doc/gui.txt   2014-04-27 05:20:57.318415466 +0000
 @@ -1,4 +1,4 @@
 -*gui.txt*       For Vim version 7.4.  Last change: 2013 Jun 12
@@ -23191 +23501 @@
 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-03-30 20:09:03.636026871 +0000
++++ vim74/runtime/doc/gui_x11.txt       2014-04-27 05:20:57.318415466 +0000
 @@ -1,4 +1,4 @@
 -*gui_x11.txt*   For Vim version 7.4.  Last change: 2011 Sep 14
@@ -23209 +23519 @@
 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-03-30 20:09:03.639360314 +0000
++++ vim74/runtime/doc/if_lua.txt        2014-04-27 05:20:57.321748882 +0000
 @@ -1,4 +1,4 @@
 -*if_lua.txt*    For Vim version 7.4.  Last change: 2012 Jun 29
@@ -23227 +23537 @@
 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-03-30 20:09:03.642693757 +0000
++++ vim74/runtime/doc/if_perl.txt       2014-04-27 05:20:57.325082297 +0000
 @@ -1,4 +1,4 @@
 -*if_perl.txt*   For Vim version 7.4.  Last change: 2012 Oct 25
@@ -23236 +23546 @@
 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-03-30 20:09:03.646027200 +0000
++++ vim74/runtime/doc/indent.txt        2014-04-27 05:20:57.328415713 +0000
 @@ -1,4 +1,4 @@
 -*indent.txt*    For Vim version 7.4.  Last change: 2013 Aug 03
@@ -23327 +23637 @@
 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-03-30 20:09:03.646027200 +0000
++++ vim74/runtime/doc/index.txt 2014-04-27 05:20:57.331749130 +0000
 @@ -1,4 +1,4 @@
 -*index.txt*     For Vim version 7.4.  Last change: 2013 Jul 17
@@ -23387 +23697 @@
 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-03-30 20:09:03.652694086 +0000
++++ vim74/runtime/doc/map.txt   2014-04-27 05:20:57.335082547 +0000
 @@ -1,4 +1,4 @@
 -*map.txt*       For Vim version 7.4.  Last change: 2013 Aug 03
@@ -23423 +23733 @@
 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-03-30 20:09:03.659360972 +0000
++++ vim74/runtime/doc/motion.txt        2014-04-27 05:20:57.338415962 +0000
 @@ -1,4 +1,4 @@
 -*motion.txt*    For Vim version 7.4.  Last change: 2013 Jul 17
@@ -23441 +23751 @@
 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-03-30 20:09:03.666027859 +0000
++++ vim74/runtime/doc/options.txt       2014-04-27 05:20:57.345082794 +0000
 @@ -1,4 +1,4 @@
 -*options.txt*  For Vim version 7.4.  Last change: 2013 Jul 09
@@ -23540 +23850 @@
 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-03-30 20:09:03.672694745 +0000
++++ vim74/runtime/doc/os_vms.txt        2014-04-27 05:20:57.351749627 +0000
 @@ -1,4 +1,4 @@
 -*os_vms.txt*    For Vim version 7.4.  Last change: 2011 Aug 14
@@ -23581 +23891 @@
 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-03-30 20:09:03.672694745 +0000
++++ vim74/runtime/doc/os_win32.txt      2014-04-27 05:20:57.351749627 +0000
 @@ -93,7 +93,7 @@
  $PATH                                                  *win32-PATH*
@@ -23593 +23903 @@
 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-03-30 20:09:03.676028187 +0000
++++ vim74/runtime/doc/pattern.txt       2014-04-27 05:20:57.351749627 +0000
 @@ -1,4 +1,4 @@
 -*pattern.txt*   For Vim version 7.4.  Last change: 2013 Jul 06
@@ -23615 +23925 @@
 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-03-30 20:09:03.676028187 +0000
++++ vim74/runtime/doc/pi_getscript.txt  2014-04-27 05:20:57.355083042 +0000
 @@ -1,4 +1,4 @@
 -*pi_getscript.txt*  For Vim version 7.4.  Last change: 2012 Apr 07
@@ -23635 +23945 @@
 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-03-30 20:09:03.679361631 +0000
++++ vim74/runtime/doc/pi_netrw.txt      2014-04-27 05:20:57.358416459 +0000
 @@ -1,4 +1,4 @@
 -*pi_netrw.txt*  For Vim version 7.4.  Last change: 2013 May 18
@@ -24468 +24778 @@
 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-03-30 20:09:03.682695074 +0000
++++ vim74/runtime/doc/pi_vimball.txt    2014-04-27 05:20:57.361749875 +0000
 @@ -188,7 +188,7 @@
                           * Changed silent! to sil! (shorter)
@@ -24480 +24790 @@
 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-03-30 20:09:03.682695074 +0000
++++ vim74/runtime/doc/quickfix.txt      2014-04-27 05:20:57.361749875 +0000
 @@ -1,4 +1,4 @@
 -*quickfix.txt*  For Vim version 7.4.  Last change: 2013 Aug 03
@@ -24562 +24872 @@
 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-03-30 20:09:03.686028517 +0000
++++ vim74/runtime/doc/recover.txt       2014-04-27 05:20:57.365083291 +0000
 @@ -1,4 +1,4 @@
 -*recover.txt*   For Vim version 7.4.  Last change: 2010 Jul 20
-+*recover.txt*   For Vim version 7.4.  Last change: 2014 Mar 25
++*recover.txt*   For Vim version 7.4.  Last change: 2014 Mar 27
  
  
@@ -24577 +24887 @@
 +|:noswapfile| modifier can be used to not create a swapfile for a new buffer.
 +
-+:noswap[file]   {command}                      *:nos* *:noswapfile*
++:nos[wapfile]   {command}                      *:nos* *:noswapfile*
 +               Execute {command}. If it contains a command that loads a new
 +               buffer, it will be loaded without creating a swapfile and the
@@ -24587 +24897 @@
 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-03-30 20:09:03.686028517 +0000
++++ vim74/runtime/doc/repeat.txt        2014-04-27 05:20:57.368416707 +0000
 @@ -1,4 +1,4 @@
 -*repeat.txt*    For Vim version 7.4.  Last change: 2013 Jul 25
@@ -24641 +24951 @@
 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-03-30 20:09:03.689361960 +0000
++++ vim74/runtime/doc/sign.txt  2014-04-27 05:20:57.368416707 +0000
 @@ -1,4 +1,4 @@
 -*sign.txt*      For Vim version 7.4.  Last change: 2012 Jul 10
@@ -24659 +24969 @@
 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-03-30 20:09:03.692695403 +0000
++++ vim74/runtime/doc/spell.txt 2014-04-27 05:20:57.371750123 +0000
 @@ -1,4 +1,4 @@
 -*spell.txt*    For Vim version 7.4.  Last change: 2013 Jul 17
@@ -24680 +24990 @@
  SPELL FILES                                            *spell-load*
  
+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-04-27 05:20:57.371750123 +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
+ 
+ 
+                  VIM REFERENCE MANUAL    by Bram Moolenaar
+@@ -1276,8 +1276,10 @@
+                        When [!] is included an existing file is overwritten.
+                        When [file] is omitted or is a number from 1 to 9, a
+                        name is generated and 'viewdir' prepended.  When the
+-                       last directory name in 'viewdir' does not exist, this
+-                       directory is created.
++                       last path part of 'viewdir' does not exist, this
++                       directory is created.  E.g., when 'viewdir' is
++                       "$VIM/vimfiles/view" then "view" is created in
++                       "$VIM/vimfiles".
+                        An existing file is always overwritten then.  Use
+                        |:loadview| to load this view again.
+                        When [file] is the name of a file ('viewdir' is not
 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-03-30 20:09:03.696028847 +0000
++++ vim74/runtime/doc/syntax.txt        2014-04-27 05:20:57.375083540 +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 Feb 25
++*syntax.txt*   For Vim version 7.4.  Last change: 2014 Apr 05
  
  
@@ -24744 +25076 @@
  
  Erlang is a functional programming language developed by Ericsson.  Files with
+@@ -1918,7 +1959,7 @@
+ There are several implementations for LPC, we intend to support most widely
+ used ones.  Here the default LPC syntax is for MudOS series, for MudOS v22
+ and before, you should turn off the sensible modifiers, and this will also
+-asserts the new efuns after v22 to be invalid, don't set this variable when
++assert the new efuns after v22 to be invalid, don't set this variable when
+ you are using the latest version of MudOS: >
+ 
+        :let lpc_pre_v22 = 1
 @@ -3156,18 +3197,16 @@
  embedded script highlighting they wish to have. >
@@ -24775 +25116 @@
 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-03-30 20:09:03.699362289 +0000
++++ vim74/runtime/doc/tags      2014-04-27 05:20:57.378416956 +0000
 @@ -12,6 +12,7 @@
  %      motion.txt      /*%*
@@ -24878 +25219 @@
  :sign-unplace  sign.txt        /*:sign-unplace*
  :sil   various.txt     /*:sil*
-@@ -4294,6 +4309,8 @@
+@@ -4294,6 +4309,9 @@
  E879   syntax.txt      /*E879*
  E88    windows.txt     /*E88*
@@ -24884 +25225 @@
 +E881   autocmd.txt     /*E881*
 +E882   eval.txt        /*E882*
++E883   eval.txt        /*E883*
  E89    message.txt     /*E89*
  E90    message.txt     /*E90*
  E91    options.txt     /*E91*
-@@ -4900,6 +4917,7 @@
+@@ -4900,6 +4918,7 @@
  byte-count     editing.txt     /*byte-count*
  byte2line()    eval.txt        /*byte2line()*
@@ -24895 +25237 @@
  c      change.txt      /*c*
  c.vim  syntax.txt      /*c.vim*
-@@ -5458,6 +5476,8 @@
+@@ -5350,6 +5369,7 @@
+ dialog gui_w32.txt     /*dialog*
+ dialogs-added  version5.txt    /*dialogs-added*
+ dib    motion.txt      /*dib*
++dict   eval.txt        /*dict*
+ dict-functions usr_41.txt      /*dict-functions*
+ dict-identity  eval.txt        /*dict-identity*
+ dict-modification      eval.txt        /*dict-modification*
+@@ -5458,6 +5478,8 @@
  escape intro.txt       /*escape*
  escape()       eval.txt        /*escape()*
@@ -24904 +25254 @@
  eval() eval.txt        /*eval()*
  eval-examples  eval.txt        /*eval-examples*
-@@ -5708,6 +5728,7 @@
+@@ -5492,6 +5514,7 @@
+ exclusive-linewise     motion.txt      /*exclusive-linewise*
+ executable()   eval.txt        /*executable()*
+ execute-menus  gui.txt /*execute-menus*
++exepath()      eval.txt        /*exepath()*
+ exim   starting.txt    /*exim*
+ exists()       eval.txt        /*exists()*
+ exp()  eval.txt        /*exp()*
+@@ -5708,6 +5731,7 @@
  ft-changelog-syntax    syntax.txt      /*ft-changelog-syntax*
  ft-chill-syntax        syntax.txt      /*ft-chill-syntax*
@@ -24912 +25270 @@
  ft-coldfusion-syntax   syntax.txt      /*ft-coldfusion-syntax*
  ft-cpp-syntax  syntax.txt      /*ft-cpp-syntax*
-@@ -5724,6 +5745,7 @@
+@@ -5724,6 +5748,7 @@
  ft-dtd-syntax  syntax.txt      /*ft-dtd-syntax*
  ft-eiffel-syntax       syntax.txt      /*ft-eiffel-syntax*
@@ -24920 +25278 @@
  ft-form-syntax syntax.txt      /*ft-form-syntax*
  ft-fortran-indent      indent.txt      /*ft-fortran-indent*
-@@ -5876,6 +5898,8 @@
+@@ -5876,6 +5901,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*
@@ -24929 +25287 @@
  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 +5948,7 @@
+@@ -5924,6 +5951,7 @@
  g:html_use_encoding    syntax.txt      /*g:html_use_encoding*
  g:html_use_xhtml       syntax.txt      /*g:html_use_xhtml*
@@ -24937 +25295 @@
  g:netrw_altv   pi_netrw.txt    /*g:netrw_altv*
  g:netrw_banner pi_netrw.txt    /*g:netrw_banner*
-@@ -5958,6 +5983,7 @@
+@@ -5958,6 +5986,7 @@
  g:netrw_hide   pi_netrw.txt    /*g:netrw_hide*
  g:netrw_home   pi_netrw.txt    /*g:netrw_home*
@@ -24945 +25303 @@
  g:netrw_ignorenetrc    pi_netrw.txt    /*g:netrw_ignorenetrc*
  g:netrw_keepdir        pi_netrw.txt    /*g:netrw_keepdir*
-@@ -6358,6 +6384,7 @@
+@@ -6358,6 +6387,7 @@
  hl-WildMenu    syntax.txt      /*hl-WildMenu*
  hlID() eval.txt        /*hlID()*
@@ -24953 +25311 @@
  home   intro.txt       /*home*
  home-replace   editing.txt     /*home-replace*
-@@ -6921,6 +6948,15 @@
+@@ -6669,6 +6699,7 @@
+ linewise-visual        visual.txt      /*linewise-visual*
+ lisp.vim       syntax.txt      /*lisp.vim*
+ lispindent()   eval.txt        /*lispindent()*
++list   eval.txt        /*list*
+ list-functions usr_41.txt      /*list-functions*
+ list-identity  eval.txt        /*list-identity*
+ list-index     eval.txt        /*list-index*
+@@ -6921,6 +6952,15 @@
  netrw  pi_netrw.txt    /*netrw*
  netrw-%        pi_netrw.txt    /*netrw-%*
@@ -24969 +25335 @@
  netrw-D        pi_netrw.txt    /*netrw-D*
  netrw-O        pi_netrw.txt    /*netrw-O*
-@@ -6978,6 +7014,7 @@
+@@ -6978,6 +7018,7 @@
  netrw-getftype pi_netrw.txt    /*netrw-getftype*
  netrw-gf       pi_netrw.txt    /*netrw-gf*
@@ -24977 +25343 @@
  netrw-gx       pi_netrw.txt    /*netrw-gx*
  netrw-handler  pi_netrw.txt    /*netrw-handler*
-@@ -6992,6 +7029,7 @@
+@@ -6992,6 +7033,7 @@
  netrw-internal-variables       pi_netrw.txt    /*netrw-internal-variables*
  netrw-intro-browse     pi_netrw.txt    /*netrw-intro-browse*
@@ -24985 +25351 @@
  netrw-listbookmark     pi_netrw.txt    /*netrw-listbookmark*
  netrw-listhack pi_netrw.txt    /*netrw-listhack*
-@@ -7022,6 +7060,7 @@
+@@ -7022,6 +7064,7 @@
  netrw-nexplore pi_netrw.txt    /*netrw-nexplore*
  netrw-noload   pi_netrw.txt    /*netrw-noload*
@@ -24993 +25359 @@
  netrw-o        pi_netrw.txt    /*netrw-o*
  netrw-options  pi_netrw.txt    /*netrw-options*
-@@ -7577,6 +7616,7 @@
+@@ -7374,6 +7417,7 @@
+ profiling      repeat.txt      /*profiling*
+ profiling-variable     eval.txt        /*profiling-variable*
+ progname-variable      eval.txt        /*progname-variable*
++progpath-variable      eval.txt        /*progpath-variable*
+ progress.vim   syntax.txt      /*progress.vim*
+ pronounce      intro.txt       /*pronounce*
+ psql   ft_sql.txt      /*psql*
+@@ -7577,6 +7621,7 @@
  s/\3   change.txt      /*s\/\\3*
  s/\9   change.txt      /*s\/\\9*
@@ -25001 +25375 @@
  s/\L   change.txt      /*s\/\\L*
  s/\U   change.txt      /*s\/\\U*
-@@ -7787,6 +7827,7 @@
+@@ -7787,6 +7832,7 @@
  spell-affix-mbyte      spell.txt       /*spell-affix-mbyte*
  spell-affix-not-supported      spell.txt       /*spell-affix-not-supported*
@@ -25009 +25383 @@
  spell-dic-format       spell.txt       /*spell-dic-format*
  spell-double-scoring   spell.txt       /*spell-double-scoring*
-@@ -8280,6 +8321,7 @@
+@@ -7872,6 +7918,7 @@
+ strdisplaywidth()      eval.txt        /*strdisplaywidth()*
+ strftime()     eval.txt        /*strftime()*
+ stridx()       eval.txt        /*stridx()*
++string eval.txt        /*string*
+ string()       eval.txt        /*string()*
+ string-functions       usr_41.txt      /*string-functions*
+ string-match   eval.txt        /*string-match*
+@@ -7936,6 +7983,7 @@
+ system()       eval.txt        /*system()*
+ system-functions       usr_41.txt      /*system-functions*
+ system-vimrc   starting.txt    /*system-vimrc*
++systemlist()   eval.txt        /*systemlist()*
+ s~     change.txt      /*s~*
+ t      motion.txt      /*t*
+ t:     eval.txt        /*t:*
+@@ -8280,6 +8328,7 @@
  undofile()     eval.txt        /*undofile()*
  undotree()     eval.txt        /*undotree()*
@@ -25017 +25407 @@
  unlisted-buffer        windows.txt     /*unlisted-buffer*
  up-down-motions        motion.txt      /*up-down-motions*
-@@ -8364,6 +8406,7 @@
+@@ -8364,6 +8413,7 @@
  v:foldend      eval.txt        /*v:foldend*
  v:foldlevel    eval.txt        /*v:foldlevel*
@@ -25025 +25415 @@
  v:key  eval.txt        /*v:key*
  v:lang eval.txt        /*v:lang*
+@@ -8377,6 +8427,7 @@
+ v:prevcount    eval.txt        /*v:prevcount*
+ v:profiling    eval.txt        /*v:profiling*
+ v:progname     eval.txt        /*v:progname*
++v:progpath     eval.txt        /*v:progpath*
+ v:register     eval.txt        /*v:register*
+ v:scrollstart  eval.txt        /*v:scrollstart*
+ v:searchforward        eval.txt        /*v:searchforward*
 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-03-30 20:09:03.702695732 +0000
++++ vim74/runtime/doc/tagsrch.txt       2014-04-27 05:20:57.381750371 +0000
 @@ -1,4 +1,4 @@
 -*tagsrch.txt*   For Vim version 7.4.  Last change: 2013 Jul 28
@@ -25051 +25449 @@
 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-03-30 20:09:03.709362618 +0000
++++ vim74/runtime/doc/todo.txt  2014-04-27 05:20:57.388417204 +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 Mar 27
++*todo.txt*      For Vim version 7.4.  Last change: 2014 Apr 05
  
  
                   VIM REFERENCE MANUAL    by Bram Moolenaar
-@@ -34,38 +34,234 @@
+@@ -34,38 +34,232 @@
                                                         *known-bugs*
  -------------------- Known bugs and current work -----------------------
  
 +Regexp problems:
++- Crash when using cpp syntax file with raw string. (Havard Garnes)
++  Edit "~/tmp/test.cc" and source "~/tmp/cpp.vim".
 +- NFA regexp doesn't count tab matches correctly. (Urtica Dioica / gaultheria
 +  Shallon, 2013 Nov 18)
@@ -25097 +25497 @@
  
 -Patch to add "acl" and "xpm" as a feature. (Ken Takata, 2013 Jul 8)
-+Using autoconf 2.69 gives a lot of warnings.
++Crash in setqflist(). (Benoit Mortgat, 2010 Nov 18)
++
++MS-Windows: Crash opening very long file name starting with "\\".
++(Christian Brock, 2012 Jun 29)
++
++Crash in autocmd that unloads buffers in a BufUnload event. (Andrew Pimlott,
++2012 Aug 11)  Disallow :new when BufUnload is being handled?
++
++Spell files use a latin single quote.  Unicode also has another single quote.
++Adjust spell file scripts to duplicate words to support both quotes.
++(Ron Aaron, 2014 Apr 4)
 +
 +Problem with 'spellsuggest' file, only works for some words.
@@ -25110 +25520 @@
 +Feb 24)
 +
-+Crash with ":%s/\n//g" on long file. (Aidan Marlin, 2014 Jan 15)
-+Christian Brabandt: patch to run this into a join. (2014 Jan 18)
-+Suggestion to not save replaced line for undo: Yukihiro Nakadaira, 2014 Jan
-+25.
-+
 +Add digraph for Rouble: =P.  What's the Unicode?
 +
-+Bug: "!ls %" expands parenthesis in %, but not spaces.  So this doesn't work
-+either: ':!ls "%"'.
-+Patch by Gary Johnson, 2014 Mar 6.
-+
 +Issue 174: Detect Mason files.
 +
 +No error for missing endwhile. (ZyX, 2014 Mar 20)
 +
-+Patch to add v:progpath. (Viktor Kojouharov, 2014 Mar 15)
-+
 +Phpcomplete.vim update. (Complex, 2014 Jan 15)
 +
 +PHP syntax is extremely slow. (Anhad Jai Singh, 2014 Jan 19)
++
++Win32: use different args for SearchPath()? (Yasuhiro Matsumoto, 2009 Jan 30)
++Also fixes wrong result from executable().
++Update from Ken Takata, 2014 Jan 10. Newer 2014 Apr 3.
 +
 +Can we make ":unlet $VAR" use unsetenv() to delete the env var?
@@ -25139 +25542 @@
 +    vim -u NONE 1 2 3 -c 'bufdo while 1 | echo 1'
 +
-+spec ftplugin: patch from Igor Gnatenko, 2014 Jan 26.
-+Include if maintainers don't respond.
- 
- Patch to make has() check for Vim version and patch at the same time.
- (Marc Weber, 2013 Jun 7)
- 
-+Regression on pach 7.4.034. (Ingo Karkat, 2013 Nov 20)
++'viewdir' default on MS-Windows is not a good choice, it's a system directory.
++Change 'viewdir' to "$HOME/vimfiles/view" and use 'viewdiralt' to also read
++from?
 +
 +Include a plugin manager with Vim? Neobundle seems to be the best currently.
@@ -25181 +25580 @@
 +  useful).
 +
-+Patch to include smack support (Linux security library). (Jose Bollo, 2014 Jan
-+14) Update Jan 15.
-+
-+Tag list, as used for :tjump, does not unescape regexp. (Gary Johnson, 2014 Jan
-+6) With patch in another message.
++Setting the spell file in a session only reads the local additions, not the
++normal spell file. (Enno Nagel, 2014 Mar 29)
++
++Editing an ascii file as ucs-2 or ucs-4 causes display errors.
++(ZyX, 2014 Mar 30)
++
++":Next 1 some-arg" does not complain about trailing argument.  Also for
++various other commands.  (ZyX, 2014 Mar 30)
 +
 +VMS: Select() doesn't work properly, typing ESC may hang Vim.  Use sys$qiow
 +instead. (Samuel Ferencik, 2013 Sep 28)
 +
-+Series of patches for NL vs NUL handling. (ZyX, 2013 Nov 3, Nov 9)
-+
 +Patch for XDG base directory support. (Jean François Bignolles, 2014 Mar 4)
 +
@@ -25200 +25600 @@
 +
 +Patch to make test 100 work on MS-Windows. (Taro Muraoka, 2013 Dec 12)
-+
+ 
+-Patch to make has() check for Vim version and patch at the same time.
+-(Marc Weber, 2013 Jun 7)
 +Patch to define macros for hardcoded values. (Elias Diem, 2013 Dec 14)
 +
@@ -25207 +25609 @@
 +
 +Perl: support for Activestate perl 5.18: Issue 170.
-+
+ 
  Several syntax file match "^\s*" which may get underlined if that's in the
  highlight group.  Add a "\zs" after it?
@@ -25228 +25630 @@
 +
 +Patch to right-align signs. (James Kolb (email james), 2013 Sep 23)
-+
-+Patch to handle integer overflow. (Aaron Burrow, 2013 Dec 12)
  
 -Several Win32 functions are not using Unicode.
 -Patches to fix this. (Ken Takata, 2013 Aug 9)
++Patch to handle integer overflow. (Aaron Burrow, 2013 Dec 12)
++
 +With "$" in 'cpoptions' the popup menu isn't fully drawn. (Matti Niemenmaa,
 +2013 Sep 5)
@@ -25249 +25651 @@
 +    "lucida_console:h8").
 +Patch by Thomas Tuegel, also for GTK, 2013 Nov 24
- 
--Patch to make external commands work with multi-byte characters on Win32 when
--'encoding' differs from the active codepage. (Yasuhiro Matsumoto, 2013 Aug 5)
++
 +:help gives example for z?, but it does not work.  m? and t? do work.
 +
@@ -25264 +25664 @@
 +Patch to fix that on suckless Terminal mousewheel up does not work.
 +(Ralph Eastwood, 2013 Nov 25)
-+
+ 
+-Patch to make external commands work with multi-byte characters on Win32 when
+-'encoding' differs from the active codepage. (Yasuhiro Matsumoto, 2013 Aug 5)
 +Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
  
@@ -25293 +25695 @@
 +registers. (Aryeh Leib Taurog, 2013 Nov 18)
 +
-+Win32: use different args for SearchPath()? (Yasuhiro Matsumoto, 2009 Jan 30)
-+Also fixes wrong result from executable().
-+Update from Ken Takata, 2014 Jan 10.
-+
  Javascript file where indent gets stuck on: GalaxyMaster, 2012 May 3.
  
  The BufUnload event is triggered when re-using the empty buffer.
-@@ -76,6 +272,10 @@
+@@ -76,6 +270,10 @@
  - The word that was selected (empty if abandoned complete)
  - Type of completion: tag, omnifunc, user func.
@@ -25311 +25709 @@
  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 +283,6 @@
+@@ -83,10 +281,6 @@
  Patch by Christian Brabandt, 2013 Mar 23.
  Not 100% sure this is the right solution.
@@ -25322 +25720 @@
  Yasuhiro Matsumoto, 2013 May 31.
  Or should we add a more general mechanism, like lambda functions?
-@@ -94,6 +290,19 @@
+@@ -94,6 +288,19 @@
  Problem caused by patch 7.3.638: window->open does not update window
  correctly. Issue 91.
@@ -25342 +25740 @@
  2013 Mar 19, later message)
  
-@@ -108,6 +317,8 @@
+@@ -108,6 +315,8 @@
  Bug with 'cursorline' in diff mode.  Line being scrolled into view gets
  highlighted as the cursor line.  (Alessandro Ivaldi, 2013 Jun 4)
@@ -25351 +25749 @@
  May 17: with winlist() and tabpagelist().
  May 19: with local variables.
-@@ -119,6 +330,8 @@
+@@ -119,6 +328,8 @@
  Patch from Christian Brabandt to make the "buffer" argument for ":sign place"
  optional. (2013 Jul 12)
@@ -25360 +25758 @@
  functions. (Christian Brabandt, 2013 May 8, update May 21)
  Patch to add getlocstack() / setlocstack(). (Christian Brabandt, 2013 May 14)
-@@ -152,8 +365,19 @@
- MS-Windows: Crash opening very long file name starting with "\\".
- (Christian Brock, 2012 Jun 29)
- 
+@@ -149,11 +360,19 @@
+ process that is running.  It might actually be some other program, e.g. after
+ a reboot.
+ 
+-MS-Windows: Crash opening very long file name starting with "\\".
+-(Christian Brock, 2012 Jun 29)
 +Patch to have text objects defined by arbitrary single characters. (Daniel
 +Thau, 2013 Nov 20, 2014 Jan 29, 2014 Jan 31)
@@ -25371 +25771 @@
 +Patch to select the next or previous text object if there isn't one under the
 +cursor. (Daniel Thau, 2013 Nov 20)
-+
+ 
  patch to add "combine" flag to  syntax commands. (so8res, 2012 Dec 6)
  
@@ -25380 +25780 @@
  not correctly updated. (Paul Harris, 2012 Feb 27)
  
-@@ -167,8 +391,17 @@
+@@ -167,8 +386,17 @@
  
  Patch to add functions for signs. (Christian Brabandt, 2013 Jan 27)
@@ -25398 +25798 @@
  Patch to add 'completeselect' option.  Specifies how to select a candidate in
  insert completion. (Shougo, 2013 May 29)
-@@ -182,9 +415,6 @@
+@@ -182,9 +410,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?
@@ -25408 +25808 @@
  Vim script.  Requires converting the arguments and return value, like with
  vim.bindeval().
-@@ -251,10 +481,6 @@
+@@ -205,9 +430,6 @@
+ Add a check for b:no_match_paren in Highlight_matching_Pair() (Marcin
+ Szamotulski, 2012 Nov 8)
+ 
+-Crash in autocmd that unloads buffers in a BufUnload event. (Andrew Pimlott,
+-2012 Aug 11)  Disallow :new when BufUnload is being handled?
+-
+ Issue 72: 'autochdir' causes problems for :vimgrep.
+ 
+ Session file creation: 'autochdir' causes trouble.  Keep it off until after
+@@ -251,10 +473,6 @@
  Patch to support user name completion on MS-Windows. (Yasuhiro Matsumoto, 2012
  Aug 16)
@@ -25419 +25829 @@
  is confusing.  Should say "the argument list is empty".
  
-@@ -272,8 +498,13 @@
+@@ -272,8 +490,13 @@
  
  Patch to list user digraphs. (Christian Brabandt, 2012 Apr 14)
@@ -25433 +25843 @@
  Apr 18)
  
-@@ -286,13 +517,12 @@
+@@ -286,13 +509,12 @@
      More recent version: https://retracile.net/wiki/VimBreakIndent
      Posted to vim-dev by Taylor Hedberg, 2011 Nov 25
@@ -25448 +25858 @@
  
  Update for vim2html.pl. (Tyru, 2013 Feb 22)
-@@ -374,8 +604,6 @@
+@@ -374,8 +596,6 @@
  Setting $HOME on MS-Windows is not very well documented.  Suggestion by Ben
  Fritz (2011 Oct 27).
@@ -25457 +25867 @@
  doing ":g/test/d".  Putting every delete on the clipboard? (Robert Chan, 2011
  Jun 17)
-@@ -396,7 +624,7 @@
+@@ -396,7 +616,7 @@
  Changes to manpage plugin. (Elias Toivanen, 2011 Jul 25)
  
@@ -25466 +25876 @@
  
  Patch for variable tabstops.
-@@ -419,6 +647,8 @@
+@@ -419,6 +639,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)
@@ -25475 +25885 @@
  Patch from Christian Brabandt, 2011 Aug 19.
  
-@@ -456,6 +686,9 @@
+@@ -456,6 +678,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.
@@ -25485 +25895 @@
  Patch by Christian Brabandt, uses ]e [e ]t and [t. 2011 Aug 9.
  
-@@ -556,7 +789,7 @@
+@@ -556,7 +781,7 @@
  the system encoding (usually utf-8).
  
@@ -25494 +25904 @@
  Problem producing tags file when hebrew.frx is present.  It has a BOM.
  Results in E670. (Tony Mechelynck, 2010 May 2)
-@@ -573,8 +806,7 @@
+@@ -573,8 +798,7 @@
  
  getpos()/setpos() don't include curswant.  getpos() could return a fifth
@@ -25504 +25914 @@
  With "tw=55 fo+=a" typing space before ) doesn't work well. (Scott Mcdermott,
  2010 Oct 24)
-@@ -595,9 +827,6 @@
+@@ -595,9 +819,6 @@
  checked to be in a comment.  Implement FM_SKIPCOMM flag of findmatchlimit().
  Issue 46.
@@ -25514 +25924 @@
  
  Using CompilerSet doesn't record where an option was set from.  E.g., in the
-@@ -629,10 +858,6 @@
+@@ -620,8 +841,6 @@
+ When 'lines' is 25 and 'scrolloff' is 12, "j" scrolls zero or two lines
+ instead of one. (Constantin Pan, 2010 Sep 10)
+ 
+-Crash in setqflist(). (Benoit Mortgat, 2010 Nov 18)
+-
+ Gui menu edit/paste in block mode insert only inserts in one line (Bjorn
+ Winckler, 2011 May 11)
+ Requires a map mode for Insert mode started from blockwise Visual mode.
+@@ -629,10 +848,6 @@
  Writing nested List and Dict in viminfo gives error message and can't be read
  back. (Yukihiro Nakadaira, 2010 Nov 13)
@@ -25525 +25944 @@
  Additional info by Dominique Pelle. (also on 2010 Apr 10)
  
-@@ -759,6 +984,7 @@
+@@ -759,6 +974,7 @@
  
  Patch to add farsi handling to arabic.c (Ali Gholami Rudi, 2009 May 2)
@@ -25533 +25952 @@
  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 +1064,6 @@
+@@ -838,8 +1054,6 @@
  Win32 GUI: last message from startup doesn't show up when there is an echoerr
  command. (Cyril Slobin, 2009 Mar 13)
@@ -25542 +25961 @@
  does not work. (Nieko Maatjes, 2009 Jan 8, Ingo Karkat, 2009 Jan 22)
  
-@@ -856,7 +1080,7 @@
+@@ -856,7 +1070,7 @@
  Using ~ works OK on 'a' with composing char, but not on 0x0418  with composing
  char 0x0301. (Tony Mechelynck, 2009 Mar 4)
@@ -25551 +25970 @@
  Inconsistent: starting with $LANG set to es_ES.utf-8 gives Spanish
  messages, even though locale is not supported.  But ":lang messages
-@@ -885,7 +1109,7 @@
+@@ -885,7 +1099,7 @@
  Completion for ":buf" doesn't work properly on Win32 when 'shellslash' is off.
  (Henrik Ohman, 2009, Jan 29)
@@ -25560 +25979 @@
  Use a different option or let it depend on whether 'shell' looks like a
  unix-like shell?
-@@ -918,8 +1142,6 @@
+@@ -918,8 +1132,6 @@
  Add v:motion_force. (Kana Natsuno, 2008 Dec 6)
  Maybe call it v:motiontype.
@@ -25569 +25988 @@
  doesn't set 'ff' to "unix".  (Ben Fritz, 2008 Dec 5) Reusing the old buffer
  probably causes this.
-@@ -928,7 +1150,7 @@
+@@ -928,7 +1140,7 @@
  2009 Jan 16)
  
@@ -25578 +25997 @@
  Document that default font in Athena can be set with resources:
     XtDefaultFont: "9x15"
-@@ -1296,14 +1518,17 @@
+@@ -1296,14 +1508,17 @@
  Depends on 'shellslash', 'shellquote' and 'shellxquote', but shellescape()
  only takes 'shellslash' into account.
@@ -25600 +26019 @@
  2007 Jun 21)
  
-@@ -1459,6 +1684,9 @@
+@@ -1459,6 +1674,9 @@
  tree stops unexpectedly when using ":cd " and entering a directory that
  doesn't contain other directories.
@@ -25610 +26029 @@
     highlight Normal ctermbg=DarkGray
     set background=dark
-@@ -1685,7 +1913,7 @@
+@@ -1685,7 +1903,7 @@
  -   testdir/Make_dos_sh.mak for running tests with MingW. (Bill Mccarthy, 2008
      Sep 13)
@@ -25619 +26038 @@
      Vissale Neang.  (Martin Stubenschrott) Asked Vissale to make the scripts
      more friendly for the Vim distribution.
-@@ -1715,7 +1943,7 @@
+@@ -1715,7 +1933,7 @@
      How does this work?  Missing comments.
  8   Add a few more command names to the menus.  Patch from Jiri Brezina
@@ -25628 +26047 @@
  -   Include flipcase patch: ~/vim/patches/wall.flipcase2 ?  Make it work
      for multi-byte characters.
-@@ -1864,8 +2092,6 @@
+@@ -1864,8 +2082,6 @@
  Win32 GUI known bugs:
  -   Win32: tearoff menu window should have a scrollbar when it's taller than
@@ -25637 +26056 @@
      file names.  Can we load unicows.dll dynamically?
  8   The -P argument doesn't work very well with many MDI applications.
-@@ -1873,9 +2099,6 @@
+@@ -1873,9 +2089,6 @@
      Tutorial: http://win32assembly.online.fr/tut32.html
  8   In eval.c, io.h is included when MSWIN32 is defined.  Shouldn't this be
@@ -25647 +26066 @@
      of ":only" is highlighted like the cursor.  (Lipelis)
  8   When 'encoding' is "utf-8", should use 'guifont' for both normal and wide
-@@ -1887,9 +2110,6 @@
+@@ -1887,9 +2100,6 @@
  8   Use another default for 'termencoding': the active codepage.  Means that
      when 'encoding' is changed typing characters still works properly.
@@ -25657 +26076 @@
      2004 May 9)
  8   Win32: When clicking on the gvim title bar, which gives it focus, produces
-@@ -2272,8 +2492,6 @@
+@@ -2272,8 +2482,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[]
@@ -25666 +26085 @@
      ":insert" command, causing the following "endfunction" not to be found.
      Add skipping this perl construction inside function definitions.
-@@ -2566,8 +2784,6 @@
+@@ -2566,8 +2774,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
@@ -25675 +26094 @@
      in Vim as if the rightmost scrollbar was used.
  -   GTK with Gnome: Produces an error message when starting up:
-@@ -2736,10 +2952,6 @@
+@@ -2736,10 +2942,6 @@
  
  
@@ -25686 +26105 @@
      https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=219777    
  -   Unicode defines another quote character: 0x2019.  Use it as an equivalent
-@@ -3153,6 +3365,7 @@
+@@ -3153,6 +3355,7 @@
  Built-in script language:
  8   Make the filename and line number available to script functions, so that
@@ -25694 +26113 @@
      restore option values.  Especially useful for new options.  Problem: how
      to avoid a performance penalty (esp. for string options)?
-@@ -4035,8 +4248,7 @@
+@@ -4035,8 +4238,7 @@
  7   Use Tabs for the indent of starting lines, pad with spaces for
      continuation lines.  Allows changing 'tabstop' without messing up the
@@ -25704 +26123 @@
  
  Java:
-@@ -4655,7 +4867,7 @@
+@@ -4655,7 +4857,7 @@
  
  Digraphs:
@@ -25713 +26132 @@
      characters?
  8   Add command to remove one or more (all) digraphs. (Brown)
-@@ -4852,6 +5064,7 @@
+@@ -4852,6 +5054,7 @@
  6   Add ":timer" command, to set a command to be executed at a certain
      interval, or once after some time has elapsed. (Aaron)
@@ -25723 +26142 @@
 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-03-30 20:09:03.712696061 +0000
++++ vim74/runtime/doc/undo.txt  2014-04-27 05:20:57.391750620 +0000
 @@ -1,4 +1,4 @@
 -*undo.txt*      For Vim version 7.4.  Last change: 2012 Mar 04
@@ -25753 +26172 @@
 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-03-30 20:09:03.722696391 +0000
++++ vim74/runtime/doc/usr_25.txt        2014-04-27 05:20:57.401750869 +0000
 @@ -86,7 +86,7 @@
  
@@ -25765 +26184 @@
 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-03-30 20:09:03.722696391 +0000
++++ vim74/runtime/doc/usr_30.txt        2014-04-27 05:20:57.405084285 +0000
 @@ -128,7 +128,7 @@
  You can include special Vim keywords in the command specification.  The %
@@ -25786 +26205 @@
 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-03-30 20:09:03.722696391 +0000
++++ vim74/runtime/doc/usr_40.txt        2014-04-27 05:20:57.408417700 +0000
 @@ -209,7 +209,7 @@
  separates the two commands.  This also means that a | character can't be used
@@ -25798 +26217 @@
 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-03-30 20:09:03.722696391 +0000
++++ vim74/runtime/doc/usr_41.txt        2014-04-27 05:20:57.408417700 +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 Jan 10
++*usr_41.txt*   For Vim version 7.4.  Last change: 2014 Apr 05
  
                      VIM USER MANUAL - by Bram Moolenaar
@@ -25866 +26285 @@
  Working with text in the current buffer:               *text-functions*
         getline()               get a line or list of lines from the buffer
-@@ -883,14 +896,22 @@
+@@ -729,6 +742,7 @@
+        pathshorten()           shorten directory names in a path
+        simplify()              simplify a path without changing its meaning
+        executable()            check if an executable program exists
++       exepath()               full path of an executable program
+        filereadable()          check if a file can be read
+        filewritable()          check if a file can be written to
+        getfperm()              get the permissions of a file
+@@ -741,7 +755,8 @@
+        mkdir()                 create a new directory
+        delete()                delete a file
+        rename()                rename a file
+-       system()                get the result of a shell command
++       system()                get the result of a shell command as a string
++       systemlist()            get the result of a shell command as a list
+        hostname()              name of the system
+        readfile()              read a file into a List of lines
+        writefile()             write a List of lines into a file
+@@ -883,14 +898,22 @@
         libcall()               call a function in an external library
         libcallnr()             idem, returning a number
@@ -25891 +26328 @@
 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-03-30 20:09:03.722696391 +0000
++++ vim74/runtime/doc/usr_42.txt        2014-04-27 05:20:57.408417700 +0000
 @@ -311,7 +311,7 @@
  item with a bitmap.  For example, define a new toolbar item with: >
@@ -25903 +26340 @@
 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-03-30 20:09:03.729363277 +0000
++++ vim74/runtime/doc/usr_45.txt        2014-04-27 05:20:57.411751116 +0000
 @@ -328,8 +328,8 @@
  *45.5* Entering language text
@@ -25917 +26354 @@
 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-03-30 20:09:03.732696720 +0000
++++ vim74/runtime/doc/various.txt       2014-04-27 05:20:57.411751116 +0000
 @@ -1,4 +1,4 @@
 -*various.txt*   For Vim version 7.4.  Last change: 2013 May 18
-+*various.txt*   For Vim version 7.4.  Last change: 2014 Mar 23
++*various.txt*   For Vim version 7.4.  Last change: 2014 Apr 01
  
  
                   VIM REFERENCE MANUAL    by Bram Moolenaar
-@@ -291,6 +291,7 @@
+@@ -234,25 +234,41 @@
+                                                        *:!cmd* *:!* *E34*
+ :!{cmd}                        Execute {cmd} with the shell.  See also the 'shell'
+                        and 'shelltype' option.
++
+                        Any '!' in {cmd} is replaced with the previous
+                        external command (see also 'cpoptions').  But not when
+                        there is a backslash before the '!', then that
+                        backslash is removed.  Example: ":!ls" followed by
+                        ":!echo ! \! \\!" executes "echo ls ! \!".
+-                       After the command has been executed, the timestamp of
+-                       the current file is checked |timestamp|.
++
+                        A '|' in {cmd} is passed to the shell, you cannot use
+                        it to append a Vim command.  See |:bar|.
++
++                       If {cmd} contains "%" it is expanded to the current
++                       file name.  Special characters are not escaped, use
++                       quotes to avoid their special meaning: >
++                               :!ls "%"
++<                      If the file name contains a "$" single quotes might
++                       work better (but a single quote causes trouble): >
++                               :!ls '%'
++<                      This should always work, but it's more typing: >
++                               :exe "!ls " . shellescape(expand("%"))
++<
+                        A newline character ends {cmd}, what follows is
+                        interpreted as a following ":" command.  However, if
+                        there is a backslash before the newline it is removed
+                        and {cmd} continues.  It doesn't matter how many
+                        backslashes are before the newline, only one is
+                        removed.
++
+                        On Unix the command normally runs in a non-interactive
+                        shell.  If you want an interactive shell to be used
+                        (to use aliases) set 'shellcmdflag' to "-ic".
+                        For Win32 also see |:!start|.
++
++                       After the command has been executed, the timestamp of
++                       the current file is checked |timestamp|.
++
+                        Vim redraws the screen after the command is finished,
+                        because it may have printed any text.  This requires a
+                        hit-enter prompt, so that you can read any messages.
+@@ -291,6 +307,7 @@
                         in the normal, big and huge versions of Vim.
  
@@ -25932 +26413 @@
  B  *+arabic*           |Arabic| language support
  N  *+autocmd*          |:autocmd|, automatic commands
-@@ -417,7 +418,7 @@
+@@ -417,7 +434,7 @@
  N  *+viminfo*          |'viminfo'|
  N  *+vertsplit*                Vertically split windows |:vsplit|
@@ -25941 +26422 @@
  N  *+vreplace*         |gR| and |gr|
  N  *+wildignore*       |'wildignore'|
-@@ -426,6 +427,7 @@
+@@ -426,6 +443,7 @@
  m  *+writebackup*      |'writebackup'| is default on
  m  *+xim*              X input method |xim|
@@ -25951 +26432 @@
 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-03-30 20:09:03.739363606 +0000
++++ vim74/runtime/doc/version5.txt      2014-04-27 05:20:57.415084533 +0000
 @@ -2020,7 +2020,7 @@
  
@@ -25963 +26444 @@
 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-03-30 20:09:03.752697379 +0000
++++ vim74/runtime/doc/version7.txt      2014-04-27 05:20:57.428418198 +0000
 @@ -1,4 +1,4 @@
 -*version7.txt*  For Vim version 7.4.  Last change: 2013 Aug 10
@@ -26007 +26488 @@
 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-03-30 20:09:03.752697379 +0000
++++ vim74/runtime/doc/vi_diff.txt       2014-04-27 05:20:57.428418198 +0000
 @@ -1,4 +1,4 @@
 -*vi_diff.txt*   For Vim version 7.4.  Last change: 2012 Aug 08
@@ -26034 +26515 @@
 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-03-30 20:09:03.769364594 +0000
++++ vim74/runtime/doc/visual.txt        2014-04-27 05:20:57.448418693 +0000
 @@ -1,4 +1,4 @@
 -*visual.txt*    For Vim version 7.4.  Last change: 2012 Aug 15
@@ -26065 +26546 @@
 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-03-30 20:09:03.769364594 +0000
++++ vim74/runtime/doc/windows.txt       2014-04-27 05:20:57.448418693 +0000
 @@ -1,4 +1,4 @@
 -*windows.txt*   For Vim version 7.4.  Last change: 2012 Nov 15
@@ -26101 +26582 @@
 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-03-30 20:09:03.776031480 +0000
++++ vim74/runtime/filetype.vim  2014-04-27 05:20:57.455085527 +0000
 @@ -1,7 +1,7 @@
  " Vim support file to detect file types
@@ -26283 +26764 @@
 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-03-30 20:09:03.786031809 +0000
++++ vim74/runtime/ftplugin/changelog.vim        2014-04-27 05:20:57.465085774 +0000
 @@ -1,7 +1,7 @@
  " Vim filetype plugin file
@@ -26398 +26879 @@
 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-03-30 20:09:03.786031809 +0000
++++ vim74/runtime/ftplugin/clojure.vim  2014-04-27 05:20:57.465085774 +0000
 @@ -1,44 +1,60 @@
  " Vim filetype plugin file
@@ -26530 +27011 @@
 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-03-30 20:09:03.786031809 +0000
++++ vim74/runtime/ftplugin/cobol.vim    2014-04-27 05:20:57.465085774 +0000
 @@ -1,7 +1,7 @@
  " Vim filetype plugin file
@@ -26579 +27060 @@
 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-03-30 20:09:03.789365252 +0000
++++ vim74/runtime/ftplugin/debchangelog.vim     2014-04-27 05:20:57.471752607 +0000
 @@ -3,7 +3,7 @@
  " Maintainer:   Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
@@ -26600 +27081 @@
 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-03-30 20:09:03.796032139 +0000
++++ vim74/runtime/ftplugin/fortran.vim  2014-04-27 05:20:57.478419439 +0000
 @@ -1,12 +1,12 @@
  " Vim settings file
@@ -26652 +27133 @@
 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-03-30 20:09:03.802699025 +0000
-@@ -0,0 +1,19 @@
++++ vim74/runtime/ftplugin/j.vim        2014-04-27 05:20:57.485086272 +0000
+@@ -0,0 +1,75 @@
 +" Vim filetype plugin
 +" Language:    J
 +" Maintainer:  David BÃŒrgin <676c7473@gmail.com>
 +" URL:         https://github.com/glts/vim-j
-+" Last Change: 2014-03-17
++" Last Change: 2014-04-05
 +
 +if exists('b:did_ftplugin')
@@ -26665 +27146 @@
 +let b:did_ftplugin = 1
 +
-+setlocal iskeyword=48-57,65-90,_,97-122
++let s:save_cpo = &cpo
++set cpo&vim
++
++setlocal iskeyword=48-57,A-Z,_,a-z
 +setlocal comments=:NB.
 +setlocal commentstring=NB.\ %s
@@ -26673 +27157 @@
 +
 +let b:undo_ftplugin = 'setlocal matchpairs< expandtab< softtabstop< shiftwidth< formatoptions< commentstring< comments< iskeyword<'
++
++" Section movement with ]] ][ [[ []. The start/end patterns below are amended
++" inside the function in order to avoid matching on the current cursor line.
++let s:sectionstart = '.\{-}\<\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\>.*'
++let s:sectionend = '\s*)\s*'
++
++function! s:SearchSection(end, backwards, visualmode) abort
++  if a:visualmode !=# ''
++    normal! gv
++  endif
++  let flags = a:backwards ? 'bsW' : 'sW'
++  if a:end
++    call search('^' . s:sectionend . (a:backwards ? '\n\_.\{-}\%#' : '$'), flags)
++  else
++    call search('^' . s:sectionstart . (a:backwards ? '\n\_.\{-}\%#' : '$'), flags)
++  endif
++endfunction
++
++noremap <script> <buffer> <silent> ]] :<C-U>call <SID>SearchSection(0, 0, '')<CR>
++xnoremap <script> <buffer> <silent> ]] :<C-U>call <SID>SearchSection(0, 0, visualmode())<CR>
++sunmap <buffer> ]]
++noremap <script> <buffer> <silent> ][ :<C-U>call <SID>SearchSection(1, 0, '')<CR>
++xnoremap <script> <buffer> <silent> ][ :<C-U>call <SID>SearchSection(1, 0, visualmode())<CR>
++sunmap <buffer> ][
++noremap <script> <buffer> <silent> [[ :<C-U>call <SID>SearchSection(0, 1, '')<CR>
++xnoremap <script> <buffer> <silent> [[ :<C-U>call <SID>SearchSection(0, 1, visualmode())<CR>
++sunmap <buffer> [[
++noremap <script> <buffer> <silent> [] :<C-U>call <SID>SearchSection(1, 1, '')<CR>
++xnoremap <script> <buffer> <silent> [] :<C-U>call <SID>SearchSection(1, 1, visualmode())<CR>
++sunmap <buffer> []
++
++let b:undo_ftplugin .= ' | silent! execute "unmap <buffer> ]]"'
++                   \ . ' | silent! execute "unmap <buffer> ]["'
++                   \ . ' | silent! execute "unmap <buffer> [["'
++                   \ . ' | silent! execute "unmap <buffer> []"'
++
++" Browse dialog filter on Windows (see ":help browsefilter")
++if has('gui_win32') && !exists('b:browsefilter')
++  let b:browsefilter = "J Script Files (*.ijs)\t*.ijs\n"
++                   \ . "All Files (*.*)\t*.*\n"
++  let b:undo_ftplugin .= ' | unlet! b:browsefilter'
++endif
++
++" Enhanced "%" matching (see ":help matchit")
++if exists('loaded_matchit') && !exists('b:match_words')
++  let b:match_ignorecase = 0
++  let b:match_words = '^.\{-}\<\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(\:\s*0\|def\s\+0\|define\)\>:^\s*\:\s*$:^\s*)\s*$'
++                  \ . ',\<\%(for\%(_\a\k*\)\=\|if\|select\|try\|whil\%(e\|st\)\)\.:\<\%(case\|catch[dt]\=\|else\%(if\)\=\|fcase\)\.:\<end\.'
++  let b:undo_ftplugin .= ' | unlet! b:match_ignorecase b:match_words'
++endif
++
++let &cpo = s:save_cpo
++unlet s:save_cpo
 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-03-30 20:09:03.802699025 +0000
++++ vim74/runtime/ftplugin/jproperties.vim      2014-04-27 05:20:57.488419688 +0000
 @@ -0,0 +1,15 @@
 +" Vim filetype plugin
@@ -26694 +27231 @@
 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-03-30 20:09:03.809365911 +0000
++++ vim74/runtime/ftplugin/lisp.vim     2014-04-27 05:20:57.491753103 +0000
 @@ -4,7 +4,7 @@
  " URL:          http://sites.google.com/site/khorser/opensource/vim
@@ -26716 +27253 @@
 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-03-30 20:09:03.829366570 +0000
++++ vim74/runtime/ftplugin/python.vim   2014-04-27 05:20:57.508420184 +0000
 @@ -1,7 +1,8 @@
  " Vim filetype plugin file
@@ -26799 +27336 @@
 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-03-30 20:09:03.829366570 +0000
++++ vim74/runtime/ftplugin/registry.vim 2014-04-27 05:20:57.511753600 +0000
 @@ -0,0 +1,36 @@
 +" Vim filetype plugin file
@@ -26839 +27376 @@
 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-03-30 20:09:03.832700013 +0000
++++ vim74/runtime/ftplugin/scheme.vim   2014-04-27 05:20:57.515087016 +0000
 @@ -4,7 +4,7 @@
  " URL:          http://sites.google.com/site/khorser/opensource/vim
@@ -26862 +27399 @@
 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-03-30 20:09:03.836033456 +0000
++++ vim74/runtime/ftplugin/spec.vim     2014-04-27 05:20:57.518420433 +0000
 @@ -1,7 +1,8 @@
  " Plugin to update the %changelog section of RPM spec files
@@ -26887 +27424 @@
 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-03-30 20:09:03.839366898 +0000
++++ vim74/runtime/ftplugin/systemverilog.vim    2014-04-27 05:20:57.521753849 +0000
 @@ -0,0 +1,11 @@
 +" Vim filetype plugin file
@@ -26902 +27439 @@
 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-03-30 20:09:03.862701001 +0000
++++ vim74/runtime/indent/clojure.vim    2014-04-27 05:20:57.541754345 +0000
 @@ -1,23 +1,27 @@
  " Vim indent file
@@ -27595 +28132 @@
 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-03-30 20:09:03.876034773 +0000
-@@ -0,0 +1,38 @@
++++ vim74/runtime/indent/j.vim  2014-04-27 05:20:57.555088009 +0000
+@@ -0,0 +1,50 @@
 +" Vim indent file
 +" Language:    J
 +" Maintainer:  David BÃŒrgin <676c7473@gmail.com>
 +" URL:         https://github.com/glts/vim-j
-+" Last Change: 2014-03-17
++" Last Change: 2014-04-05
 +
 +if exists('b:did_indent')
@@ -27609 +28146 @@
 +
 +setlocal indentexpr=GetJIndent()
-+setlocal indentkeys-=0{,0},\:,0#
-+setlocal indentkeys+=0),=case.,=catch.,=catchd.,=catcht.,=do.,=else.,=elseif.,=end.,=fcase.
++setlocal indentkeys-=0{,0},:,0#
++setlocal indentkeys+=0),0<:>,=case.,=catch.,=catchd.,=catcht.,=do.,=else.,=elseif.,=end.,=fcase.
 +
 +let b:undo_indent = 'setlocal indentkeys< indentexpr<'
@@ -27618 +28155 @@
 +endif
 +
-+function GetJIndent()
++" If g:j_indent_definitions is true, the bodies of explicit definitions of
++" adverbs, conjunctions, and verbs will be indented. Default is false (0).
++if !exists('g:j_indent_definitions')
++  let g:j_indent_definitions = 0
++endif
++
++function GetJIndent() abort
 +  let prevlnum = prevnonblank(v:lnum-1)
 +  if prevlnum == 0
 +    return 0
 +  endif
-+
 +  let indent = indent(prevlnum)
-+  if getline(prevlnum) =~# '^\s*\%(case\|catch[dt]\=\|do\|else\%(if\)\=\|fcase\|for\%(_\a\k*\)\=\|if\|select\|try\|whil\%(e\|st\)\)\.'
-+    if getline(prevlnum) !~# '\<end\.'
-+      let indent += shiftwidth()
-+    endif
++  let prevline = getline(prevlnum)
++  if prevline =~# '^\s*\%(case\|catch[dt]\=\|do\|else\%(if\)\=\|fcase\|for\%(_\a\k*\)\=\|if\|select\|try\|whil\%(e\|st\)\)\.\%(\%(\<end\.\)\@!.\)*$'
++    " Increase indentation after an initial control word that starts or
++    " continues a block and is not terminated by "end."
++    let indent += shiftwidth()
++  elseif g:j_indent_definitions && (prevline =~# '\<\%([1-4]\|13\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\>' || prevline =~# '^\s*:\s*$')
++    " Increase indentation in explicit definitions of adverbs, conjunctions,
++    " and verbs
++    let indent += shiftwidth()
 +  endif
-+  if getline(v:lnum) =~# '^\s*\%(\%(case\|catch[dt]\=\|do\|else\%(if\)\=\|end\|fcase\)\.\)\|)'
++  " Decrease indentation in lines that start with either control words that
++  " continue or end a block, or the special items ")" and ":"
++  if getline(v:lnum) =~# '^\s*\%()\|:\|\%(case\|catch[dt]\=\|do\|else\%(if\)\=\|end\|fcase\)\.\)'
 +    let indent -= shiftwidth()
 +  endif
@@ -27637 +28186 @@
 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-03-30 20:09:03.886035102 +0000
++++ vim74/runtime/indent/php.vim        2014-04-27 05:20:57.565088257 +0000
 @@ -3,7 +3,7 @@
  " Author:      John Wellesz <John.wellesz (AT) teaser (DOT) fr>
@@ -27658 +28207 @@
 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-03-30 20:09:03.892701988 +0000
++++ vim74/runtime/indent/sh.vim 2014-04-27 05:20:57.571755091 +0000
 @@ -1,7 +1,8 @@
  " Vim indent file
@@ -27695 +28244 @@
 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-03-30 20:09:03.892701988 +0000
++++ vim74/runtime/indent/systemverilog.vim      2014-04-27 05:20:57.571755091 +0000
 @@ -0,0 +1,230 @@
 +" Vim indent file
@@ -27929 +28478 @@
 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-03-30 20:09:03.996038723 +0000
++++ vim74/runtime/optwin.vim    2014-04-27 05:20:57.678424406 +0000
+@@ -1,7 +1,7 @@
+ " These commands create the option window.
+ "
+ " Maintainer:  Bram Moolenaar <Bram@vim.org>
+-" Last Change: 2013 Jun 29
++" Last Change: 2014 Apr 01
+ 
+ " If there already is an option window, jump to that one.
+ if bufwinnr("option-window") > 0
 @@ -855,7 +855,7 @@
    call append("$", "\t(local to buffer)")
@@ -27935 +28493 @@
    call append("$", "lispwords\twords that change how lisp indenting works")
 -  call <SID>OptionG("lw", &lw)
-+  call <SID>OptionL("lw", &lw)
++  call <SID>OptionL("lw")
  endif
  
@@ -27941 +28499 @@
 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-03-30 20:09:03.996038723 +0000
++++ vim74/runtime/plugin/getscriptPlugin.vim    2014-04-27 05:20:57.678424406 +0000
 @@ -1,7 +1,7 @@
  " ---------------------------------------------------------------------
@@ -27972 +28530 @@
 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-03-30 20:09:03.999372167 +0000
++++ vim74/runtime/plugin/netrwPlugin.vim        2014-04-27 05:20:57.681757821 +0000
 @@ -1,9 +1,9 @@
  " netrwPlugin.vim: Handles file transfer and remote directory listing across a network
@@ -28156 +28714 @@
 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-03-30 20:09:04.142710219 +0000
++++ vim74/runtime/syntax/a65.vim        2014-04-27 05:20:57.818427882 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -28169 +28727 @@
 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-03-30 20:09:04.149377105 +0000
++++ vim74/runtime/syntax/apache.vim     2014-04-27 05:20:57.825094716 +0000
 @@ -1,11 +1,9 @@
  " Vim syntax file
@@ -28207 +28765 @@
 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-03-30 20:09:04.149377105 +0000
++++ vim74/runtime/syntax/arduino.vim    2014-04-27 05:20:57.825094716 +0000
 @@ -0,0 +1,61 @@
 +" Vim syntax file
@@ -28272 +28830 @@
 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-03-30 20:09:04.149377105 +0000
++++ vim74/runtime/syntax/asm.vim        2014-04-27 05:20:57.825094716 +0000
 @@ -3,7 +3,7 @@
  " Maintainer:  Erik Wognsen <erik.wognsen@gmail.com>
@@ -28297 +28855 @@
 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-03-30 20:09:04.159377435 +0000
++++ vim74/runtime/syntax/bib.vim        2014-04-27 05:20:57.835094963 +0000
 @@ -2,7 +2,7 @@
  " Language:    BibTeX (bibliographic database format for (La)TeX)
@@ -28318 +28876 @@
 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-03-30 20:09:04.169377763 +0000
++++ vim74/runtime/syntax/clean.vim      2014-04-27 05:20:57.841761796 +0000
 @@ -2,7 +2,7 @@
  " Language:            Clean
@@ -28380 +28938 @@
 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-03-30 20:09:04.172711207 +0000
++++ vim74/runtime/syntax/clojure.vim    2014-04-27 05:20:57.845095211 +0000
 @@ -1,34 +1,37 @@
  " Vim syntax file
@@ -28648 +29206 @@
 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-03-30 20:09:04.176044650 +0000
++++ vim74/runtime/syntax/css.vim        2014-04-27 05:20:57.851762044 +0000
 @@ -6,7 +6,7 @@
  "               Nikolai Weibull (Add CSS2 support)
@@ -29401 +29959 @@
 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-03-30 20:09:04.182711537 +0000
++++ vim74/runtime/syntax/d.vim  2014-04-27 05:20:57.855095460 +0000
 @@ -2,8 +2,8 @@
  "
@@ -29494 +30052 @@
 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-03-30 20:09:04.182711537 +0000
++++ vim74/runtime/syntax/datascript.vim 2014-04-27 05:20:57.855095460 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -29543 +30101 @@
 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-03-30 20:09:04.182711537 +0000
++++ vim74/runtime/syntax/debchangelog.vim       2014-04-27 05:20:57.855095460 +0000
 @@ -3,7 +3,7 @@
  " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
@@ -29564 +30122 @@
 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-03-30 20:09:04.182711537 +0000
++++ vim74/runtime/syntax/debcontrol.vim 2014-04-27 05:20:57.858428875 +0000
 @@ -3,7 +3,7 @@
  " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
@@ -29585 +30143 @@
 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-03-30 20:09:04.182711537 +0000
++++ vim74/runtime/syntax/debsources.vim 2014-04-27 05:20:57.858428875 +0000
 @@ -2,7 +2,7 @@
  " Language:     Debian sources.list
@@ -29606 +30164 @@
 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-03-30 20:09:04.186044980 +0000
++++ vim74/runtime/syntax/diff.vim       2014-04-27 05:20:57.858428875 +0000
 @@ -2,7 +2,7 @@
  " Language:    Diff (context or unified)
@@ -29627 +30185 @@
 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-03-30 20:09:04.186044980 +0000
++++ vim74/runtime/syntax/dircolors.vim  2014-04-27 05:20:57.861762292 +0000
 @@ -1,751 +1,213 @@
  " Vim syntax file
@@ -30574 +31132 @@
 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-03-30 20:09:04.186044980 +0000
++++ vim74/runtime/syntax/dnsmasq.vim    2014-04-27 05:20:57.861762292 +0000
 @@ -1,26 +1,19 @@
  " Vim syntax file
@@ -30700 +31258 @@
 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-03-30 20:09:04.192711865 +0000
++++ vim74/runtime/syntax/dts.vim        2014-04-27 05:20:57.868429125 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -30731 +31289 @@
 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-03-30 20:09:04.202712195 +0000
++++ vim74/runtime/syntax/euphoria3.vim  2014-04-27 05:20:57.875095957 +0000
 @@ -0,0 +1,135 @@
 +" Vim syntax file
@@ -30870 +31428 @@
 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-03-30 20:09:04.202712195 +0000
++++ vim74/runtime/syntax/euphoria4.vim  2014-04-27 05:20:57.875095957 +0000
 @@ -0,0 +1,247 @@
 +" Vim syntax file
@@ -31121 +31679 @@
 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-03-30 20:09:04.226046296 +0000
++++ vim74/runtime/syntax/help.vim       2014-04-27 05:20:57.895096453 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -31164 +31722 @@
 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-03-30 20:09:04.239380069 +0000
-@@ -0,0 +1,63 @@
++++ vim74/runtime/syntax/j.vim  2014-04-27 05:20:57.905096702 +0000
+@@ -0,0 +1,134 @@
 +" Vim syntax file
 +" Language:    J
 +" Maintainer:  David BÃŒrgin <676c7473@gmail.com>
 +" URL:         https://github.com/glts/vim-j
-+" Last Change: 2014-03-17
++" Last Change: 2014-04-05
 +
 +if exists('b:current_syntax')
@@ -31176 +31734 @@
 +endif
 +
++let s:save_cpo = &cpo
++set cpo&vim
++
 +syntax case match
 +syntax sync minlines=50
 +
++syntax cluster jStdlibItems contains=jStdlibNoun,jStdlibAdverb,jStdlibConjunction,jStdlibVerb
++syntax cluster jPrimitiveItems contains=jNoun,jAdverb,jConjunction,jVerb,jCopula
++
 +syntax match jControl /\<\%(assert\|break\|case\|catch[dt]\=\|continue\|do\|else\%(if\)\=\|end\|fcase\|for\|if\|return\|select\|throw\|try\|whil\%(e\|st\)\)\./
 +syntax match jControl /\<\%(for\|goto\|label\)_\a\k*\./
 +
-+" Standard library names defined in the z locale. A few verbs need to be
-+" defined with ":syntax match" because they would otherwise take precedence
-+" over the corresponding jControl items.
-+syntax keyword jNoun ARGV BINPATH CR CRLF DEL Debug EAV EMPTY FF FHS IF64 IFIOS IFJCDROID IFJHS IFQT IFRASPI IFUNIX IFWIN IFWINCE IFWINE IFWOW64 JB01 JBOXED JCHAR JCMPX JFL JINT JPTR JSIZES JSTR JTYPES JVERSION LF LF2 TAB UNAME UNXLIB adverb andurl conjunction dbhelp dyad libjqt monad noun verb
-+syntax keyword jAdverb define each every fapplylines inv inverse items leaf rows table
-+syntax keyword jConjunction bind cuts def on
-+syntax keyword jVerb AND Endian IFDEF Note OR XOR alpha17 alpha27 anddf android_exec_host andunzip apply boxopen boxxopen bx calendar cd cdcb cder cderx cdf charsub chopstring clear coclass cocreate cocurrent codestroy coerase cofind cofindv cofullname coinfo coinsert coname conames conew conl conouns conounsx copath copathnl copathnlx coreset costate cut cutLF cutopen cutpara datatype dbctx dberm dberr dbg dbjmp dblocals dblxq dblxs dbnxt dbq dbr dbret dbrr dbrrx dbrun dbs dbsig dbsq dbss dbst dbstack dbstk dbstop dbstopme dbstopnext dbstops dbtrace dbview deb debc delstring detab dfh dir dircompare dircompares dirfind dirpath dirss dirssrplc dirtree dirused dlb dltb dltbs dquote drop dropafter dropto dtb dtbs echo empty endian erase evtloop exit expand f2utf8 fappend fappends fboxname fc fcopynew fdir ferase fetch fexist fexists fgets file2url fixdotdot fliprgb fmakex foldpara foldtext fpathcreate fpathname fputs fread freadblock freadr freads frename freplace fsize fss fssrplc fstamp fstringreplace ftype fview fwrite fwritenew fwrites getargs getdate getenv getqtbin hfd hostpathsep ic install iospath isatty isotimestamp isutf8 jcwdpath joinstring jpathsep jsystemdefs list ljust load loadd mema memf memr memw nameclass namelist names nc nl pick quote require rjust rplc script scriptd setbreak show sign sminfo smoutput sort split splitnostring splitstring ss startupandroid startupconsole startupide stderr stdin stdout stringreplace symdat symget symset take takeafter taketo timespacex timestamp timex tmoutput toCRLF toHOST toJ todate todayno tolower topara toupper tsdiff tsrep tstamp type ucp ucpcount unxlib usleep utf8 uucp valdate wcsize weekday weeknumber weeksinyear winpathsep
-+syntax match   jVerb /\<\%(assert\|break\|do\)\>\.\@!/
-+
-+syntax region jString oneline start=/'/ skip=/''/ end=/'/
-+
-+" Number patterns. Matching J numbers is difficult. The regular expression
-+" used for the general case roughly embodies this grammar sketch:
++" Standard library names. A few names need to be defined with ":syntax match"
++" because they would otherwise take precedence over the corresponding jControl
++" and jDefineExpression items.
++syntax keyword jStdlibNoun ARGV BINPATH CR CRLF DEL Debug EAV EMPTY FF FHS IF64 IFIOS IFJCDROID IFJHS IFQT IFRASPI IFUNIX IFWIN IFWINCE IFWINE IFWOW64 JB01 JBOXED JCHAR JCMPX JFL JINT JPTR JSIZES JSTR JTYPES JVERSION LF LF2 TAB UNAME UNXLIB andurl dbhelp libjqt
++syntax keyword jStdlibAdverb define each every fapplylines inv inverse items leaf rows table
++syntax keyword jStdlibConjunction bind cuts def on
++syntax keyword jStdlibVerb AND Endian IFDEF Note OR XOR alpha17 alpha27 anddf android_exec_host andunzip apply boxopen boxxopen bx calendar cd cdcb cder cderx cdf charsub chopstring clear coclass cocreate cocurrent codestroy coerase cofind cofindv cofullname coinfo coinsert coname conames conew conl conouns conounsx copath copathnl copathnlx coreset costate cut cutLF cutopen cutpara datatype dbctx dberm dberr dbg dbjmp dblocals dblxq dblxs dbnxt dbq dbr dbret dbrr dbrrx dbrun dbs dbsig dbsq dbss dbst dbstack dbstk dbstop dbstopme dbstopnext dbstops dbtrace dbview deb debc delstring detab dfh dir dircompare dircompares dirfind dirpath dirss dirssrplc dirtree dirused dlb dltb dltbs dquote drop dropafter dropto dtb dtbs echo empty endian erase evtloop exit expand f2utf8 fappend fappends fboxname fc fcopynew fdir ferase fetch fexist fexists fgets file2url fixdotdot fliprgb fmakex foldpara foldtext fpathcreate fpathname fputs fread freadblock freadr freads frename freplace fsize fss fssrplc fstamp fstringreplace ftype fview fwrite fwritenew fwrites getargs getdate getenv getqtbin hfd hostpathsep ic install iospath isatty isotimestamp isutf8 jcwdpath joinstring jpathsep jsystemdefs list ljust load loadd mema memf memr memw nameclass namelist names nc nl pick quote require rjust rplc script scriptd setbreak show sign sminfo smoutput sort split splitnostring splitstring ss startupandroid startupconsole startupide stderr stdin stdout stringreplace symdat symget symset take takeafter taketo timespacex timestamp timex tmoutput toCRLF toHOST toJ todate todayno tolower topara toupper tsdiff tsrep tstamp type ucp ucpcount unxlib usleep utf8 uucp valdate wcsize weekday weeknumber weeksinyear winpathsep
++syntax match jStdlibNoun /\<\%(adverb\|conjunction\|dyad\|monad\|noun\|verb\)\>/
++syntax match jStdlibVerb /\<\%(assert\|break\|do\)\>\.\@!/
++
++" Numbers. Matching J numbers is difficult. The regular expression used for
++" the general case roughly embodies this grammar sketch:
 +"
 +"     BASE     := /_?\d+(\.\d*)?([eE]_?\d+)?/
@@ -31211 +31774 @@
 +syntax match jNumber /\<_\=\d\+\%([eE]\d\+\)\=b_\=[0-9a-z]\+/
 +syntax match jNumber /\<__\=\>/
++syntax match jNumber /\<_\./
 +syntax match jNumber /\<_\=\d\+x\>/
 +
-+syntax keyword jTodo TODO FIXME XXX contained
++syntax region jString oneline start=/'/ skip=/''/ end=/'/
++
++syntax keyword jArgument contained x y u v m n
++
++" Primitives. Order is significant both within the patterns and among
++" ":syntax match" statements. Refer to "Parts of speech" in the J dictionary.
++syntax match jNoun /\<a[.:]/
++syntax match jAdverb /[}~]\|[/\\]\.\=\|\<\%([Mbft]\.\|t:\)/
++syntax match jConjunction /"\|`:\=\|[.:@&][.:]\=\|&\.:\|\<\%([dDHT]\.\|[DLS]:\)/
++syntax match jVerb /[=!\]]\|[\^?]\.\=\|[;[]:\=\|{\.\|[_/\\]:\|[<>+*\-%$|,#][.:]\=\|[~}"][.:]\|{\%[::]\|\<\%([ACeEiIjLor]\.\|p\.\.\=\|[ipqsux]:\|0:\|_\=[1-9]:\)/
++syntax match jCopula /=[.:]/
++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=".
++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
++" These two items must have "contained", which allows them to match only after
++" jNounDefineStart thanks to the "nextgroup=" above.
++syntax region jNounDefine
++    \ matchgroup=NONE start=/^/
++    \ matchgroup=jDefineEnd end=/^\s*)\s*$/
++    \ contained
++" This match is necessary in case of an empty noun definition
++syntax match jDefineEnd contained /^\s*)\s*$/
++
++" Explicit verb, adverb, and conjunction definition
++syntax region jDefine
++    \ matchgroup=jDefineExpression start=/\<\%([1-4]\|13\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\>/
++    \ matchgroup=jDefineEnd end=/^\s*)\s*$/
++    \ contains=jControl,@jStdlibItems,@jPrimitiveItems,jNumber,jString,jArgument,jParenGroup,jParen,jComment,jDefineMonadDyad
++syntax match jDefineMonadDyad contained /^\s*:\s*$/
++
++" Paired parentheses. When a jDefineExpression such as "3 : 0" is
++" parenthesised it will erroneously extend jParenGroup to span over the whole
++" definition body. This situation receives a special treatment here.
++syntax match jParen /(\%(\s*\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\s*)\)\@=/
++syntax match jParen contained /\%((\s*\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\s*\)\@<=)/
++syntax region jParenGroup
++    \ matchgroup=jParen start=/(\%(\s*\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\>\)\@!/
++    \ matchgroup=jParen end=/)/
++    \ oneline transparent
++
++syntax keyword jTodo contained TODO FIXME XXX
 +syntax match jComment /NB\..*$/ contains=jTodo,@Spell
++
 +syntax match jSharpBang /\%^#!.*$/
 +
-+highlight default link jControl Statement
-+highlight default link jNoun Identifier
-+highlight default link jAdverb Identifier
-+highlight default link jConjunction Identifier
-+highlight default link jVerb Function
-+highlight default link jString String
-+highlight default link jNumber Number
-+highlight default link jTodo Todo
-+highlight default link jComment Comment
-+highlight default link jSharpBang PreProc
++highlight default link jControl           Statement
++highlight default link jStdlibNoun        Identifier
++highlight default link jStdlibAdverb      Function
++highlight default link jStdlibConjunction Function
++highlight default link jStdlibVerb        Function
++highlight default link jString            String
++highlight default link jNumber            Number
++highlight default link jNoun              Constant
++highlight default link jAdverb            Normal
++highlight default link jConjunction       Normal
++highlight default link jVerb              Normal
++highlight default link jCopula            Normal
++highlight default link jArgument          Identifier
++highlight default link jParen             Delimiter
++
++highlight default link jDefineExpression  Define
++highlight default link jDefineMonadDyad   Delimiter
++highlight default link jDefineEnd         Delimiter
++highlight default link jNounDefine        Normal
++
++highlight default link jTodo              Todo
++highlight default link jComment           Comment
++highlight default link jSharpBang         PreProc
 +
 +let b:current_syntax = 'j'
++
++let &cpo = s:save_cpo
++unlet s:save_cpo
 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-03-30 20:09:04.256047284 +0000
++++ vim74/runtime/syntax/mail.vim       2014-04-27 05:20:57.925097198 +0000
 @@ -2,7 +2,7 @@
  " Language:            Mail file
@@ -31252 +31881 @@
 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-03-30 20:09:04.262714170 +0000
++++ vim74/runtime/syntax/masm.vim       2014-04-27 05:20:57.928430615 +0000
 @@ -2,14 +2,11 @@
  " Language:    Microsoft Macro Assembler (80x86)
@@ -31391 +32020 @@
 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-03-30 20:09:04.266047614 +0000
++++ vim74/runtime/syntax/mix.vim        2014-04-27 05:20:57.931764031 +0000
 @@ -0,0 +1,83 @@
 +" Vim syntax file
@@ -31478 +32107 @@
 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-03-30 20:09:04.276047943 +0000
++++ vim74/runtime/syntax/netrw.vim      2014-04-27 05:20:57.945097695 +0000
 @@ -1,7 +1,7 @@
  " Language   : Netrw Remote-Directory Listing Syntax
@@ -31526 +32155 @@
 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-03-30 20:09:04.296048601 +0000
++++ vim74/runtime/syntax/php.vim        2014-04-27 05:20:57.955097944 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -31567 +32196 @@
 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-03-30 20:09:04.316049260 +0000
++++ vim74/runtime/syntax/rst.vim        2014-04-27 05:20:57.975098441 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -31588 +32217 @@
 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-03-30 20:09:04.326049589 +0000
++++ vim74/runtime/syntax/sh.vim 2014-04-27 05:20:57.981765272 +0000
 @@ -2,10 +2,10 @@
  " Language:            shell (sh) Korn shell (ksh) bash (sh)
@@ -31706 +32335 @@
 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-03-30 20:09:04.336049918 +0000
++++ vim74/runtime/syntax/spec.vim       2014-04-27 05:20:57.991765521 +0000
 @@ -1,8 +1,9 @@
  " Filename:    spec.vim
@@ -31741 +32370 @@
 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-03-30 20:09:04.342716805 +0000
++++ vim74/runtime/syntax/svn.vim        2014-04-27 05:20:57.998432353 +0000
 @@ -2,15 +2,18 @@
  " Language:     Subversion (svn) commit file
@@ -31806 +32435 @@
 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-03-30 20:09:04.346050247 +0000
++++ vim74/runtime/syntax/systemverilog.vim      2014-04-27 05:20:58.001765768 +0000
 @@ -0,0 +1,101 @@
 +" Vim syntax file
@@ -31911 +32540 @@
 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-03-30 20:09:04.349383690 +0000
++++ vim74/runtime/syntax/tcl.vim        2014-04-27 05:20:58.005099185 +0000
 @@ -6,11 +6,9 @@
  "              (previously Matt Neumann <mattneu@purpleturtle.com>)
@@ -32046 +32675 @@
 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-03-30 20:09:04.349383690 +0000
++++ vim74/runtime/syntax/tex.vim        2014-04-27 05:20:58.005099185 +0000
 @@ -1,8 +1,8 @@
  " Vim syntax file
@@ -32189 +32818 @@
 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-03-30 20:09:04.359384020 +0000
++++ vim74/runtime/syntax/upstreamlog.vim        2014-04-27 05:20:58.011766018 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -32218 +32847 @@
 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-03-30 20:09:04.359384020 +0000
++++ vim74/runtime/syntax/usserverlog.vim        2014-04-27 05:20:58.015099434 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -32247 +32876 @@
 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-03-30 20:09:04.359384020 +0000
++++ vim74/runtime/syntax/usw2kagtlog.vim        2014-04-27 05:20:58.015099434 +0000
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -32276 +32905 @@
 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-03-30 20:09:04.362717463 +0000
++++ vim74/runtime/syntax/vhdl.vim       2014-04-27 05:20:58.015099434 +0000
 @@ -1,12 +1,12 @@
  " Vim syntax file
@@ -32430 +33059 @@
 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-03-30 20:09:04.366050906 +0000
++++ vim74/runtime/syntax/vim.vim        2014-04-27 05:20:58.018432850 +0000
 @@ -1,8 +1,8 @@
  " Vim syntax file
@@ -32535 +33164 @@
 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-03-30 20:09:04.376051235 +0000
++++ vim74/runtime/syntax/yacc.vim       2014-04-27 05:20:58.031766515 +0000
 @@ -1,8 +1,8 @@
  " Vim syntax file
@@ -32558 +33187 @@
 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-03-30 20:09:04.376051235 +0000
++++ vim74/runtime/syntax/yaml.vim       2014-04-27 05:20:58.031766515 +0000
 @@ -108,9 +108,10 @@
  syn match yamlFlowMappingMerge /<<\ze\s*:/ contained nextgroup=yamlKeyValueDelimiter
@@ -32574 +33203 @@
 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-03-30 20:09:04.389385008 +0000
++++ vim74/runtime/tutor/tutor   2014-04-27 05:20:58.041766762 +0000
 @@ -55,8 +55,8 @@
    2. Type:     :q! <ENTER>.
@@ -32588 +33217 @@
 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-03-30 20:09:04.396051894 +0000
++++ vim74/runtime/tutor/tutor.es        2014-04-27 05:20:58.048433595 +0000
 @@ -121,7 +121,7 @@
          h (izquierda)     j (abajo)      k (arriba)      l (derecha)
@@ -32600 +33229 @@
 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-03-30 20:09:04.402718779 +0000
++++ vim74/runtime/tutor/tutor.it        2014-04-27 05:20:58.055100426 +0000
 @@ -638,7 +638,7 @@
  NOTA: Se esci da Vim e riesegui Vim battendo  vim TEST , il file aperto
@@ -32612 +33241 @@
 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-03-30 20:09:04.402718779 +0000
++++ vim74/runtime/tutor/tutor.it.utf-8  2014-04-27 05:20:58.055100426 +0000
 @@ -638,7 +638,7 @@
  NOTA: Se esci da Vim e riesegui Vim battendo  vim TEST , il file aperto
@@ -32624 +33253 @@
 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-03-30 20:09:04.412719110 +0000
++++ vim74/runtime/tutor/tutor.pt        2014-04-27 05:20:58.065100676 +0000
 @@ -58,11 +58,11 @@
       Isso sai do editor SEM salvar qualquer mudança que tenha sido feita.
@@ -32651 +33280 @@
 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-03-30 20:09:04.412719110 +0000
++++ vim74/runtime/tutor/tutor.pt.utf-8  2014-04-27 05:20:58.065100676 +0000
 @@ -58,11 +58,11 @@
       Isso sai do editor SEM salvar qualquer mudança que tenha sido feita.
@@ -32678 +33307 @@
 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-03-30 20:09:04.426052882 +0000
++++ vim74/runtime/vimlogo.eps   2014-04-27 05:20:58.078434340 +0000
 @@ -1,791 +1,803 @@
 -%!PS-Adobe-3.0 EPSF-3.0
@@ -34275 +34904 @@
 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-03-30 20:09:04.426052882 +0000
++++ vim74/runtime/vimrc_example.vim     2014-04-27 05:20:58.078434340 +0000
 @@ -1,7 +1,7 @@
  " An example for a vimrc file.
@@ -34297 +34926 @@
 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-03-30 20:09:04.426052882 +0000
++++ vim74/src/GvimExt/Make_cyg.mak      2014-04-27 05:20:58.078434340 +0000
 @@ -31,12 +31,12 @@
  ifeq ($(CROSS),yes)
@@ -34316 +34945 @@
 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-03-30 20:09:04.439386653 +0000
++++ vim74/src/Make_bc5.mak      2014-04-27 05:20:58.085101172 +0000
 @@ -419,7 +419,7 @@
  ALIGNARG = -a$(ALIGN)
@@ -34328 +34957 @@
 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-03-30 20:09:04.439386653 +0000
++++ vim74/src/Make_cyg.mak      2014-04-27 05:20:58.085101172 +0000
 @@ -1,6 +1,6 @@
  #
@@ -34366 +34995 @@
 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-03-30 20:09:04.442720097 +0000
++++ vim74/src/Make_ming.mak     2014-04-27 05:20:58.088434588 +0000
 @@ -359,6 +359,7 @@
  
@@ -34407 +35036 @@
 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-03-30 20:09:04.442720097 +0000
++++ vim74/src/Make_mvc.mak      2014-04-27 05:20:58.088434588 +0000
 @@ -424,6 +424,12 @@
  !if "$(_NMAKE_VER)" == "11.00.60610.1"
@@ -34472 +35101 @@
 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-03-30 20:09:04.446053540 +0000
++++ vim74/src/Make_vms.mms      2014-04-27 05:20:58.091768003 +0000
 @@ -2,7 +2,7 @@
  # Makefile for Vim on OpenVMS
@@ -34588 +35217 @@
 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-03-30 20:09:04.446053540 +0000
++++ vim74/src/Makefile  2014-04-27 05:20:58.095101420 +0000
 @@ -546,6 +546,7 @@
  # again.
@@ -34636 +35265 @@
         chmod 755 auto/configure
         mv -f configure.save configure
-@@ -1882,7 +1888,8 @@
+@@ -1861,7 +1867,7 @@
+        -if test $(VIMTARGET) != vim -a ! -r vim; then \
+                ln -s $(VIMTARGET) vim; \
+        fi
+-       cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) $(GUI_TESTARG)
++       cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
+        $(MAKE) -f Makefile unittest
+ 
+ unittesttargets:
+@@ -1874,6 +1880,8 @@
+ 
+ # Run individual test, assuming that Vim was already compiled.
+ test1 test2 test3 test4 test5 test6 test7 test8 test9 \
++       test_eval \
++       test_options \
+        test10 test11 test12 test13 test14 test15 test16 test17 test18 test19 \
+        test20 test21 test22 test23 test24 test25 test26 test27 test28 test29 \
+        test30 test31 test32 test33 test34 test35 test36 test37 test38 test39 \
+@@ -1882,8 +1890,9 @@
         test60 test61 test62 test63 test64 test65 test66 test67 test68 test69 \
         test70 test71 test72 test73 test74 test75 test76 test77 test78 test79 \
         test80 test81 test82 test83 test84 test85 test86 test87 test88 test89 \
 -       test90 test91 test92 test93 test94 test95 test96 test97 test98 test99:
+-       cd testdir; rm $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET)
 +       test90 test91 test92 test93 test94 test95 test96 test97 test98 test99 \
 +       test100 test101 test102 test103 test104 test105 test106 test107:
-        cd testdir; rm $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET)
++       cd testdir; rm $@.out; $(MAKE) -f Makefile $@.out VIMPROG=../$(VIMTARGET) $(GUI_TESTARG) SCRIPTSOURCE=../$(SCRIPTSOURCE)
  
  testclean:
-@@ -2380,6 +2387,7 @@
+        cd testdir; $(MAKE) -f Makefile clean
+@@ -2380,6 +2389,7 @@
                                  ../../testdir/*.in \
                                  ../../testdir/*.vim \
@@ -34665 +35314 @@
 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-03-30 20:09:04.466054198 +0000
++++ vim74/src/auto/configure    2014-04-27 05:20:58.111768501 +0000
 @@ -1,11 +1,9 @@
  #! /bin/sh
@@ -34892 +35541 @@
  GREP
  CPP
-@@ -872,8 +901,9 @@
+@@ -753,6 +782,7 @@
+ with_view_name
+ with_global_runtime
+ with_modified_by
++enable_smack
+ enable_selinux
+ with_features
+ with_compiledby
+@@ -872,8 +902,9 @@
    fi
  
@@ -34904 +35561 @@
  
    # Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -918,7 +948,7 @@
+@@ -918,7 +949,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
@@ -34913 +35570 @@
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -944,7 +974,7 @@
+@@ -944,7 +975,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
@@ -34922 +35579 @@
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1148,7 +1178,7 @@
+@@ -1148,7 +1179,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
@@ -34931 +35588 @@
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1164,7 +1194,7 @@
+@@ -1164,7 +1195,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
@@ -34940 +35597 @@
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1194,8 +1224,8 @@
+@@ -1194,8 +1225,8 @@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
@@ -34951 +35608 @@
  
    *=*)
-@@ -1203,7 +1233,7 @@
+@@ -1203,7 +1234,7 @@
      # Reject names that are not valid shell variable names.
      case $ac_envvar in #(
@@ -34960 +35617 @@
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
-@@ -1213,7 +1243,7 @@
+@@ -1213,7 +1244,7 @@
      $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
@@ -34969 +35626 @@
  
    esac
-@@ -1221,13 +1251,13 @@
+@@ -1221,13 +1252,13 @@
  
  if test -n "$ac_prev"; then
@@ -34985 +35642 @@
    esac
  fi
-@@ -1250,7 +1280,7 @@
+@@ -1250,7 +1281,7 @@
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
@@ -34994 +35651 @@
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -1264,8 +1294,6 @@
+@@ -1264,8 +1295,6 @@
  if test "x$host_alias" != x; then
    if test "x$build_alias" = x; then
@@ -35003 +35660 @@
      cross_compiling=yes
    fi
-@@ -1280,9 +1308,9 @@
+@@ -1280,9 +1309,9 @@
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
@@ -35015 +35672 @@
  
  # Find the source files, if location was not specified.
-@@ -1321,11 +1349,11 @@
+@@ -1321,11 +1350,11 @@
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
@@ -35029 +35686 @@
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1365,7 +1393,7 @@
+@@ -1365,7 +1394,7 @@
        --help=short        display options specific to this package
        --help=recursive    display the short help of all the included packages
@@ -35038 +35695 @@
    -C, --config-cache      alias for \`--cache-file=config.cache'
    -n, --no-create         do not create output files
-@@ -1563,9 +1591,9 @@
+@@ -1425,7 +1454,8 @@
+   --enable-fail-if-missing    Fail if dependencies on additional features
+      specified on the command line are missing.
+   --disable-darwin        Disable Darwin (Mac OS X) support.
+-  --disable-selinux      Don't check for SELinux support.
++  --disable-smack        Do not check for Smack support.
++  --disable-selinux      Do not check for SELinux support.
+   --disable-xsmp          Disable XSMP session management
+   --disable-xsmp-interact Disable XSMP interaction
+   --enable-luainterp=OPTS     Include Lua interpreter.  default=no OPTS=no/yes/dynamic
+@@ -1563,9 +1593,9 @@
  if $ac_init_version; then
    cat <<\_ACEOF
@@ -35050 +35717 @@
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
-@@ -1609,7 +1637,7 @@
+@@ -1609,7 +1639,7 @@
  
         ac_retval=1
@@ -35059 +35726 @@
  
  } # ac_fn_c_try_compile
-@@ -1635,7 +1663,7 @@
+@@ -1635,7 +1665,7 @@
      mv -f conftest.er1 conftest.err
    fi
@@ -35068 +35735 @@
          test ! -s conftest.err
         }; then :
-@@ -1646,7 +1674,7 @@
+@@ -1646,7 +1676,7 @@
  
      ac_retval=1
@@ -35077 +35744 @@
  
  } # ac_fn_c_try_cpp
-@@ -1678,7 +1706,7 @@
+@@ -1678,7 +1708,7 @@
          test ! -s conftest.err
         } && test -s conftest$ac_exeext && {
@@ -35086 +35753 @@
    ac_retval=0
  else
-@@ -1692,7 +1720,7 @@
+@@ -1692,7 +1722,7 @@
    # interfere with the next link command; also delete a directory that is
    # left behind by Apple's compiler.  We do this before executing the actions.
@@ -35095 +35762 @@
  
  } # ac_fn_c_try_link
-@@ -1734,7 +1762,7 @@
+@@ -1734,7 +1764,7 @@
         ac_retval=$ac_status
  fi
@@ -35104 +35771 @@
  
  } # ac_fn_c_try_run
-@@ -1747,10 +1775,10 @@
+@@ -1747,10 +1777,10 @@
  ac_fn_c_check_header_mongrel ()
  {
@@ -35117 +35784 @@
  fi
  eval ac_res=\$$3
-@@ -1786,7 +1814,7 @@
+@@ -1786,7 +1816,7 @@
  else
    ac_header_preproc=no
@@ -35126 +35793 @@
  $as_echo "$ac_header_preproc" >&6; }
  
-@@ -1813,7 +1841,7 @@
+@@ -1813,7 +1843,7 @@
  esac
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
@@ -35135 +35802 @@
  else
    eval "$3=\$ac_header_compiler"
-@@ -1822,7 +1850,7 @@
+@@ -1822,7 +1852,7 @@
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
  $as_echo "$ac_res" >&6; }
@@ -35144 +35811 @@
  } # ac_fn_c_check_header_mongrel
  
-@@ -1835,7 +1863,7 @@
+@@ -1835,7 +1865,7 @@
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
@@ -35153 +35820 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1853,7 +1881,7 @@
+@@ -1853,7 +1883,7 @@
  eval ac_res=\$$3
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -35162 +35829 @@
  } # ac_fn_c_check_header_compile
  
-@@ -1865,7 +1893,7 @@
+@@ -1865,7 +1895,7 @@
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
@@ -35171 +35838 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1920,7 +1948,7 @@
+@@ -1920,7 +1950,7 @@
  eval ac_res=\$$3
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -35180 +35847 @@
  } # ac_fn_c_check_func
  
-@@ -1933,7 +1961,7 @@
+@@ -1933,7 +1963,7 @@
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
@@ -35189 +35856 @@
  else
    eval "$3=no"
-@@ -1974,7 +2002,7 @@
+@@ -1974,7 +2004,7 @@
  eval ac_res=\$$3
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -35198 +35865 @@
  } # ac_fn_c_check_type
  
-@@ -1987,7 +2015,7 @@
+@@ -1987,7 +2017,7 @@
    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
@@ -35207 +35874 @@
  else
    eval "$3=no"
-@@ -2002,7 +2030,8 @@
+@@ -2002,7 +2032,8 @@
  main ()
  {
@@ -35217 +35884 @@
    ;
    return 0;
-@@ -2017,8 +2046,7 @@
+@@ -2017,8 +2048,7 @@
  esac
  fi
@@ -35227 +35894 @@
  else
    break
-@@ -2028,7 +2056,7 @@
+@@ -2028,7 +2058,7 @@
  eval ac_res=\$$3
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -35236 +35903 @@
  } # ac_fn_c_find_uintX_t
  
-@@ -2049,7 +2077,8 @@
+@@ -2049,7 +2079,8 @@
  main ()
  {
@@ -35246 +35913 @@
    ;
    return 0;
-@@ -2065,7 +2094,8 @@
+@@ -2065,7 +2096,8 @@
  main ()
  {
@@ -35256 +35923 @@
    ;
    return 0;
-@@ -2091,7 +2121,8 @@
+@@ -2091,7 +2123,8 @@
  main ()
  {
@@ -35266 +35933 @@
    ;
    return 0;
-@@ -2107,7 +2138,8 @@
+@@ -2107,7 +2140,8 @@
  main ()
  {
@@ -35276 +35943 @@
    ;
    return 0;
-@@ -2141,7 +2173,8 @@
+@@ -2141,7 +2175,8 @@
  main ()
  {
@@ -35286 +35953 @@
    ;
    return 0;
-@@ -2205,7 +2238,7 @@
+@@ -2205,7 +2240,7 @@
  rm -f conftest.val
  
@@ -35295 +35962 @@
  
  } # ac_fn_c_compute_int
-@@ -2214,7 +2247,7 @@
+@@ -2214,7 +2249,7 @@
  running configure, to aid debugging if configure makes a mistake.
  
@@ -35304 +35971 @@
    $ $0 $@
  
-@@ -2324,11 +2357,9 @@
+@@ -2324,11 +2359,9 @@
    {
      echo
@@ -35318 +35985 @@
      # The following way of writing the cache mishandles newlines in values,
  (
-@@ -2362,11 +2393,9 @@
+@@ -2362,11 +2395,9 @@
  )
      echo
@@ -35332 +35999 @@
      for ac_var in $ac_subst_vars
      do
-@@ -2379,11 +2408,9 @@
+@@ -2379,11 +2410,9 @@
      echo
  
@@ -35346 +36013 @@
        for ac_var in $ac_subst_files
        do
-@@ -2397,11 +2424,9 @@
+@@ -2397,11 +2426,9 @@
      fi
  
@@ -35360 +36027 @@
        cat confdefs.h
        echo
-@@ -2456,7 +2481,12 @@
+@@ -2456,7 +2483,12 @@
  ac_site_file1=NONE
  ac_site_file2=NONE
@@ -35374 +36041 @@
    ac_site_file1=$prefix/share/config.site
    ac_site_file2=$prefix/etc/config.site
-@@ -2471,7 +2501,11 @@
+@@ -2471,7 +2503,11 @@
      { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
@@ -35387 +36054 @@
  done
  
-@@ -2547,7 +2581,7 @@
+@@ -2547,7 +2583,7 @@
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
@@ -35396 +36063 @@
  ## -------------------- ##
  ## Main body of script. ##
-@@ -2569,7 +2603,7 @@
+@@ -2569,7 +2605,7 @@
  $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
  set x ${MAKE-make}
@@ -35405 +36072 @@
  else
    cat >conftest.make <<\_ACEOF
-@@ -2577,7 +2611,7 @@
+@@ -2577,7 +2613,7 @@
  all:
         @echo '@@@%%%=$(MAKE)=@@@%%%'
@@ -35414 +36081 @@
    *@@@%%%=?*=@@@%%%*)
      eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -2607,7 +2641,7 @@
+@@ -2607,7 +2643,7 @@
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -35423 +36090 @@
  else
    if test -n "$CC"; then
-@@ -2619,7 +2653,7 @@
+@@ -2619,7 +2655,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -35432 +36099 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -2647,7 +2681,7 @@
+@@ -2647,7 +2683,7 @@
  set dummy gcc; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -35441 +36108 @@
  else
    if test -n "$ac_ct_CC"; then
-@@ -2659,7 +2693,7 @@
+@@ -2659,7 +2695,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -35450 +36117 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -2700,7 +2734,7 @@
+@@ -2700,7 +2736,7 @@
  set dummy ${ac_tool_prefix}cc; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -35459 +36126 @@
  else
    if test -n "$CC"; then
-@@ -2712,7 +2746,7 @@
+@@ -2712,7 +2748,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -35468 +36135 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -2740,7 +2774,7 @@
+@@ -2740,7 +2776,7 @@
  set dummy cc; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -35477 +36144 @@
  else
    if test -n "$CC"; then
-@@ -2753,7 +2787,7 @@
+@@ -2753,7 +2789,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -35486 +36153 @@
         ac_prog_rejected=yes
         continue
-@@ -2799,7 +2833,7 @@
+@@ -2799,7 +2835,7 @@
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -35495 +36162 @@
  else
    if test -n "$CC"; then
-@@ -2811,7 +2845,7 @@
+@@ -2811,7 +2847,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -35504 +36171 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -2843,7 +2877,7 @@
+@@ -2843,7 +2879,7 @@
  set dummy $ac_prog; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -35513 +36180 @@
  else
    if test -n "$ac_ct_CC"; then
-@@ -2855,7 +2889,7 @@
+@@ -2855,7 +2891,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -35522 +36189 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -2897,8 +2931,8 @@
+@@ -2897,8 +2933,8 @@
  
  test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -35533 +36200 @@
  # Provide some information about the compiler.
  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3012,9 +3046,8 @@
+@@ -3012,9 +3048,8 @@
  
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -35545 +36212 @@
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
-@@ -3056,8 +3089,8 @@
+@@ -3056,8 +3091,8 @@
  else
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -35556 +36223 @@
  rm -f conftest conftest$ac_cv_exeext
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3114,9 +3147,9 @@
+@@ -3114,9 +3149,9 @@
      else
         { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -35568 +36235 @@
    fi
  fi
-@@ -3127,7 +3160,7 @@
+@@ -3127,7 +3162,7 @@
  ac_clean_files=$ac_clean_files_save
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
@@ -35577 +36244 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3167,8 +3200,8 @@
+@@ -3167,8 +3202,8 @@
  
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -35588 +36255 @@
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
-@@ -3178,7 +3211,7 @@
+@@ -3178,7 +3213,7 @@
  ac_objext=$OBJEXT
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
@@ -35597 +36264 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3215,7 +3248,7 @@
+@@ -3215,7 +3250,7 @@
  ac_save_CFLAGS=$CFLAGS
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
@@ -35606 +36273 @@
  else
    ac_save_c_werror_flag=$ac_c_werror_flag
-@@ -3293,7 +3326,7 @@
+@@ -3293,7 +3328,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
@@ -35615 +36282 @@
  else
    ac_cv_prog_cc_c89=no
-@@ -3302,8 +3335,7 @@
+@@ -3302,8 +3337,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
@@ -35625 +36292 @@
  struct buf { int x; };
  FILE * (*rcsopen) (struct buf *, struct stat *, int);
-@@ -3399,7 +3431,7 @@
+@@ -3399,7 +3433,7 @@
    CPP=
  fi
@@ -35634 +36301 @@
  else
        # Double quotes because CPP needs to be expanded
-@@ -3429,7 +3461,7 @@
+@@ -3429,7 +3463,7 @@
    # Broken: fails on valid input.
  continue
@@ -35643 +36310 @@
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-@@ -3445,11 +3477,11 @@
+@@ -3445,11 +3479,11 @@
  ac_preproc_ok=:
  break
@@ -35657 +36324 @@
    break
  fi
-@@ -3488,7 +3520,7 @@
+@@ -3488,7 +3522,7 @@
    # Broken: fails on valid input.
  continue
@@ -35666 +36333 @@
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-@@ -3504,18 +3536,18 @@
+@@ -3504,18 +3538,18 @@
  ac_preproc_ok=:
  break
@@ -35689 +36356 @@
  
  ac_ext=c
-@@ -3527,7 +3559,7 @@
+@@ -3527,7 +3561,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
@@ -35698 +36365 @@
  else
    if test -z "$GREP"; then
-@@ -3541,7 +3573,7 @@
+@@ -3541,7 +3575,7 @@
      for ac_prog in grep ggrep; do
      for ac_exec_ext in '' $ac_executable_extensions; do
@@ -35707 +36374 @@
    # Check for GNU $ac_path_GREP
  case `"$ac_path_GREP" --version 2>&1` in
-@@ -3576,7 +3608,7 @@
+@@ -3576,7 +3610,7 @@
    done
  IFS=$as_save_IFS
@@ -35716 +36383 @@
  else
    ac_cv_path_GREP=$GREP
-@@ -3590,7 +3622,7 @@
+@@ -3590,7 +3624,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
@@ -35725 +36392 @@
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -3607,7 +3639,7 @@
+@@ -3607,7 +3641,7 @@
      for ac_prog in egrep; do
      for ac_exec_ext in '' $ac_executable_extensions; do
@@ -35734 +36401 @@
    # Check for GNU $ac_path_EGREP
  case `"$ac_path_EGREP" --version 2>&1` in
-@@ -3642,7 +3674,7 @@
+@@ -3642,7 +3676,7 @@
    done
  IFS=$as_save_IFS
@@ -35743 +36410 @@
  else
    ac_cv_path_EGREP=$EGREP
-@@ -3664,9 +3696,75 @@
+@@ -3664,9 +3698,75 @@
  
  fi
@@ -35821 +36488 @@
  else
    ac_func_search_save_LIBS=$LIBS
-@@ -3700,11 +3798,11 @@
+@@ -3700,11 +3800,11 @@
  fi
  rm -f core conftest.err conftest.$ac_objext \
@@ -35835 +36502 @@
  else
    ac_cv_search_strerror=no
-@@ -3725,7 +3823,7 @@
+@@ -3725,7 +3825,7 @@
  set dummy $ac_prog; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -35844 +36511 @@
  else
    if test -n "$AWK"; then
-@@ -3737,7 +3835,7 @@
+@@ -3737,7 +3837,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -35853 +36520 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -3765,7 +3863,7 @@
+@@ -3765,7 +3865,7 @@
  set dummy strip; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -35862 +36529 @@
  else
    if test -n "$STRIP"; then
-@@ -3777,7 +3875,7 @@
+@@ -3777,7 +3877,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -35871 +36538 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -3804,7 +3902,7 @@
+@@ -3804,7 +3904,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
@@ -35880 +36547 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3916,7 +4014,7 @@
+@@ -3916,7 +4016,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
@@ -35889 +36556 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3989,6 +4087,24 @@
+@@ -3974,9 +4074,9 @@
+   test "$GCC" = yes && CFLAGS="-O2 -fno-strength-reduce -Wall"
+ fi
+ if test "$GCC" = yes; then
+-    gccversion=`"$CC" -dumpversion`
++    gccversion=`$CC -dumpversion`
+   if test "x$gccversion" = "x"; then
+-        gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[^0-9]*\([0-9]\.[0-9.]*\).*$/\1/g'`
++        gccversion=`$CC --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[^0-9]*\([0-9]\.[0-9.]*\).*$/\1/g'`
+   fi
+     if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
+     echo 'GCC [34].0.[12] has a bug in the optimizer, disabling "-O#"'
+@@ -3989,6 +4089,24 @@
    fi
  fi
@@ -35895 +36574 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for recent clang version" >&5
 +$as_echo_n "checking for recent clang version... " >&6; }
-+CLANG_VERSION_STRING=`"$CC" --version 2>/dev/null | sed  -n -e 's/^.*clang.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/p'`
++CLANG_VERSION_STRING=`$CC --version 2>/dev/null | sed  -n -e 's/^.*clang.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/p'`
 +if test x"$CLANG_VERSION_STRING" != x"" ; then
 +  CLANG_MAJOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*/\1/p'`
@@ -35914 +36593 @@
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot compile a simple program; if not cross compiling check CC and CFLAGS" >&5
  $as_echo "cannot compile a simple program; if not cross compiling check CC and CFLAGS" >&6; }
-@@ -4089,7 +4205,7 @@
+@@ -4089,7 +4207,7 @@
  set dummy xcode-select; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -35923 +36602 @@
  else
    case $XCODE_SELECT in
-@@ -4103,7 +4219,7 @@
+@@ -4103,7 +4221,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -35932 +36611 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -4203,7 +4319,7 @@
+@@ -4203,7 +4321,7 @@
      MACOSX=yes
      OS_EXTRA_SRC="os_macosx.m os_mac_conv.c";
@@ -35941 +36620 @@
                  # On IRIX 5.3, sys/types and inttypes.h are conflicting.
  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-@@ -4212,8 +4328,7 @@
+@@ -4212,8 +4330,7 @@
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
@@ -35951 +36630 @@
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -4224,7 +4339,7 @@
+@@ -4224,7 +4341,7 @@
  
  
@@ -35960 +36639 @@
  fi
  
-@@ -4245,6 +4360,19 @@
+@@ -4245,6 +4362,19 @@
  $as_echo "no" >&6; }
  fi
@@ -35980 +36659 @@
  
  
-@@ -4265,7 +4393,7 @@
+@@ -4265,7 +4395,7 @@
        have_local_include=yes
        have_local_lib=yes
@@ -35989 +36668 @@
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $local_dir" >&5
  $as_echo "$local_dir" >&6; }
-@@ -4280,7 +4408,7 @@
+@@ -4280,7 +4410,7 @@
  
    if test "$GCC" = yes -a "$local_dir" != no; then
@@ -35998 +36677 @@
      rm -f conftest.c conftest.o
    fi
-@@ -4474,7 +4602,7 @@
+@@ -4460,21 +4590,120 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-selinux argument" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-smack argument" >&5
++$as_echo_n "checking --disable-smack argument... " >&6; }
++# Check whether --enable-smack was given.
++if test "${enable_smack+set}" = set; then :
++  enableval=$enable_smack;
++else
++  enable_smack="yes"
++fi
++
++if test "$enable_smack" = "yes"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++  ac_fn_c_check_header_mongrel "$LINENO" "linux/xattr.h" "ac_cv_header_linux_xattr_h" "$ac_includes_default"
++if test "x$ac_cv_header_linux_xattr_h" = xyes; then :
++  true
++else
++  enable_smack="no"
++fi
++
++
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++fi
++if test "$enable_smack" = "yes"; then
++  ac_fn_c_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
++if test "x$ac_cv_header_attr_xattr_h" = xyes; then :
++  true
++else
++  enable_smack="no"
++fi
++
++
++fi
++if test "$enable_smack" = "yes"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XATTR_NAME_SMACKEXEC in linux/xattr.h" >&5
++$as_echo_n "checking for XATTR_NAME_SMACKEXEC in linux/xattr.h... " >&6; }
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <linux/xattr.h>
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "XATTR_NAME_SMACKEXEC" >/dev/null 2>&1; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }; enable_smack="no"
++fi
++rm -f conftest*
++
++fi
++if test "$enable_smack" = "yes"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setxattr in -lattr" >&5
++$as_echo_n "checking for setxattr in -lattr... " >&6; }
++if ${ac_cv_lib_attr_setxattr+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lattr  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char setxattr ();
++int
++main ()
++{
++return setxattr ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_attr_setxattr=yes
++else
++  ac_cv_lib_attr_setxattr=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_setxattr" >&5
++$as_echo "$ac_cv_lib_attr_setxattr" >&6; }
++if test "x$ac_cv_lib_attr_setxattr" = xyes; then :
++  LIBS="$LIBS -lattr"
++          found_smack="yes"
++          $as_echo "#define HAVE_SMACK 1" >>confdefs.h
++
++fi
++
++fi
++
++if test "x$found_smack" = "x"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-selinux argument" >&5
+ $as_echo_n "checking --disable-selinux argument... " >&6; }
+-# Check whether --enable-selinux was given.
++  # Check whether --enable-selinux was given.
+ if test "${enable_selinux+set}" = set; then :
+   enableval=$enable_selinux;
+ else
+   enable_selinux="yes"
+ fi
+ 
+-if test "$enable_selinux" = "yes"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++  if test "$enable_selinux" = "yes"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5
  $as_echo_n "checking for is_selinux_enabled in -lselinux... " >&6; }
 -if test "${ac_cv_lib_selinux_is_selinux_enabled+set}" = set; then :
@@ -36007 +36804 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -4508,7 +4636,7 @@
+@@ -4508,15 +4737,16 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
@@ -36014 +36811 @@
 +if test "x$ac_cv_lib_selinux_is_selinux_enabled" = xyes; then :
    LIBS="$LIBS -lselinux"
-           $as_echo "#define HAVE_SELINUX 1" >>confdefs.h
- 
-@@ -4670,7 +4798,7 @@
+-          $as_echo "#define HAVE_SELINUX 1" >>confdefs.h
++            $as_echo "#define HAVE_SELINUX 1" >>confdefs.h
+ 
+ fi
+ 
+-else
+-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++  else
++     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
++  fi
+ fi
+ 
+ 
+@@ -4670,7 +4900,7 @@
  set dummy luajit; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36025 +36834 @@
  else
    case $vi_cv_path_luajit in
-@@ -4684,7 +4812,7 @@
+@@ -4684,7 +4914,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -36034 +36843 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -4709,16 +4837,16 @@
+@@ -4709,16 +4939,16 @@
        if test "X$vi_cv_path_luajit" != "X"; then
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking LuaJIT version" >&5
@@ -36054 +36863 @@
  else
     vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'`
-@@ -4733,7 +4861,7 @@
+@@ -4733,7 +4963,7 @@
  set dummy lua; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36063 +36872 @@
  else
    case $vi_cv_path_plain_lua in
-@@ -4747,7 +4875,7 @@
+@@ -4747,7 +4977,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -36072 +36881 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -4772,7 +4900,7 @@
+@@ -4772,7 +5002,7 @@
        if test "X$vi_cv_path_plain_lua" != "X"; then
                 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Lua version" >&5
@@ -36081 +36890 @@
  else
     vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //'`
-@@ -4932,7 +5060,7 @@
+@@ -4932,7 +5162,7 @@
      fi
    fi
@@ -36090 +36899 @@
  
  
-@@ -4986,7 +5114,7 @@
+@@ -4986,7 +5216,7 @@
  set dummy mzscheme; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36099 +36908 @@
  else
    case $vi_cv_path_mzscheme in
-@@ -5000,7 +5128,7 @@
+@@ -5000,7 +5230,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -36108 +36917 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -5033,7 +5161,7 @@
+@@ -5033,7 +5263,7 @@
         if test "X$vi_cv_path_mzscheme" != "X"; then
                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking MzScheme install prefix" >&5
@@ -36117 +36926 @@
  else
                     echo "(display (simplify-path               \
-@@ -5168,9 +5296,19 @@
+@@ -5168,9 +5398,19 @@
  $as_echo_n "checking for mzscheme_base.c... " >&6; }
      if test -f "${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
@@ -36137 +36946 @@
      fi
      if test "X$MZSCHEME_EXTRA" != "X" ; then
-@@ -5185,7 +5323,7 @@
+@@ -5185,7 +5425,7 @@
  
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ffi_type_void in -lffi" >&5
@@ -36146 +36955 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -5219,7 +5357,7 @@
+@@ -5219,7 +5459,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffi_ffi_type_void" >&5
@@ -36155 +36964 @@
  fi
  
-@@ -5295,7 +5433,7 @@
+@@ -5295,7 +5535,7 @@
  set dummy perl; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36164 +36973 @@
  else
    case $vi_cv_path_perl in
-@@ -5309,7 +5447,7 @@
+@@ -5309,7 +5549,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -36173 +36982 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -5409,7 +5547,7 @@
+@@ -5409,7 +5649,7 @@
                   PERL_CFLAGS=`echo "$perlcppflags" | sed -e 's/-pipe //' -e 's/-W[^ ]*//'`
         fi
@@ -36182 +36991 @@
           fi
         fi
-@@ -5457,7 +5595,7 @@
+@@ -5457,7 +5697,7 @@
    fi
  
@@ -36191 +37000 @@
  fi
  
-@@ -5485,7 +5623,7 @@
+@@ -5485,7 +5725,7 @@
  set dummy $ac_prog; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36200 +37009 @@
  else
    case $vi_cv_path_python in
-@@ -5499,7 +5637,7 @@
+@@ -5499,7 +5739,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -36209 +37018 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -5528,7 +5666,7 @@
+@@ -5528,7 +5768,7 @@
  
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5
@@ -36218 +37027 @@
  else
    vi_cv_var_python_version=`
-@@ -5548,7 +5686,7 @@
+@@ -5548,7 +5788,7 @@
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's install prefix" >&5
@@ -36227 +37036 @@
  else
     vi_cv_path_python_pfx=`
-@@ -5560,7 +5698,7 @@
+@@ -5560,7 +5800,7 @@
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's execution prefix" >&5
@@ -36236 +37045 @@
  else
     vi_cv_path_python_epfx=`
-@@ -5571,7 +5709,7 @@
+@@ -5571,7 +5811,7 @@
  $as_echo "$vi_cv_path_python_epfx" >&6; }
  
@@ -36245 +37054 @@
  else
     vi_cv_path_pythonpath=`
-@@ -5591,7 +5729,7 @@
+@@ -5591,7 +5831,7 @@
  
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5
@@ -36254 +37063 @@
  else
  
-@@ -5621,7 +5759,7 @@
+@@ -5621,7 +5861,7 @@
  $as_echo "can't find it!" >&6; }
        else
@@ -36263 +37072 @@
  else
  
-@@ -5762,7 +5900,7 @@
+@@ -5762,7 +6002,7 @@
    fi
  
@@ -36272 +37081 @@
  fi
  
-@@ -5792,7 +5930,7 @@
+@@ -5792,7 +6032,7 @@
  set dummy $ac_prog; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36281 +37090 @@
  else
    case $vi_cv_path_python3 in
-@@ -5806,7 +5944,7 @@
+@@ -5806,7 +6046,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -36290 +37099 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -5835,7 +5973,7 @@
+@@ -5835,7 +6075,7 @@
  
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5
@@ -36299 +37108 @@
  else
    vi_cv_var_python3_version=`
-@@ -5855,7 +5993,7 @@
+@@ -5855,7 +6095,7 @@
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's abiflags" >&5
@@ -36308 +37117 @@
  else
  
-@@ -5872,7 +6010,7 @@
+@@ -5872,7 +6112,7 @@
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's install prefix" >&5
@@ -36317 +37126 @@
  else
     vi_cv_path_python3_pfx=`
-@@ -5884,7 +6022,7 @@
+@@ -5884,7 +6124,7 @@
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's execution prefix" >&5
@@ -36326 +37135 @@
  else
     vi_cv_path_python3_epfx=`
-@@ -5895,7 +6033,7 @@
+@@ -5895,7 +6135,7 @@
  $as_echo "$vi_cv_path_python3_epfx" >&6; }
  
@@ -36335 +37144 @@
  else
     vi_cv_path_python3path=`
-@@ -5915,7 +6053,7 @@
+@@ -5915,7 +6155,7 @@
  
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5
@@ -36344 +37153 @@
  else
  
-@@ -5946,7 +6084,7 @@
+@@ -5946,7 +6186,7 @@
  $as_echo "can't find it!" >&6; }
        else
@@ -36353 +37162 @@
  else
  
-@@ -6073,7 +6211,7 @@
+@@ -6073,7 +6313,7 @@
      fi
    fi
@@ -36362 +37171 @@
  fi
  
-@@ -6097,8 +6235,8 @@
+@@ -6097,8 +6337,8 @@
    if test "$cross_compiling" = yes; then :
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -36373 +37182 @@
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-@@ -6162,8 +6300,8 @@
+@@ -6162,8 +6402,8 @@
    if test "$cross_compiling" = yes; then :
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -36384 +37193 @@
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-@@ -6337,7 +6475,7 @@
+@@ -6337,7 +6577,7 @@
  set dummy $tclsh_name; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36393 +37202 @@
  else
    case $vi_cv_path_tcl in
-@@ -6351,7 +6489,7 @@
+@@ -6351,7 +6591,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -36402 +37211 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -6381,7 +6519,7 @@
+@@ -6381,7 +6621,7 @@
  set dummy $tclsh_name; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36411 +37220 @@
  else
    case $vi_cv_path_tcl in
-@@ -6395,7 +6533,7 @@
+@@ -6395,7 +6635,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -36420 +37229 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -6424,7 +6562,7 @@
+@@ -6424,7 +6664,7 @@
  set dummy $tclsh_name; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36429 +37238 @@
  else
    case $vi_cv_path_tcl in
-@@ -6438,7 +6576,7 @@
+@@ -6438,7 +6678,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -36438 +37247 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -6467,7 +6605,7 @@
+@@ -6467,7 +6707,7 @@
  set dummy $tclsh_name; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36447 +37256 @@
  else
    case $vi_cv_path_tcl in
-@@ -6481,7 +6619,7 @@
+@@ -6481,7 +6721,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -36456 +37265 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -6510,7 +6648,7 @@
+@@ -6510,7 +6750,7 @@
  set dummy $tclsh_name; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36465 +37274 @@
  else
    case $vi_cv_path_tcl in
-@@ -6524,7 +6662,7 @@
+@@ -6524,7 +6764,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -36474 +37283 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -6641,7 +6779,7 @@
+@@ -6641,7 +6881,7 @@
      fi
    fi
@@ -36483 +37292 @@
  fi
  
-@@ -6679,7 +6817,7 @@
+@@ -6679,7 +6919,7 @@
  set dummy $RUBY_CMD; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36492 +37301 @@
  else
    case $vi_cv_path_ruby in
-@@ -6693,7 +6831,7 @@
+@@ -6693,7 +6933,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -36501 +37310 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -6736,9 +6874,9 @@
+@@ -6736,9 +6976,9 @@
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $rubyhdrdir" >&5
  $as_echo "$rubyhdrdir" >&6; }
@@ -36514 +37323 @@
          rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['ruby_version'].gsub(/\./, '')[0,2]"`
         if test "X$rubyversion" = "X"; then
-@@ -6767,7 +6905,7 @@
+@@ -6767,7 +7007,7 @@
         if test "X$rubyldflags" != "X"; then
                                   rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
@@ -36523 +37332 @@
             fi
           fi
-@@ -6795,7 +6933,7 @@
+@@ -6795,7 +7035,7 @@
    fi
  
@@ -36532 +37341 @@
  fi
  
-@@ -6857,7 +6995,7 @@
+@@ -6857,7 +7097,7 @@
  $as_echo "no" >&6; }
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
@@ -36541 +37350 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -6891,7 +7029,7 @@
+@@ -6891,7 +7131,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
@@ -36550 +37359 @@
  #define HAVE_LIBSOCKET 1
  _ACEOF
-@@ -6902,7 +7040,7 @@
+@@ -6902,7 +7142,7 @@
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
@@ -36559 +37368 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -6936,7 +7074,7 @@
+@@ -6936,7 +7176,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
@@ -36568 +37377 @@
  #define HAVE_LIBNSL 1
  _ACEOF
-@@ -7086,7 +7224,7 @@
+@@ -7086,7 +7326,7 @@
  set dummy xmkmf; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36577 +37386 @@
  else
    case $xmkmfpath in
-@@ -7100,7 +7238,7 @@
+@@ -7100,7 +7340,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -36586 +37395 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -7138,8 +7276,8 @@
+@@ -7138,8 +7378,8 @@
    have_x=disabled
  else
@@ -36597 +37406 @@
  else
    # One or both of the vars are not set, and there is no cached value.
-@@ -7156,7 +7294,7 @@
+@@ -7156,7 +7396,7 @@
         @echo libdir='${LIBDIR}'
  _ACEOF
@@ -36606 +37415 @@
        eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
      done
-@@ -7242,7 +7380,7 @@
+@@ -7242,7 +7482,7 @@
    fi
  done
@@ -36615 +37424 @@
  
  if test "$ac_x_libraries" = no; then
-@@ -7416,7 +7554,7 @@
+@@ -7416,7 +7656,7 @@
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
@@ -36624 +37433 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -7450,14 +7588,14 @@
+@@ -7450,14 +7690,14 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
@@ -36641 +37450 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -7491,7 +7629,7 @@
+@@ -7491,7 +7731,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
@@ -36650 +37459 @@
  fi
  
-@@ -7510,14 +7648,14 @@
+@@ -7510,14 +7750,14 @@
      # The functions gethostbyname, getservbyname, and inet_addr are
      # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -36667 +37476 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -7551,14 +7689,14 @@
+@@ -7551,14 +7791,14 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
@@ -36684 +37493 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -7592,7 +7730,7 @@
+@@ -7592,7 +7832,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
@@ -36693 +37502 @@
  fi
  
-@@ -7607,14 +7745,14 @@
+@@ -7607,14 +7847,14 @@
      # must be given before -lnsl if both are needed.  We assume that
      # if connect needs -lnsl, so does gethostbyname.
@@ -36710 +37519 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -7648,7 +7786,7 @@
+@@ -7648,7 +7888,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
@@ -36719 +37528 @@
  fi
  
-@@ -7656,14 +7794,14 @@
+@@ -7656,14 +7896,14 @@
  
      # Guillermo Gomez says -lposix is necessary on A/UX.
@@ -36736 +37545 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -7697,7 +7835,7 @@
+@@ -7697,7 +7937,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
@@ -36745 +37554 @@
  fi
  
-@@ -7705,14 +7843,14 @@
+@@ -7705,14 +7945,14 @@
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -36762 +37571 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -7746,7 +7884,7 @@
+@@ -7746,7 +7986,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
@@ -36771 +37580 @@
  fi
  
-@@ -7764,7 +7902,7 @@
+@@ -7764,7 +8004,7 @@
    # John Interrante, Karl Berry
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
@@ -36780 +37589 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -7798,7 +7936,7 @@
+@@ -7798,7 +8038,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
@@ -36789 +37598 @@
  fi
  
-@@ -7876,7 +8014,7 @@
+@@ -7876,7 +8116,7 @@
  
              { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _XdmcpAuthDoIt in -lXdmcp" >&5
@@ -36798 +37607 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -7910,14 +8048,14 @@
+@@ -7910,14 +8150,14 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5
@@ -36815 +37624 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -7951,7 +8089,7 @@
+@@ -7951,7 +8191,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceOpenConnection" >&5
@@ -36824 +37633 @@
  fi
  
-@@ -7959,7 +8097,7 @@
+@@ -7959,7 +8199,7 @@
          LDFLAGS="$X_LIBS $ac_save_LDFLAGS"
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmCreatePixmapFromData in -lXpm" >&5
@@ -36833 +37642 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -7993,7 +8131,7 @@
+@@ -7993,7 +8233,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5
@@ -36842 +37651 @@
  fi
  
-@@ -8051,11 +8189,11 @@
+@@ -8051,11 +8291,11 @@
  
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t is 2 bytes" >&5
@@ -36856 +37665 @@
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-@@ -8354,7 +8492,7 @@
+@@ -8354,7 +8594,7 @@
  set dummy pkg-config; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36865 +37674 @@
  else
    case $PKG_CONFIG in
-@@ -8368,7 +8506,7 @@
+@@ -8368,7 +8608,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -36874 +37683 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -8593,7 +8731,7 @@
+@@ -8593,7 +8833,7 @@
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  $as_echo "not found" >&6; }
@@ -36883 +37692 @@
      fi
    }
-@@ -8786,7 +8924,7 @@
+@@ -8786,7 +9026,7 @@
    LDFLAGS="$X_LIBS $LDFLAGS"
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5
@@ -36892 +37701 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -8820,13 +8958,13 @@
+@@ -8820,13 +9060,13 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
@@ -36908 +37717 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -8860,13 +8998,13 @@
+@@ -8860,13 +9100,13 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_w_wslen" >&5
@@ -36924 +37733 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -8900,13 +9038,13 @@
+@@ -8900,13 +9140,13 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5
@@ -36940 +37749 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -8940,14 +9078,14 @@
+@@ -8940,14 +9180,14 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5
@@ -36957 +37766 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -8981,7 +9119,7 @@
+@@ -8981,7 +9221,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xp_XpEndJob" >&5
@@ -36966 +37775 @@
  fi
  
-@@ -9020,7 +9158,7 @@
+@@ -9020,7 +9260,7 @@
    for ac_header in X11/SM/SMlib.h
  do :
@@ -36975 +37784 @@
  #define HAVE_X11_SM_SMLIB_H 1
  _ACEOF
-@@ -9040,8 +9178,7 @@
+@@ -9040,8 +9280,7 @@
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -36985 +37794 @@
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -9123,8 +9260,7 @@
+@@ -9064,7 +9303,7 @@
+ $as_echo "yes" >&6; }
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; xim has been disabled" >&5
+-$as_echo "no; xim has been disabled" >&6; }; enable_xim = "no"
++$as_echo "no; xim has been disabled" >&6; }; enable_xim="no"
+ fi
+ rm -f conftest*
+ 
+@@ -9123,8 +9362,7 @@
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -36995 +37813 @@
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -9192,7 +9328,7 @@
+@@ -9192,7 +9430,7 @@
  
  
@@ -37004 +37822 @@
  
  if test "$enable_xim" = "yes"; then
-@@ -9246,13 +9382,13 @@
+@@ -9246,13 +9484,13 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether toupper is broken" >&5
@@ -37020 +37838 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -9336,7 +9472,7 @@
+@@ -9336,7 +9574,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
@@ -37029 +37847 @@
  fi
  
-@@ -9344,7 +9480,7 @@
+@@ -9344,7 +9582,7 @@
  if test "$HAS_ELF" = 1; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lelf" >&5
@@ -37038 +37856 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -9372,7 +9508,7 @@
+@@ -9372,7 +9610,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_main" >&5
@@ -37047 +37865 @@
  #define HAVE_LIBELF 1
  _ACEOF
-@@ -9388,7 +9524,7 @@
+@@ -9388,7 +9626,7 @@
    as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
@@ -37056 +37874 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -9415,8 +9551,7 @@
+@@ -9415,8 +9653,7 @@
  eval ac_res=\$$as_ac_Header
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -37066 +37884 @@
  #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
  _ACEOF
-@@ -9429,7 +9564,7 @@
+@@ -9429,7 +9666,7 @@
  if test $ac_header_dirent = dirent.h; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
@@ -37075 +37893 @@
  else
    ac_func_search_save_LIBS=$LIBS
-@@ -9463,11 +9598,11 @@
+@@ -9463,11 +9700,11 @@
  fi
  rm -f core conftest.err conftest.$ac_objext \
@@ -37089 +37907 @@
  else
    ac_cv_search_opendir=no
-@@ -9486,7 +9621,7 @@
+@@ -9486,7 +9723,7 @@
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
@@ -37098 +37916 @@
  else
    ac_func_search_save_LIBS=$LIBS
-@@ -9520,11 +9655,11 @@
+@@ -9520,11 +9757,11 @@
  fi
  rm -f core conftest.err conftest.$ac_objext \
@@ -37112 +37930 @@
  else
    ac_cv_search_opendir=no
-@@ -9584,8 +9719,7 @@
+@@ -9584,8 +9821,7 @@
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37122 +37940 @@
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
-@@ -9601,7 +9735,7 @@
+@@ -9601,7 +9837,7 @@
  #  include <sys/stream.h>
  #endif
@@ -37131 +37949 @@
  #define HAVE_SYS_PTEM_H 1
  _ACEOF
-@@ -9617,7 +9751,7 @@
+@@ -9617,7 +9853,7 @@
  #  include <sys/param.h>
  #endif
@@ -37140 +37958 @@
  #define HAVE_SYS_SYSCTL_H 1
  _ACEOF
-@@ -9657,7 +9791,7 @@
+@@ -9657,7 +9893,7 @@
  for ac_header in strings.h
  do :
@@ -37149 +37967 @@
  #define HAVE_STRINGS_H 1
  _ACEOF
-@@ -9716,7 +9850,7 @@
+@@ -9716,7 +9952,7 @@
  if test $ac_cv_c_compiler_gnu = yes; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
@@ -37158 +37976 @@
  else
      ac_pattern="Autoconf.*'x'"
-@@ -9757,7 +9891,7 @@
+@@ -9757,7 +9993,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
@@ -37167 +37985 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -9766,11 +9900,11 @@
+@@ -9766,11 +10002,11 @@
  int
  main ()
@@ -37182 +38000 @@
    char const *const *pcpcc;
    char **ppc;
-@@ -9787,8 +9921,9 @@
+@@ -9787,8 +10023,9 @@
    ++pcpcc;
    ppc = (char**) pcpcc;
@@ -37194 +38012 @@
  
      *t++ = 0;
-@@ -9804,10 +9939,10 @@
+@@ -9804,10 +10041,10 @@
      iptr p = 0;
      ++p;
@@ -37208 +38026 @@
    { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
      const int foo = 10;
-@@ -9837,7 +9972,7 @@
+@@ -9837,7 +10074,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
@@ -37217 +38035 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -9870,7 +10005,7 @@
+@@ -9870,7 +10107,7 @@
  fi
  
@@ -37226 +38044 @@
  else
  
-@@ -9881,7 +10016,7 @@
+@@ -9881,7 +10118,7 @@
  fi
  
@@ -37235 +38053 @@
  else
  
-@@ -9892,7 +10027,7 @@
+@@ -9892,7 +10129,7 @@
  fi
  
@@ -37244 +38062 @@
  else
  
-@@ -9903,7 +10038,7 @@
+@@ -9903,7 +10140,7 @@
  fi
  
@@ -37253 +38071 @@
  else
  
-@@ -9915,7 +10050,7 @@
+@@ -9915,7 +10152,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
@@ -37262 +38080 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -9960,7 +10095,7 @@
+@@ -9960,7 +10197,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
@@ -37271 +38089 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -9994,7 +10129,7 @@
+@@ -9994,7 +10231,7 @@
  fi
  
@@ -37280 +38098 @@
  else
  
-@@ -10005,7 +10140,7 @@
+@@ -10005,7 +10242,7 @@
  fi
  
@@ -37289 +38107 @@
  else
  
-@@ -10017,7 +10152,7 @@
+@@ -10017,7 +10254,7 @@
  
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
@@ -37298 +38116 @@
  else
    ac_cv_c_bigendian=unknown
-@@ -10235,7 +10370,7 @@
+@@ -10235,7 +10472,7 @@
  
       ;; #(
@@ -37307 +38125 @@
   esac
  
-@@ -10371,7 +10506,7 @@
+@@ -10371,7 +10608,7 @@
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
  $as_echo "OK" >&6; }
@@ -37316 +38134 @@
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
-@@ -10387,7 +10522,7 @@
+@@ -10387,7 +10624,7 @@
      as_ac_Lib=`$as_echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh`
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${libname}" >&5
@@ -37325 +38143 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -10422,8 +10557,7 @@
+@@ -10422,8 +10659,7 @@
  eval ac_res=\$$as_ac_Lib
                { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
@@ -37335 +38153 @@
  #define `$as_echo "HAVE_LIB${libname}" | $as_tr_cpp` 1
  _ACEOF
-@@ -10489,7 +10623,7 @@
+@@ -10489,7 +10725,7 @@
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
@@ -37344 +38162 @@
        Or specify the name of the library with --with-tlib." "$LINENO" 5
  fi
-@@ -10499,13 +10633,13 @@
+@@ -10499,13 +10735,13 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we talk terminfo" >&5
@@ -37360 +38178 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -10552,13 +10686,13 @@
+@@ -10552,13 +10788,13 @@
  if test "x$olibs" != "x$LIBS"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what tgetent() returns for an unknown terminal" >&5
@@ -37376 +38194 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -10853,13 +10987,13 @@
+@@ -10853,13 +11089,13 @@
  rm -f conftest_grp
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking default tty permissions/group" >&5
@@ -37392 +38210 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -10940,7 +11074,7 @@
+@@ -10940,7 +11176,7 @@
  _ACEOF
  
@@ -37401 +38219 @@
      $as_echo "#define PTYMODE 0620" >>confdefs.h
  
-@@ -10950,7 +11084,7 @@
+@@ -10950,7 +11186,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
@@ -37410 +38228 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11023,13 +11157,13 @@
+@@ -11023,13 +11259,13 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking getcwd implementation is broken" >&5
@@ -37426 +38244 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11082,8 +11216,7 @@
+@@ -11082,8 +11318,7 @@
  do :
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -37436 +38254 @@
  #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
-@@ -11093,7 +11226,7 @@
+@@ -11093,7 +11328,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
@@ -37445 +38263 @@
  else
    while :; do
-@@ -11169,7 +11302,7 @@
+@@ -11169,7 +11404,7 @@
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
@@ -37454 +38272 @@
  else
    ac_cv_sys_largefile_CC=no
-@@ -11220,7 +11353,7 @@
+@@ -11220,7 +11455,7 @@
  
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
@@ -37463 +38281 @@
  else
    while :; do
-@@ -11289,7 +11422,7 @@
+@@ -11289,7 +11524,7 @@
    if test $ac_cv_sys_file_offset_bits = unknown; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
@@ -37472 +38290 @@
  else
    while :; do
-@@ -11356,6 +11489,8 @@
+@@ -11356,6 +11591,8 @@
  esac
  rm -rf conftest*
@@ -37481 +38299 @@
  
  
-@@ -11389,13 +11524,13 @@
+@@ -11389,13 +11626,13 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat() ignores a trailing slash" >&5
@@ -37497 +38315 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11519,7 +11654,7 @@
+@@ -11519,7 +11756,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtod in -lm" >&5
@@ -37506 +38324 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -11553,7 +11688,7 @@
+@@ -11553,7 +11790,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_strtod" >&5
@@ -37515 +38333 @@
  #define HAVE_LIBM 1
  _ACEOF
-@@ -11619,7 +11754,7 @@
+@@ -11619,7 +11856,7 @@
  $as_echo "no" >&6; }
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lposix1e" >&5
@@ -37524 +38342 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -11653,12 +11788,12 @@
+@@ -11653,12 +11890,12 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix1e_acl_get_file" >&5
@@ -37539 +38357 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -11692,11 +11827,11 @@
+@@ -11692,11 +11929,11 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_get_file" >&5
@@ -37553 +38371 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -11730,7 +11865,7 @@
+@@ -11730,7 +11967,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_fgetxattr" >&5
@@ -37562 +38380 @@
  fi
  
-@@ -11772,7 +11907,7 @@
+@@ -11772,7 +12009,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get in -lsec" >&5
@@ -37571 +38389 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -11806,7 +11941,7 @@
+@@ -11806,7 +12043,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_acl_get" >&5
@@ -37580 +38398 @@
  
  else
-@@ -11902,7 +12037,7 @@
+@@ -11902,7 +12139,7 @@
  $as_echo "no" >&6; }
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpm" >&5
@@ -37589 +38407 @@
  else
    olibs="$LIBS" ; LIBS="-lgpm"
-@@ -11955,7 +12090,7 @@
+@@ -11955,7 +12192,7 @@
  $as_echo "no" >&6; }
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysmouse" >&5
@@ -37598 +38416 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12161,7 +12296,7 @@
+@@ -12161,7 +12398,7 @@
  # This bug is HP SR number 8606223364.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
@@ -37607 +38425 @@
  else
    if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
-@@ -12170,9 +12305,8 @@
+@@ -12170,9 +12407,8 @@
    if test "$ac_cv_type_int" = yes; then
       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -37619 +38437 @@
       ac_cv_sizeof_int=0
     fi
-@@ -12195,7 +12329,7 @@
+@@ -12195,7 +12431,7 @@
  # This bug is HP SR number 8606223364.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
@@ -37628 +38446 @@
  else
    if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
-@@ -12204,9 +12338,8 @@
+@@ -12204,9 +12440,8 @@
    if test "$ac_cv_type_long" = yes; then
       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -37640 +38458 @@
       ac_cv_sizeof_long=0
     fi
-@@ -12229,7 +12362,7 @@
+@@ -12229,7 +12464,7 @@
  # This bug is HP SR number 8606223364.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5
@@ -37649 +38467 @@
  else
    if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t"        "$ac_includes_default"; then :
-@@ -12238,9 +12371,8 @@
+@@ -12238,9 +12473,8 @@
    if test "$ac_cv_type_time_t" = yes; then
       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -37661 +38479 @@
       ac_cv_sizeof_time_t=0
     fi
-@@ -12263,7 +12395,7 @@
+@@ -12263,7 +12497,7 @@
  # This bug is HP SR number 8606223364.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
@@ -37670 +38488 @@
  else
    if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"; then :
-@@ -12272,9 +12404,8 @@
+@@ -12272,9 +12506,8 @@
    if test "$ac_cv_type_off_t" = yes; then
       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -37682 +38500 @@
       ac_cv_sizeof_off_t=0
     fi
-@@ -12292,6 +12423,15 @@
+@@ -12292,6 +12525,15 @@
  
  
@@ -37698 +38516 @@
  $as_echo_n "checking uint32_t is 32 bits... " >&6; }
  if test "$cross_compiling" = yes; then :
-@@ -12318,7 +12458,7 @@
+@@ -12318,7 +12560,7 @@
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
  $as_echo "ok" >&6; }
@@ -37707 +38525 @@
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
    conftest.$ac_objext conftest.beam conftest.$ac_ext
-@@ -12350,13 +12490,13 @@
+@@ -12350,13 +12592,13 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memmove handles overlaps" >&5
@@ -37723 +38541 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12387,13 +12527,13 @@
+@@ -12387,13 +12629,13 @@
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether bcopy handles overlaps" >&5
@@ -37739 +38557 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12424,13 +12564,13 @@
+@@ -12424,13 +12666,13 @@
    else
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memcpy handles overlaps" >&5
@@ -37755 +38573 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12525,7 +12665,7 @@
+@@ -12525,7 +12767,7 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _xpg4_setrunelocale in -lxpg4" >&5
@@ -37764 +38582 @@
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -12559,7 +12699,7 @@
+@@ -12559,7 +12801,7 @@
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5
@@ -37773 +38591 @@
  fi
  
-@@ -12621,7 +12761,7 @@
+@@ -12621,7 +12863,7 @@
  set dummy msgfmt; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -37782 +38600 @@
  else
    if test -n "$MSGFMT"; then
-@@ -12633,7 +12773,7 @@
+@@ -12633,7 +12875,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -37791 +38609 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
-@@ -12659,6 +12799,8 @@
+@@ -12659,6 +12901,8 @@
    if test -f po/Makefile; then
      have_gettext="no"
@@ -37800 +38618 @@
  /* end confdefs.h.  */
  #include <libintl.h>
-@@ -12672,10 +12814,9 @@
+@@ -12672,10 +12916,9 @@
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
@@ -37813 +38631 @@
  /* end confdefs.h.  */
  #include <libintl.h>
-@@ -12689,7 +12830,8 @@
+@@ -12689,7 +12932,8 @@
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
@@ -37823 +38641 @@
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() doesn't work" >&5
  $as_echo "gettext() doesn't work" >&6; };
-@@ -12712,7 +12854,7 @@
+@@ -12712,7 +12956,7 @@
              for ac_func in bind_textdomain_codeset
  do :
@@ -37832 +38650 @@
  #define HAVE_BIND_TEXTDOMAIN_CODESET 1
  _ACEOF
-@@ -12755,11 +12897,11 @@
+@@ -12755,11 +12999,11 @@
  fi
  
@@ -37846 +38664 @@
  fi
  
-@@ -12956,7 +13098,7 @@
+@@ -12956,7 +13200,7 @@
  for ac_header in setjmp.h
  do :
@@ -37855 +38673 @@
  #define HAVE_SETJMP_H 1
  _ACEOF
-@@ -13107,10 +13249,21 @@
+@@ -13107,10 +13351,21 @@
       :end' >>confcache
  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
@@ -37879 +38697 @@
      { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
  $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-@@ -13126,6 +13279,7 @@
+@@ -13126,6 +13381,7 @@
  
  ac_libobjs=
@@ -37887 +38705 @@
    # 1. Remove the extension, and $U if already installed.
    ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-@@ -13142,7 +13296,7 @@
+@@ -13142,7 +13398,7 @@
  
  
@@ -37896 +38714 @@
  ac_clean_files_save=$ac_clean_files
  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-@@ -13243,6 +13397,7 @@
+@@ -13243,6 +13499,7 @@
  IFS=" ""       $as_nl"
  
@@ -37904 +38722 @@
    *[\\/]* ) as_myself=$0 ;;
    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -13288,19 +13443,19 @@
+@@ -13288,19 +13545,19 @@
  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  
@@ -37932 +38750 @@
  } # as_fn_error
  
-@@ -13438,16 +13593,16 @@
+@@ -13438,16 +13695,16 @@
      # ... but there are two gotchas:
      # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
@@ -37953 +38771 @@
  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
  rmdir conf$$.dir 2>/dev/null
-@@ -13496,7 +13651,7 @@
+@@ -13496,7 +13753,7 @@
        test -d "$as_dir" && break
      done
@@ -37962 +38780 @@
  
  } # as_fn_mkdir_p
-@@ -13507,28 +13662,16 @@
+@@ -13507,28 +13764,16 @@
    as_mkdir_p=false
  fi
@@ -38001 +38819 @@
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -13550,7 +13693,7 @@
+@@ -13550,7 +13795,7 @@
  # values after options handling.
  ac_log="
@@ -38010 +38828 @@
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -13612,10 +13755,10 @@
+@@ -13612,10 +13857,10 @@
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
@@ -38023 +38841 @@
  gives unlimited permission to copy, distribute and modify it."
  
-@@ -13631,11 +13774,16 @@
+@@ -13631,11 +13876,16 @@
  while test $# != 0
  do
@@ -38041 +38859 @@
      ac_option=$1
      ac_optarg=$2
-@@ -13657,6 +13805,7 @@
+@@ -13657,6 +13907,7 @@
      $ac_shift
      case $ac_optarg in
@@ -38049 +38867 @@
      as_fn_append CONFIG_FILES " '$ac_optarg'"
      ac_need_defaults=false;;
-@@ -13669,7 +13818,7 @@
+@@ -13669,7 +13920,7 @@
      ac_need_defaults=false;;
    --he | --h)
@@ -38058 +38876 @@
    --help | --hel | -h )
      $as_echo "$ac_cs_usage"; exit ;;
-@@ -13678,7 +13827,7 @@
+@@ -13678,7 +13929,7 @@
      ac_cs_silent=: ;;
  
@@ -38067 +38885 @@
  
    *) as_fn_append ac_config_targets " $1"
-@@ -13698,7 +13847,7 @@
+@@ -13698,7 +13949,7 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -38076 +38894 @@
    \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
    CONFIG_SHELL='$SHELL'
-@@ -13730,7 +13879,7 @@
+@@ -13730,7 +13981,7 @@
      "auto/config.h") CONFIG_HEADERS="$CONFIG_HEADERS auto/config.h:config.h.in" ;;
      "auto/config.mk") CONFIG_FILES="$CONFIG_FILES auto/config.mk:config.mk.in" ;;
@@ -38085 +38903 @@
  done
  
-@@ -13752,9 +13901,10 @@
+@@ -13752,9 +14003,10 @@
  # after its creation but before its name has been assigned to `$tmp'.
  $debug ||
@@ -38098 +38916 @@
    trap 'as_fn_exit 1' 1 2 13 15
  }
-@@ -13762,12 +13912,13 @@
+@@ -13762,12 +14014,13 @@
  
  {
@@ -38114 +38932 @@
  # Set up the scripts for CONFIG_FILES section.
  # No need to generate them if there are no CONFIG_FILES.
-@@ -13784,12 +13935,12 @@
+@@ -13784,12 +14037,12 @@
  fi
  ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
@@ -38129 +38947 @@
  
  
-@@ -13798,18 +13949,18 @@
+@@ -13798,18 +14051,18 @@
    echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
    echo "_ACEOF"
@@ -38152 +38970 @@
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -13817,7 +13968,7 @@
+@@ -13817,7 +14070,7 @@
  rm -f conf$$subs.sh
  
@@ -38161 +38979 @@
  sed -n '
  h
-@@ -13865,7 +14016,7 @@
+@@ -13865,7 +14118,7 @@
  rm -f conf$$subs.awk
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -38170 +38988 @@
    FS = ""
  
-@@ -13897,21 +14048,29 @@
+@@ -13897,21 +14150,29 @@
    sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
  else
@@ -38209 +39027 @@
  }'
  fi
-@@ -13923,7 +14082,7 @@
+@@ -13923,7 +14184,7 @@
  # No need to generate them if there are no CONFIG_HEADERS.
  # This happens for instance with `./config.status Makefile'.
@@ -38218 +39036 @@
  _ACEOF
  
-@@ -13935,11 +14094,11 @@
+@@ -13935,11 +14196,11 @@
  # handling of long lines.
  ac_delim='%!_!# '
@@ -38233 +39051 @@
      ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
-@@ -14024,7 +14183,7 @@
+@@ -14024,7 +14285,7 @@
  _ACAWK
  _ACEOF
@@ -38242 +39060 @@
  
  
-@@ -14037,7 +14196,7 @@
+@@ -14037,7 +14298,7 @@
    esac
    case $ac_mode$ac_tag in
@@ -38251 +39069 @@
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -14056,7 +14215,7 @@
+@@ -14056,7 +14317,7 @@
      for ac_f
      do
@@ -38260 +39078 @@
          # (if the path is not absolute).  The absolute path cannot be DOS-style,
          # because $ac_f cannot contain `:'.
-@@ -14065,7 +14224,7 @@
+@@ -14065,7 +14326,7 @@
            [\\/$]*) false;;
            *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
@@ -38269 +39087 @@
        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
        as_fn_append ac_file_inputs " '$ac_f'"
-@@ -14091,8 +14250,8 @@
+@@ -14091,8 +14352,8 @@
      esac
  
@@ -38280 +39098 @@
      ;;
    esac
-@@ -14217,23 +14376,24 @@
+@@ -14217,23 +14478,24 @@
  s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
  $ac_datarootdir_hack
@@ -38315 +39133 @@
    :H)
    #
-@@ -14242,21 +14402,21 @@
+@@ -14242,21 +14504,21 @@
    if test x"$ac_file" != x-; then
      {
@@ -38345 +39163 @@
   ;;
  
-@@ -14271,7 +14431,7 @@
+@@ -14271,7 +14533,7 @@
  ac_clean_files=$ac_clean_files_save
  
@@ -38354 +39172 @@
  
  # configure is writing to config.log, and then calls config.status.
-@@ -14292,7 +14452,7 @@
+@@ -14292,7 +14554,7 @@
    exec 5>>auto/config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
@@ -38365 +39183 @@
 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-03-30 20:09:04.469387642 +0000
++++ vim74/src/blowfish.c        2014-04-27 05:20:58.115101918 +0000
 @@ -6,7 +6,7 @@
   * Do ":help credits" in Vim to see a list of people who contributed.
@@ -38493 +39311 @@
 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-03-30 20:09:04.469387642 +0000
++++ vim74/src/buffer.c  2014-04-27 05:20:58.115101918 +0000
 @@ -211,7 +211,12 @@
  
@@ -38507 +39325 @@
      /*
       * Set/reset the Changed flag first, autocmds may change the buffer.
-@@ -989,6 +994,50 @@
+@@ -671,8 +676,16 @@
+ #endif
+ #ifdef FEAT_AUTOCMD
+     aubuflocal_remove(buf);
++    if (autocmd_busy)
++    {
++       /* Do not free the buffer structure while autocommands are executing,
++        * it's still needed. Free it when autocmd_busy is reset. */
++       buf->b_next = au_pending_free_buf;
++       au_pending_free_buf = buf;
++    }
++    else
+ #endif
+-    vim_free(buf);
++       vim_free(buf);
+ }
+ 
+ /*
+@@ -989,6 +1002,50 @@
  #if defined(FEAT_LISTCMDS) || defined(FEAT_PYTHON) \
         || defined(FEAT_PYTHON3) || defined(PROTO)
@@ -38558 +39394 @@
   * Implementation of the commands for the buffer list.
   *
-@@ -1109,7 +1158,6 @@
+@@ -1109,7 +1166,6 @@
      if (unload)
      {
@@ -38566 +39402 @@
         /* When unloading or deleting a buffer that's already unloaded and
          * unlisted: fail silently. */
-@@ -1150,30 +1198,7 @@
+@@ -1150,30 +1206,7 @@
             if (bp->b_p_bl && bp != buf)
                 break;
@@ -38598 +39434 @@
  #ifdef FEAT_WINDOWS
         /*
-@@ -1186,7 +1211,10 @@
+@@ -1186,7 +1219,10 @@
                    && !(curwin->w_closing || curwin->w_buffer->b_closing)
  # endif
@@ -38610 +39446 @@
  
         /*
-@@ -1204,7 +1232,8 @@
+@@ -1204,7 +1240,8 @@
  
         /*
@@ -38620 +39456 @@
          * Then prefer the buffer we most recently visited.
          * Else try to find one that is loaded, after the current buffer,
-@@ -1303,6 +1332,13 @@
+@@ -1303,6 +1340,13 @@
         }
      }
@@ -38634 +39470 @@
       * make buf current buffer
       */
-@@ -1396,10 +1432,8 @@
+@@ -1396,10 +1440,8 @@
         curwin->w_alt_fnum = curbuf->b_fnum; /* remember alternate file */
      buflist_altfpos(curwin);                    /* remember curpos */
@@ -38645 +39481 @@
      /* close_windows() or apply_autocmds() may change curbuf */
      prevbuf = curbuf;
-@@ -1941,6 +1975,10 @@
+@@ -1647,7 +1689,11 @@
+            buf->b_p_bl = TRUE;
+ #ifdef FEAT_AUTOCMD
+            if (!(flags & BLN_DUMMY))
++           {
+                apply_autocmds(EVENT_BUFADD, NULL, NULL, FALSE, buf);
++               if (!buf_valid(buf))
++                   return NULL;
++           }
+ #endif
+        }
+        return buf;
+@@ -1823,8 +1869,14 @@
+     if (!(flags & BLN_DUMMY))
+     {
+        apply_autocmds(EVENT_BUFNEW, NULL, NULL, FALSE, buf);
++       if (!buf_valid(buf))
++           return NULL;
+        if (flags & BLN_LISTED)
++       {
+            apply_autocmds(EVENT_BUFADD, NULL, NULL, FALSE, buf);
++           if (!buf_valid(buf))
++               return NULL;
++       }
+ # ifdef FEAT_EVAL
+        if (aborting())         /* autocmds may abort script processing */
+            return NULL;
+@@ -1941,6 +1993,10 @@
      clear_string_option(&buf->b_p_qe);
  #endif
@@ -38656 +39519 @@
  
  /*
-@@ -4059,7 +4097,8 @@
+@@ -4059,7 +4115,8 @@
                 item[curitem].minwid = -syn_namen2id(t, (int)(s - t));
                 curitem++;
@@ -38668 +39531 @@
 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-03-30 20:09:04.472721085 +0000
++++ vim74/src/charset.c 2014-04-27 05:20:58.118435333 +0000
 @@ -1380,10 +1380,7 @@
                 && (State & NORMAL)
@@ -38699 +39562 @@
 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-03-30 20:09:04.472721085 +0000
++++ vim74/src/config.h.in       2014-04-27 05:20:58.118435333 +0000
 @@ -37,10 +37,10 @@
  #undef UNIX
@@ -38713 +39576 @@
  /* Defined to the size of off_t */
  #undef SIZEOF_OFF_T
-@@ -442,3 +442,6 @@
+@@ -191,6 +191,7 @@
+ #undef HAVE_SIGSETJMP
+ #undef HAVE_SIGSTACK
+ #undef HAVE_SIGVEC
++#undef HAVE_SMACK
+ #undef HAVE_STRCASECMP
+ #undef HAVE_STRERROR
+ #undef HAVE_STRFTIME
+@@ -442,3 +443,6 @@
  
  /* Define if you want Cygwin to use the WIN32 clipboard, not compatible with X11*/
@@ -38722 +39593 @@
 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-03-30 20:09:04.476054528 +0000
++++ vim74/src/configure.in      2014-04-27 05:20:58.121768749 +0000
 @@ -14,6 +14,7 @@
  AC_PROG_CC     dnl required by almost everything
@@ -38731 +39602 @@
  AC_PROG_AWK    dnl required for "make html" in ../doc
  
+@@ -45,10 +46,10 @@
+ fi
+ if test "$GCC" = yes; then
+   dnl method that should work for nearly all versions
+-  gccversion=`"$CC" -dumpversion`
++  gccversion=`$CC -dumpversion`
+   if test "x$gccversion" = "x"; then
+     dnl old method; fall-back for when -dumpversion doesn't work
+-    gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'`
++    gccversion=`$CC --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'`
+   fi
+   dnl version 4.0.1 was reported to cause trouble on Macintosh by Marcin Dalecki
+   if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
 @@ -62,6 +63,29 @@
    fi
@@ -38740 +39624 @@
 +dnl Note that this does not work to get the version of clang 3.1 or 3.2.
 +AC_MSG_CHECKING(for recent clang version)
-+CLANG_VERSION_STRING=`"$CC" --version 2>/dev/null | sed  -n -e 's/^.*clang.*\([[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\).*$/\1/p'`
++CLANG_VERSION_STRING=`$CC --version 2>/dev/null | sed  -n -e 's/^.*clang.*\([[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\).*$/\1/p'`
 +if test x"$CLANG_VERSION_STRING" != x"" ; then
 +  CLANG_MAJOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*/\1/p'`
@@ -38793 +39677 @@
      rm -f conftest.c conftest.o
    fi
-@@ -468,7 +497,7 @@
+@@ -358,18 +387,48 @@
+ AC_SUBST(QUOTESED)
+ 
+ 
+-dnl Link with -lselinux for SELinux stuff; if not found
+-AC_MSG_CHECKING(--disable-selinux argument)
+-AC_ARG_ENABLE(selinux,
+-       [  --disable-selinux      Don't check for SELinux support.],
+-       , enable_selinux="yes")
+-if test "$enable_selinux" = "yes"; then
++dnl Link with -lsmack for Smack stuff; if not found
++AC_MSG_CHECKING(--disable-smack argument)
++AC_ARG_ENABLE(smack,
++       [  --disable-smack        Do not check for Smack support.],
++       , enable_smack="yes")
++if test "$enable_smack" = "yes"; then
+   AC_MSG_RESULT(no)
+-  AC_CHECK_LIB(selinux, is_selinux_enabled,
+-         [LIBS="$LIBS -lselinux"
+-          AC_DEFINE(HAVE_SELINUX)])
++  AC_CHECK_HEADER([linux/xattr.h], true, enable_smack="no")
+ else
+-   AC_MSG_RESULT(yes)
++  AC_MSG_RESULT(yes)
++fi
++if test "$enable_smack" = "yes"; then
++  AC_CHECK_HEADER([attr/xattr.h], true, enable_smack="no")
++fi
++if test "$enable_smack" = "yes"; then
++  AC_MSG_CHECKING(for XATTR_NAME_SMACKEXEC in linux/xattr.h)
++  AC_EGREP_CPP(XATTR_NAME_SMACKEXEC, [#include <linux/xattr.h>],
++              AC_MSG_RESULT(yes),
++              AC_MSG_RESULT(no); enable_smack="no")
++fi
++if test "$enable_smack" = "yes"; then
++  AC_CHECK_LIB(attr, setxattr,
++         [LIBS="$LIBS -lattr"
++          found_smack="yes"
++          AC_DEFINE(HAVE_SMACK)])
++fi
++
++dnl When smack was found don't search for SELinux
++if test "x$found_smack" = "x"; then
++  dnl Link with -lselinux for SELinux stuff; if not found
++  AC_MSG_CHECKING(--disable-selinux argument)
++  AC_ARG_ENABLE(selinux,
++         [  --disable-selinux    Do not check for SELinux support.],
++         , enable_selinux="yes")
++  if test "$enable_selinux" = "yes"; then
++    AC_MSG_RESULT(no)
++    AC_CHECK_LIB(selinux, is_selinux_enabled,
++           [LIBS="$LIBS -lselinux"
++            AC_DEFINE(HAVE_SELINUX)])
++  else
++     AC_MSG_RESULT(yes)
++  fi
+ fi
+ 
+ dnl Check user requested features.
+@@ -468,7 +527,7 @@
        if test "X$vi_cv_path_luajit" != "X"; then
         dnl -- find LuaJIT version
@@ -38802 +39745 @@
         [ vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'` ])
         vi_cv_path_lua="$vi_cv_path_luajit"
-@@ -774,9 +803,19 @@
+@@ -774,9 +833,19 @@
      AC_MSG_CHECKING(for mzscheme_base.c)
      if test -f "${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
@@ -38822 +39765 @@
      fi
      if test "X$MZSCHEME_EXTRA" != "X" ; then
-@@ -898,7 +937,7 @@
+@@ -898,7 +967,7 @@
           PERL_CFLAGS=`echo "$perlcppflags" | sed -e 's/-pipe //' -e 's/-W[[^ ]]*//'`
         fi
@@ -38831 +39774 @@
           fi
         fi
-@@ -1359,7 +1398,7 @@
+@@ -1359,7 +1428,7 @@
    ldflags_save=$LDFLAGS
    dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
@@ -38840 +39783 @@
      /* If this program fails, then RTLD_GLOBAL is needed.
       * RTLD_GLOBAL will be used and then it is not possible to
-@@ -1392,7 +1431,7 @@
+@@ -1392,7 +1461,7 @@
        if (no_rtl_global_needed_for("${python_INSTSONAME}", "${vi_cv_path_python_pfx}"))
              not_needed = 1;
@@ -38849 +39792 @@
  
    CFLAGS=$cflags_save
-@@ -1404,7 +1443,7 @@
+@@ -1404,7 +1473,7 @@
    ldflags_save=$LDFLAGS
    dnl -ldl must go first to make this work on Archlinux (Roland Puntaier)
@@ -38858 +39801 @@
      #include <wchar.h>
      /* If this program fails, then RTLD_GLOBAL is needed.
-@@ -1438,7 +1477,7 @@
+@@ -1438,7 +1507,7 @@
        if (no_rtl_global_needed_for("${python3_INSTSONAME}", L"${vi_cv_path_python3_pfx}"))
              not_needed = 1;
@@ -38867 +39810 @@
  
    CFLAGS=$cflags_save
-@@ -1654,9 +1693,9 @@
+@@ -1654,9 +1723,9 @@
        if test "X$rubyhdrdir" != "X"; then
         AC_MSG_RESULT($rubyhdrdir)
@@ -38880 +39823 @@
          rubyversion=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['ruby_version']].gsub(/\./, '')[[0,2]]"`
         if test "X$rubyversion" = "X"; then
-@@ -1689,7 +1728,7 @@
+@@ -1689,7 +1758,7 @@
           dnl configure, so strip these flags first (if present)
           rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
@@ -38889 +39832 @@
             fi
           fi
-@@ -2699,7 +2738,7 @@
+@@ -2574,7 +2643,7 @@
+     AC_MSG_CHECKING(for XIMText in X11/Xlib.h)
+     AC_EGREP_CPP(XIMText, [#include <X11/Xlib.h>],
+                  AC_MSG_RESULT(yes),
+-                 AC_MSG_RESULT(no; xim has been disabled); enable_xim = "no")
++                 AC_MSG_RESULT(no; xim has been disabled); enable_xim="no")
+   fi
+   CPPFLAGS=$cppflags_save
+ 
+@@ -2699,7 +2768,7 @@
  
  AC_CACHE_CHECK([whether toupper is broken], [vim_cv_toupper_broken],
@@ -38898 +39850 @@
  #include <ctype.h>
  #if STDC_HEADERS
-@@ -2707,7 +2746,7 @@
+@@ -2707,7 +2776,7 @@
  # include <stddef.h>
  #endif
@@ -38907 +39859 @@
    ],[
      vim_cv_toupper_broken=no
-@@ -2955,7 +2994,7 @@
+@@ -2955,7 +3024,7 @@
  
  AC_CACHE_CHECK([whether we talk terminfo], [vim_cv_terminfo],
@@ -38916 +39868 @@
  #ifdef HAVE_TERMCAP_H
  # include <termcap.h>
-@@ -2969,7 +3008,7 @@
+@@ -2969,7 +3038,7 @@
  #endif
  main()
@@ -38925 +39877 @@
      ],[
        vim_cv_terminfo=yes
-@@ -2985,7 +3024,7 @@
+@@ -2985,7 +3054,7 @@
  if test "x$olibs" != "x$LIBS"; then
    AC_CACHE_CHECK([what tgetent() returns for an unknown terminal], [vim_cv_tgent],
@@ -38934 +39886 @@
  #ifdef HAVE_TERMCAP_H
  # include <termcap.h>
-@@ -2996,7 +3035,7 @@
+@@ -2996,7 +3065,7 @@
  #endif
  main()
@@ -38943 +39895 @@
        ],[
         vim_cv_tgent=non-zero
-@@ -3120,7 +3159,7 @@
+@@ -3120,7 +3189,7 @@
  rm -f conftest_grp
  AC_CACHE_CHECK([default tty permissions/group], [vim_cv_tty_group],
@@ -38952 +39904 @@
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -3156,7 +3195,7 @@
+@@ -3156,7 +3225,7 @@
    fclose(fp);
    exit(0);
@@ -38961 +39913 @@
         vim_cv_tty_group=`cat conftest_grp`
         if test "x$vim_cv_tty_mode" = "x" ; then
-@@ -3214,7 +3253,7 @@
+@@ -3214,7 +3283,7 @@
  dnl system("sh -c pwd")
  AC_CACHE_CHECK([getcwd implementation is broken], [vim_cv_getcwd_broken],
@@ -38970 +39922 @@
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
-@@ -3227,7 +3266,7 @@
+@@ -3227,7 +3296,7 @@
    environ = dagger;
    return getcwd(buffer, 500) ? 0 : 1;
@@ -38979 +39931 @@
      ],[
        vim_cv_getcwd_broken=yes
-@@ -3270,7 +3309,7 @@
+@@ -3270,7 +3339,7 @@
  
  AC_CACHE_CHECK([whether stat() ignores a trailing slash], [vim_cv_stat_ignores_slash],
@@ -38988 +39940 @@
  #if STDC_HEADERS
  # include <stdlib.h>
-@@ -3279,7 +3318,7 @@
+@@ -3279,7 +3348,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -38997 +39949 @@
      ],[
        vim_cv_stat_ignores_slash=no
-@@ -3543,6 +3582,10 @@
+@@ -3543,6 +3612,10 @@
  AC_CHECK_SIZEOF([time_t])
  AC_CHECK_SIZEOF([off_t])
@@ -39008 +39960 @@
  AC_MSG_CHECKING([uint32_t is 32 bits])
  AC_TRY_RUN([
-@@ -3589,7 +3632,7 @@
+@@ -3589,7 +3662,7 @@
  
  AC_CACHE_CHECK([whether memmove handles overlaps],[vim_cv_memmove_handles_overlap],
@@ -39017 +39969 @@
         vim_cv_memmove_handles_overlap=yes
        ],[
-@@ -3604,7 +3647,7 @@
+@@ -3604,7 +3677,7 @@
  else
    AC_CACHE_CHECK([whether bcopy handles overlaps],[vim_cv_bcopy_handles_overlap],
@@ -39026 +39978 @@
         vim_cv_bcopy_handles_overlap=yes
        ],[
-@@ -3619,7 +3662,7 @@
+@@ -3619,7 +3692,7 @@
    else
      AC_CACHE_CHECK([whether memcpy handles overlaps],[vim_cv_memcpy_handles_overlap],
@@ -39035 +39987 @@
             vim_cv_memcpy_handles_overlap=yes
           ],[
-@@ -3697,6 +3740,9 @@
+@@ -3697,6 +3770,9 @@
  fi
  
@@ -39045 +39997 @@
  AC_ARG_ENABLE(nls,
         [  --disable-nls           Don't support NLS (gettext()).], ,
-@@ -3715,16 +3761,18 @@
+@@ -3715,16 +3791,18 @@
    if test -f po/Makefile; then
      have_gettext="no"
@@ -39070 +40022 @@
 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-03-30 20:09:04.476054528 +0000
++++ vim74/src/diff.c    2014-04-27 05:20:58.121768749 +0000
 @@ -1203,7 +1203,7 @@
  
@@ -39082 +40034 @@
 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-03-30 20:09:04.479387971 +0000
++++ vim74/src/dosinst.c 2014-04-27 05:20:58.125102165 +0000
 @@ -1192,23 +1192,29 @@
         fprintf(fd, "  if arg3 =~ ' ' | let arg3 = '\"' . arg3 . '\"' | endif\n");
@@ -39135 +40087 @@
 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-03-30 20:09:04.486054857 +0000
++++ vim74/src/edit.c    2014-04-27 05:20:58.128435582 +0000
 @@ -199,7 +199,7 @@
  static void spell_back_to_badword __ARGS((void));
@@ -39609 +40561 @@
 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-03-30 20:09:04.496055186 +0000
++++ vim74/src/eval.c    2014-04-27 05:20:58.138435829 +0000
 @@ -125,9 +125,6 @@
   */
@@ -39632 +40584 @@
  /*
   * Structure to hold info for a user function.
-@@ -356,6 +358,7 @@
+@@ -356,8 +358,10 @@
      {VV_NAME("mouse_col",       VAR_NUMBER), 0},
      {VV_NAME("operator",        VAR_STRING), VV_RO},
@@ -39639 +40591 @@
      {VV_NAME("oldfiles",        VAR_LIST), 0},
      {VV_NAME("windowid",        VAR_NUMBER), VV_RO},
++    {VV_NAME("progpath",        VAR_STRING), VV_RO},
  };
-@@ -389,7 +392,7 @@
+ 
+ /* shorthand */
+@@ -389,7 +393,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));
@@ -39649 +40604 @@
  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 +447,7 @@
+@@ -444,7 +448,7 @@
  #endif
  static int get_env_tv __ARGS((char_u **arg, typval_T *rettv, int evaluate));
@@ -39658 +40613 @@
  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));
-@@ -474,7 +477,9 @@
+@@ -474,7 +478,9 @@
  static void f_bufnr __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_bufwinnr __ARGS((typval_T *argvars, typval_T *rettv));
@@ -39668 +40623 @@
  #ifdef FEAT_FLOAT
  static void f_ceil __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -739,6 +744,7 @@
+@@ -508,6 +514,7 @@
+ static void f_eval __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_eventhandler __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_executable __ARGS((typval_T *argvars, typval_T *rettv));
++static void f_exepath __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_exists __ARGS((typval_T *argvars, typval_T *rettv));
+ #ifdef FEAT_FLOAT
+ static void f_exp __ARGS((typval_T *argvars, typval_T *rettv));
+@@ -719,6 +726,7 @@
+ static void f_synstack __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_synconcealed __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_system __ARGS((typval_T *argvars, typval_T *rettv));
++static void f_systemlist __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_tabpagebuflist __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_tabpagenr __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_tabpagewinnr __ARGS((typval_T *argvars, typval_T *rettv));
+@@ -739,6 +747,7 @@
  static void f_type __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_undofile __ARGS((typval_T *argvars, typval_T *rettv));
@@ -39676 +40647 @@
  static void f_virtcol __ARGS((typval_T *argvars, typval_T *rettv));
  static void f_visualmode __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -767,7 +773,7 @@
+@@ -767,7 +776,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));
@@ -39685 +40656 @@
  static typval_T *alloc_tv __ARGS((void));
  static typval_T *alloc_string_tv __ARGS((char_u *string));
-@@ -778,8 +784,8 @@
+@@ -778,8 +787,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));
@@ -39696 +40667 @@
  static void vars_clear_ext __ARGS((hashtab_T *ht, int free_val));
  static void delete_var __ARGS((hashtab_T *ht, hashitem_T *hi));
-@@ -869,6 +875,7 @@
+@@ -799,7 +808,7 @@
+ static void list_func_head __ARGS((ufunc_T *fp, int indent));
+ static ufunc_T *find_func __ARGS((char_u *name));
+ static int function_exists __ARGS((char_u *name));
+-static int builtin_function __ARGS((char_u *name));
++static int builtin_function __ARGS((char_u *name, int len));
+ #ifdef FEAT_PROFILE
+ 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 +837,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));
+ static void setwinvar __ARGS((typval_T *argvars, typval_T *rettv, int off));
++static int write_list __ARGS((FILE *fd, list_T *list, int binary));
++static void get_cmd_output_as_rettv __ARGS((typval_T *argvars, typval_T *rettv, int retlist));
+ 
+ 
+ #ifdef EBCDIC
+@@ -869,6 +880,7 @@
             hash_add(&compat_hashtab, p->vv_di.di_key);
      }
@@ -39704 +40693 @@
  
  #ifdef EBCDIC
-@@ -915,12 +922,13 @@
+@@ -915,12 +927,13 @@
      /* autoloaded script names */
      ga_clear_strings(&ga_loaded);
@@ -39721 +40710 @@
  
      /* unreferenced lists and dicts */
-@@ -1054,7 +1062,7 @@
+@@ -1054,7 +1067,7 @@
      ga_init2(&redir_ga, (int)sizeof(char), 500);
  
@@ -39730 +40719 @@
      if (redir_endp == NULL || redir_lval->ll_name == NULL || *redir_endp != NUL)
      {
-@@ -1145,7 +1153,7 @@
+@@ -1145,7 +1158,7 @@
             /* Call get_lval() again, if it's inside a Dict or List it may
              * have changed. */
@@ -39739 +40728 @@
                 set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
             clear_lval(redir_lval);
-@@ -1848,8 +1856,9 @@
+@@ -1848,8 +1861,9 @@
         return;
      if (argend > arg && argend[-1] == '.')  /* for var.='str' */
@@ -39751 +40740 @@
         /*
          * ":let" without "=": list variables
-@@ -1878,12 +1887,14 @@
+@@ -1878,12 +1892,14 @@
      {
         op[0] = '=';
@@ -39770 +40759 @@
         if (eap->skip)
             ++emsg_skip;
-@@ -2234,7 +2245,7 @@
+@@ -2234,7 +2250,7 @@
             {
                 if (tofree != NULL)
@@ -39779 +40768 @@
                 else
                 {
-@@ -2469,7 +2480,7 @@
+@@ -2445,7 +2461,7 @@
+            p = get_tv_string_chk(tv);
+            if (p != NULL && op != NULL && *op == '.')
+            {
+-               s = get_reg_contents(*arg == '@' ? '"' : *arg, TRUE, TRUE);
++               s = get_reg_contents(*arg == '@' ? '"' : *arg, GREG_EXPR_SRC);
+                if (s != NULL)
+                {
+                    p = ptofree = concat_str(s, p);
+@@ -2469,7 +2485,7 @@
      {
         lval_T  lv;
@@ -39788 +40786 @@
         {
             if (endchars != NULL && vim_strchr(endchars, *skipwhite(p)) == NULL)
-@@ -2514,18 +2525,22 @@
+@@ -2514,18 +2530,22 @@
   * "unlet" is TRUE for ":unlet": slightly different behavior when something is
   * wrong; must end in space or cmd separator.
@@ -39813 +40811 @@
  {
      char_u     *p;
-@@ -2539,6 +2554,7 @@
+@@ -2539,6 +2559,7 @@
      char_u     *key = NULL;
      int                len;
@@ -39821 +40819 @@
      /* Clear everything in "lp". */
      vim_memset(lp, 0, sizeof(lval_T));
-@@ -2586,7 +2602,7 @@
+@@ -2586,7 +2607,7 @@
  
      cc = *p;
@@ -39830 +40828 @@
         EMSG2(_(e_undefvar), lp->ll_name);
      *p = cc;
-@@ -2899,7 +2915,7 @@
+@@ -2899,7 +2920,7 @@
  
                 /* handle +=, -= and .= */
@@ -39839 +40837 @@
                     if (tv_op(&tv, rettv, op) == OK)
                         set_var(lp->ll_name, &tv, FALSE);
-@@ -3420,7 +3436,7 @@
+@@ -3420,7 +3441,7 @@
  
      /* If it is the name of a variable of type VAR_FUNC use its contents. */
@@ -39848 +40846 @@
      /* Skip white space to allow ":call func ()".  Not good, but required for
       * backward compatibility. */
-@@ -3551,7 +3567,7 @@
+@@ -3551,7 +3572,7 @@
      do
      {
@@ -39857 +40855 @@
         if (lv.ll_name == NULL)
             error = TRUE;           /* error but continue parsing */
-@@ -3704,7 +3720,7 @@
+@@ -3704,7 +3725,7 @@
             ret = FAIL;
         else
@@ -39866 +40864 @@
                 ret = FAIL;
             else
-@@ -5147,7 +5163,7 @@
+@@ -5103,7 +5124,8 @@
+                if (evaluate)
+                {
+                    rettv->v_type = VAR_STRING;
+-                   rettv->vval.v_string = get_reg_contents(**arg, TRUE, TRUE);
++                   rettv->vval.v_string = get_reg_contents(**arg,
++                                                           GREG_EXPR_SRC);
+                }
+                if (**arg != NUL)
+                    ++*arg;
+@@ -5147,7 +5169,7 @@
             {
                 /* If "s" is the name of a variable of type VAR_FUNC
@@ -39875 +40883 @@
                 /* Invoke the function. */
                 ret = get_func_tv(s, len, rettv, arg,
-@@ -5174,7 +5190,7 @@
+@@ -5174,7 +5196,7 @@
                 }
             }
@@ -39884 +40892 @@
                 ret = OK;
         }
-@@ -6413,6 +6429,16 @@
+@@ -6413,6 +6435,16 @@
      if (ni == NULL)
         return FAIL;
@@ -39901 +40909 @@
         /* Append new item at end of list. */
         list_append(l, ni);
-@@ -6434,7 +6460,6 @@
+@@ -6434,7 +6466,6 @@
         item->li_prev = ni;
         ++l->lv_len;
@@ -39909 +40917 @@
  
  /*
-@@ -7860,6 +7885,7 @@
+@@ -7860,6 +7891,7 @@
      {"bufwinnr",       1, 1, f_bufwinnr},
      {"byte2line",      1, 1, f_byte2line},
@@ -39917 +40925 @@
  #ifdef FEAT_FLOAT
      {"ceil",           1, 1, f_ceil},
-@@ -7992,7 +8018,7 @@
+@@ -7893,6 +7925,7 @@
+     {"eval",           1, 1, f_eval},
+     {"eventhandler",   0, 0, f_eventhandler},
+     {"executable",     1, 1, f_executable},
++    {"exepath",                1, 1, f_exepath},
+     {"exists",         1, 1, f_exists},
+ #ifdef FEAT_FLOAT
+     {"exp",            1, 1, f_exp},
+@@ -7941,7 +7974,7 @@
+     {"getpid",         0, 0, f_getpid},
+     {"getpos",         1, 1, f_getpos},
+     {"getqflist",      0, 0, f_getqflist},
+-    {"getreg",         0, 2, f_getreg},
++    {"getreg",         0, 3, f_getreg},
+     {"getregtype",     0, 1, f_getregtype},
+     {"gettabvar",      2, 3, f_gettabvar},
+     {"gettabwinvar",   3, 4, f_gettabwinvar},
+@@ -7992,7 +8025,7 @@
      {"log10",          1, 1, f_log10},
  #endif
@@ -39926 +40951 @@
      {"map",            2, 2, f_map},
      {"maparg",         1, 4, f_maparg},
-@@ -8128,6 +8154,7 @@
+@@ -8100,7 +8133,7 @@
+     {"strridx",                2, 3, f_strridx},
+     {"strtrans",       1, 1, f_strtrans},
+     {"strwidth",       1, 1, f_strwidth},
+-    {"submatch",       1, 1, f_submatch},
++    {"submatch",       1, 2, f_submatch},
+     {"substitute",     4, 4, f_substitute},
+     {"synID",          3, 3, f_synID},
+     {"synIDattr",      2, 3, f_synIDattr},
+@@ -8108,6 +8141,7 @@
+     {"synconcealed",   2, 2, f_synconcealed},
+     {"synstack",       2, 2, f_synstack},
+     {"system",         1, 2, f_system},
++    {"systemlist",     1, 2, f_systemlist},
+     {"tabpagebuflist", 0, 1, f_tabpagebuflist},
+     {"tabpagenr",      0, 1, f_tabpagenr},
+     {"tabpagewinnr",   1, 2, f_tabpagewinnr},
+@@ -8128,6 +8162,7 @@
      {"type",           1, 1, f_type},
      {"undofile",       1, 1, f_undofile},
@@ -39934 +40976 @@
      {"virtcol",                1, 1, f_virtcol},
      {"visualmode",     0, 1, f_visualmode},
-@@ -8269,16 +8296,17 @@
+@@ -8269,16 +8304,17 @@
   * name it contains, otherwise return "name".
   */
@@ -39954 +40996 @@
      if (v != NULL && v->di_tv.v_type == VAR_FUNC)
      {
-@@ -9176,13 +9204,11 @@
+@@ -8449,33 +8485,39 @@
+     /* execute the function if no errors detected and executing */
+     if (evaluate && error == ERROR_NONE)
+     {
++       char_u *rfname = fname;
++
++       /* Ignore "g:" before a function name. */
++       if (fname[0] == 'g' && fname[1] == ':')
++           rfname = fname + 2;
++
+        rettv->v_type = VAR_NUMBER;     /* default rettv is number zero */
+        rettv->vval.v_number = 0;
+        error = ERROR_UNKNOWN;
+ 
+-       if (!builtin_function(fname))
++       if (!builtin_function(rfname, -1))
+        {
+            /*
+             * User defined function.
+             */
+-           fp = find_func(fname);
++           fp = find_func(rfname);
+ 
+ #ifdef FEAT_AUTOCMD
+            /* Trigger FuncUndefined event, may load the function. */
+            if (fp == NULL
+                    && apply_autocmds(EVENT_FUNCUNDEFINED,
+-                                                    fname, fname, TRUE, NULL)
++                                                    rfname, rfname, TRUE, NULL)
+                    && !aborting())
+            {
+                /* executed an autocommand, search for the function again */
+-               fp = find_func(fname);
++               fp = find_func(rfname);
+            }
+ #endif
+            /* Try loading a package. */
+-           if (fp == NULL && script_autoload(fname, TRUE) && !aborting())
++           if (fp == NULL && script_autoload(rfname, TRUE) && !aborting())
+            {
+                /* loaded a package, search for the function again */
+-               fp = find_func(fname);
++               fp = find_func(rfname);
+            }
+ 
+            if (fp != NULL)
+@@ -9176,13 +9218,11 @@
  #endif
  }
@@ -39970 +41058 @@
  #ifdef FEAT_MBYTE
      char_u     *t;
-@@ -9202,7 +9228,10 @@
+@@ -9202,7 +9242,10 @@
      {
         if (*t == NUL)          /* EOL reached */
@@ -39982 +41070 @@
      rettv->vval.v_number = (varnumber_T)(t - str);
  #else
-@@ -9211,6 +9240,28 @@
+@@ -9211,6 +9254,28 @@
  #endif
  }
@@ -40011 +41099 @@
  func_call(name, args, selfdict, rettv)
      char_u     *name;
-@@ -10010,8 +10061,6 @@
+@@ -9994,7 +10059,22 @@
+     typval_T   *argvars;
+     typval_T   *rettv;
+ {
+-    rettv->vval.v_number = mch_can_exe(get_tv_string(&argvars[0]));
++    rettv->vval.v_number = mch_can_exe(get_tv_string(&argvars[0]), NULL);
++}
++
++/*
++ * "exepath()" function
++ */
++    static void
++f_exepath(argvars, rettv)
++    typval_T   *argvars;
++    typval_T   *rettv;
++{
++    char_u *p = NULL;
++
++    (void)mch_can_exe(get_tv_string(&argvars[0]), &p);
++    rettv->v_type = VAR_STRING;
++    rettv->vval.v_string = p;
+ }
+ 
+ /*
+@@ -10010,8 +10090,6 @@
      int                n = FALSE;
      int                len = 0;
@@ -40020 +41132 @@
      if (*p == '$')                     /* environment variable */
      {
-@@ -10062,7 +10111,7 @@
+@@ -10062,7 +10140,7 @@
         {
             if (tofree != NULL)
@@ -40029 +41141 @@
             {
                 /* handle d.key, l[idx], f(expr) */
-@@ -10078,8 +10127,6 @@
+@@ -10078,8 +10156,6 @@
      }
  
@@ -40038 +41150 @@
  
  #ifdef FEAT_FLOAT
-@@ -11090,6 +11137,8 @@
+@@ -11090,6 +11166,8 @@
  {
      char_u     *p;
@@ -40047 +41159 @@
         return;
  
-@@ -11102,8 +11151,6 @@
+@@ -11102,8 +11180,6 @@
             p = ml_get_buf(buf, start, FALSE);
         else
@@ -40056 +41168 @@
      }
      else
-@@ -11791,12 +11838,10 @@
+@@ -11734,6 +11810,7 @@
+     char_u     *strregname;
+     int                regname;
+     int                arg2 = FALSE;
++    int                return_list = FALSE;
+     int                error = FALSE;
+ 
+     if (argvars[0].v_type != VAR_UNKNOWN)
+@@ -11741,17 +11818,34 @@
+        strregname = get_tv_string_chk(&argvars[0]);
+        error = strregname == NULL;
+        if (argvars[1].v_type != VAR_UNKNOWN)
++       {
+            arg2 = get_tv_number_chk(&argvars[1], &error);
++           if (!error && argvars[2].v_type != VAR_UNKNOWN)
++               return_list = get_tv_number_chk(&argvars[2], &error);
++       }
+     }
+     else
+        strregname = vimvars[VV_REG].vv_str;
++
++    if (error)
++       return;
++
+     regname = (strregname == NULL ? '"' : *strregname);
+     if (regname == 0)
+        regname = '"';
+ 
+-    rettv->v_type = VAR_STRING;
+-    rettv->vval.v_string = error ? NULL :
+-                                   get_reg_contents(regname, TRUE, arg2);
++    if (return_list)
++    {
++       rettv->v_type = VAR_LIST;
++       rettv->vval.v_list = (list_T *)get_reg_contents(regname,
++                                     (arg2 ? GREG_EXPR_SRC : 0) | GREG_LIST);
++    }
++    else
++    {
++       rettv->v_type = VAR_STRING;
++       rettv->vval.v_string = get_reg_contents(regname,
++                                                   arg2 ? GREG_EXPR_SRC : 0);
++    }
+ }
+ 
+ /*
+@@ -11791,12 +11885,10 @@
      {
         case MLINE: buf[0] = 'V'; break;
@@ -40069 +41227 @@
      rettv->v_type = VAR_STRING;
      rettv->vval.v_string = vim_strsave(buf);
-@@ -12135,6 +12180,9 @@
+@@ -12135,6 +12227,9 @@
  #ifndef CASE_INSENSITIVE_FILENAME
         "fname_case",
@@ -40079 +41237 @@
         "arabic",
  #endif
-@@ -12507,9 +12555,7 @@
+@@ -12507,9 +12602,7 @@
  #ifdef FEAT_VIRTUALEDIT
         "virtualedit",
@@ -40089 +41247 @@
         "visualextra",
  #endif
-@@ -12538,7 +12584,12 @@
+@@ -12538,7 +12631,12 @@
         "xfontset",
  #endif
@@ -40103 +41261 @@
  #ifdef USE_XSMP
         "xsmp",
-@@ -13045,9 +13096,18 @@
+@@ -12569,7 +12667,26 @@
+     if (n == FALSE)
+     {
+        if (STRNICMP(name, "patch", 5) == 0)
+-           n = has_patch(atoi((char *)name + 5));
++       {
++           if (name[5] == '-'
++                   && STRLEN(name) > 11
++                   && vim_isdigit(name[6])
++                   && vim_isdigit(name[8])
++                   && vim_isdigit(name[10]))
++           {
++               int major = atoi((char *)name + 6);
++               int minor = atoi((char *)name + 8);
++
++               /* Expect "patch-9.9.01234". */
++               n = (major < VIM_VERSION_MAJOR
++                    || (major == VIM_VERSION_MAJOR
++                        && (minor < VIM_VERSION_MINOR
++                            || (minor == VIM_VERSION_MINOR
++                                && has_patch(atoi((char *)name + 10))))));
++           }
++           else
++               n = has_patch(atoi((char *)name + 5));
++       }
+        else if (STRICMP(name, "vim_starting") == 0)
+            n = (starting != 0);
+ #ifdef FEAT_MBYTE
+@@ -13045,9 +13162,18 @@
         }
  
@@ -40122 +41308 @@
                 && argvars[1].v_type != VAR_UNKNOWN
                 && argvars[2].v_type != VAR_UNKNOWN)
-@@ -13298,8 +13358,8 @@
+@@ -13298,8 +13424,8 @@
      dictitem_T *di;
  
@@ -40133 +41319 @@
      {
         if (*end != NUL)
-@@ -13312,7 +13372,7 @@
+@@ -13312,7 +13438,7 @@
                     rettv->vval.v_number = 1;       /* always locked */
                 else
@@ -40142 +41328 @@
                     {
                         /* Consider a variable locked when:
-@@ -13846,6 +13906,7 @@
+@@ -13846,6 +13972,7 @@
      int                type;
  {
@@ -40150 +41336 @@
      char_u     *pat;
      regmatch_T regmatch;
-@@ -13885,7 +13946,10 @@
+@@ -13885,7 +14012,10 @@
         li = l->lv_first;
      }
@@ -40161 +41347 @@
      pat = get_tv_string_buf_chk(&argvars[1], patbuf);
      if (pat == NULL)
-@@ -13909,7 +13973,7 @@
+@@ -13909,7 +14039,7 @@
         {
             if (start < 0)
@@ -40170 +41356 @@
             /* When "count" argument is there ignore matches before "start",
              * otherwise skip part of the string.  Differs when pattern is "^"
-@@ -13917,7 +13981,10 @@
+@@ -13917,7 +14047,10 @@
             if (argvars[3].v_type != VAR_UNKNOWN)
                 startcol = start;
@@ -40181 +41367 @@
  
         if (argvars[3].v_type != VAR_UNKNOWN)
-@@ -13967,6 +14034,12 @@
+@@ -13967,6 +14100,12 @@
  #else
                 startcol = (colnr_T)(regmatch.startp[0] + 1 - str);
@@ -40194 +41380 @@
         }
  
-@@ -14095,8 +14168,8 @@
+@@ -14095,8 +14234,8 @@
             }
             else
@@ -40205 +41391 @@
         }
  #endif
-@@ -14292,14 +14365,23 @@
+@@ -14292,14 +14431,23 @@
         return;
  
@@ -40235 +41421 @@
  #endif
  
-@@ -14316,7 +14398,6 @@
+@@ -14316,7 +14464,6 @@
      buf[1] = NUL;
      buf[2] = NUL;
@@ -40243 +41429 @@
      {
         if (VIsual_select)
-@@ -14324,9 +14405,7 @@
+@@ -14324,9 +14471,7 @@
         else
             buf[0] = VIsual_mode;
@@ -40254 +41440 @@
      {
         buf[0] = 'r';
-@@ -16675,7 +16754,6 @@
+@@ -16655,8 +16800,6 @@
+     regname = *strregname;
+     if (regname == 0 || regname == '@')
+        regname = '"';
+-    else if (regname == '=')
+-       return;
+ 
+     if (argvars[2].v_type != VAR_UNKNOWN)
+     {
+@@ -16675,7 +16818,6 @@
                 case 'V': case 'l':     /* line-wise selection */
                     yank_type = MLINE;
@@ -40262 +41457 @@
                     yank_type = MBLOCK;
                     if (VIM_ISDIGIT(stropt[1]))
-@@ -16685,7 +16763,6 @@
+@@ -16685,14 +16827,62 @@
                         --stropt;
                     }
@@ -40270 +41465 @@
      }
  
-@@ -16869,7 +16946,7 @@
+-    strval = get_tv_string_chk(&argvars[1]);
+-    if (strval != NULL)
++    if (argvars[1].v_type == VAR_LIST)
++    {
++       char_u          **lstval;
++       char_u          **allocval;
++       char_u          buf[NUMBUFLEN];
++       char_u          **curval;
++       char_u          **curallocval;
++       int             len = argvars[1].vval.v_list->lv_len;
++       listitem_T      *li;
++
++       /* First half: use for pointers to result lines; second half: use for
++        * pointers to allocated copies. */
++       lstval = (char_u **)alloc(sizeof(char_u *) * ((len + 1) * 2));
++       if (lstval == NULL)
++           return;
++       curval = lstval;
++       allocval = lstval + len + 2;
++       curallocval = allocval;
++
++       for (li = argvars[1].vval.v_list->lv_first; li != NULL;
++                                                            li = li->li_next)
++       {
++           strval = get_tv_string_buf_chk(&li->li_tv, buf);
++           if (strval == NULL)
++               goto free_lstval;
++           if (strval == buf)
++           {
++               /* Need to make a copy, next get_tv_string_buf_chk() will
++                * overwrite the string. */
++               strval = vim_strsave(buf);
++               if (strval == NULL)
++                   goto free_lstval;
++               *curallocval++ = strval;
++           }
++           *curval++ = strval;
++       }
++       *curval++ = NULL;
++
++       write_reg_contents_lst(regname, lstval, -1,
++                                               append, yank_type, block_len);
++free_lstval:
++       while (curallocval > allocval)
++           vim_free(*--curallocval);
++       vim_free(lstval);
++    }
++    else
++    {
++       strval = get_tv_string_chk(&argvars[1]);
++       if (strval == NULL)
++           return;
+        write_reg_contents_ex(regname, strval, -1,
+                                                append, yank_type, block_len);
++    }
+     rettv->vval.v_number = 0;
+ }
+ 
+@@ -16869,7 +17059,7 @@
      typval_T   *rettv;
  {
@@ -40279 +41532 @@
  }
  
-@@ -16881,7 +16958,7 @@
+@@ -16881,7 +17071,7 @@
      typval_T   *argvars UNUSED;
      typval_T   *rettv;
@@ -40288 +41541 @@
  
  /*
-@@ -16951,10 +17028,11 @@
+@@ -16951,10 +17141,11 @@
  static char_u  *item_compare_func;
  static dict_T  *item_compare_selfdict;
@@ -40301 +41554 @@
      static int
  #ifdef __BORLANDC__
-@@ -17028,9 +17106,10 @@
+@@ -17028,9 +17219,10 @@
   * "sort({list})" function
   */
@@ -40313 +41566 @@
      list_T     *l;
      listitem_T *li;
-@@ -17039,12 +17118,12 @@
+@@ -17039,12 +17231,12 @@
      long       i;
  
@@ -40328 +41581 @@
         rettv->vval.v_list = l;
         rettv->v_type = VAR_LIST;
-@@ -17091,29 +17170,72 @@
+@@ -17091,29 +17283,72 @@
         ptrs = (listitem_T **)alloc((int)(len * sizeof(listitem_T *)));
         if (ptrs == NULL)
@@ -40417 +41670 @@
         }
  
-@@ -17122,6 +17244,28 @@
+@@ -17122,6 +17357,28 @@
  }
  
@@ -40446 +41699 @@
   */
      static void
-@@ -18688,7 +18832,6 @@
+@@ -17709,9 +17966,29 @@
+     typval_T   *argvars;
+     typval_T   *rettv;
+ {
+-    rettv->v_type = VAR_STRING;
+-    rettv->vval.v_string =
+-                   reg_submatch((int)get_tv_number_chk(&argvars[0], NULL));
++    int                error = FALSE;
++    int                no;
++    int                retList = 0;
++
++    no = (int)get_tv_number_chk(&argvars[0], &error);
++    if (error)
++       return;
++    error = FALSE;
++    if (argvars[1].v_type != VAR_UNKNOWN)
++       retList = get_tv_number_chk(&argvars[1], &error);
++    if (error)
++       return;
++
++    if (retList == 0)
++    {
++       rettv->v_type = VAR_STRING;
++       rettv->vval.v_string = reg_submatch(no);
++    }
++    else
++    {
++       rettv->v_type = VAR_LIST;
++       rettv->vval.v_list = reg_submatch_list(no);
++    }
+ }
+ 
+ /*
+@@ -17979,13 +18256,11 @@
+ #endif
+ }
+ 
+-/*
+- * "system()" function
+- */
+     static void
+-f_system(argvars, rettv)
++get_cmd_output_as_rettv(argvars, rettv, retlist)
+     typval_T   *argvars;
+     typval_T   *rettv;
++    int                retlist;
+ {
+     char_u     *res = NULL;
+     char_u     *p;
+@@ -17993,9 +18268,12 @@
+     char_u     buf[NUMBUFLEN];
+     int                err = FALSE;
+     FILE       *fd;
++    list_T     *list = NULL;
+ 
++    rettv->v_type = VAR_STRING;
++    rettv->vval.v_string = NULL;
+     if (check_restricted() || check_secure())
+-       goto done;
++       goto errret;
+ 
+     if (argvars[1].v_type != VAR_UNKNOWN)
+     {
+@@ -18006,74 +18284,159 @@
+        if ((infile = vim_tempname('i')) == NULL)
+        {
+            EMSG(_(e_notmp));
+-           goto done;
++           goto errret;
+        }
+ 
+        fd = mch_fopen((char *)infile, WRITEBIN);
+        if (fd == NULL)
+        {
+            EMSG2(_(e_notopen), infile);
+-           goto done;
++           goto errret;
+        }
+-       p = get_tv_string_buf_chk(&argvars[1], buf);
+-       if (p == NULL)
++       if (argvars[1].v_type == VAR_LIST)
+        {
+-           fclose(fd);
+-           goto done;          /* type error; errmsg already given */
++           if (write_list(fd, argvars[1].vval.v_list, TRUE) == FAIL)
++               err = TRUE;
++       }
++       else
++       {
++           p = get_tv_string_buf_chk(&argvars[1], buf);
++           if (p == NULL)
++           {
++               fclose(fd);
++               goto errret;            /* type error; errmsg already given */
++           }
++           if (fwrite(p, STRLEN(p), 1, fd) != 1)
++               err = TRUE;
+        }
+-       if (fwrite(p, STRLEN(p), 1, fd) != 1)
+-           err = TRUE;
+        if (fclose(fd) != 0)
+            err = TRUE;
+        if (err)
+        {
+            EMSG(_("E677: Error writing temp file"));
+-           goto done;
++           goto errret;
+        }
+     }
+ 
+-    res = get_cmd_output(get_tv_string(&argvars[0]), infile,
+-                                                SHELL_SILENT | SHELL_COOKED);
+-
+-#ifdef USE_CR
+-    /* translate <CR> into <NL> */
+-    if (res != NULL)
++    if (retlist)
+     {
+-       char_u  *s;
++       int             len;
++       listitem_T      *li;
++       char_u          *s = NULL;
++       char_u          *start;
++       char_u          *end;
++       int             i;
++
++       res = get_cmd_output(get_tv_string(&argvars[0]), infile,
++                                          SHELL_SILENT | SHELL_COOKED, &len);
++       if (res == NULL)
++           goto errret;
+ 
+-       for (s = res; *s; ++s)
++       list = list_alloc();
++       if (list == NULL)
++           goto errret;
++
++       for (i = 0; i < len; ++i)
+        {
+-           if (*s == CAR)
+-               *s = NL;
++           start = res + i;
++           while (i < len && res[i] != NL)
++               ++i;
++           end = res + i;
++
++           s = alloc((unsigned)(end - start + 1));
++           if (s == NULL)
++               goto errret;
++
++           for (p = s; start < end; ++p, ++start)
++               *p = *start == NUL ? NL : *start;
++           *p = NUL;
++
++           li = listitem_alloc();
++           if (li == NULL)
++           {
++               vim_free(s);
++               goto errret;
++           }
++           li->li_tv.v_type = VAR_STRING;
++           li->li_tv.vval.v_string = s;
++           list_append(list, li);
+        }
++
++       ++list->lv_refcount;
++       rettv->v_type = VAR_LIST;
++       rettv->vval.v_list = list;
++       list = NULL;
+     }
+-#else
+-# ifdef USE_CRNL
+-    /* translate <CR><NL> into <NL> */
+-    if (res != NULL)
++    else
+     {
+-       char_u  *s, *d;
++       res = get_cmd_output(get_tv_string(&argvars[0]), infile,
++                                          SHELL_SILENT | SHELL_COOKED, NULL);
++#ifdef USE_CR
++       /* translate <CR> into <NL> */
++       if (res != NULL)
++       {
++           char_u      *s;
+ 
+-       d = res;
+-       for (s = res; *s; ++s)
++           for (s = res; *s; ++s)
++           {
++               if (*s == CAR)
++                   *s = NL;
++           }
++       }
++#else
++# ifdef USE_CRNL
++       /* translate <CR><NL> into <NL> */
++       if (res != NULL)
+        {
+-           if (s[0] == CAR && s[1] == NL)
+-               ++s;
+-           *d++ = *s;
++           char_u      *s, *d;
++
++           d = res;
++           for (s = res; *s; ++s)
++           {
++               if (s[0] == CAR && s[1] == NL)
++                   ++s;
++               *d++ = *s;
++           }
++           *d = NUL;
+        }
+-       *d = NUL;
+-    }
+ # endif
+ #endif
++       rettv->vval.v_string = res;
++       res = NULL;
++    }
+ 
+-done:
++errret:
+     if (infile != NULL)
+     {
+        mch_remove(infile);
+        vim_free(infile);
+     }
+-    rettv->v_type = VAR_STRING;
+-    rettv->vval.v_string = res;
++    if (res != NULL)
++       vim_free(res);
++    if (list != NULL)
++       list_free(list, TRUE);
++}
++
++/*
++ * "system()" function
++ */
++    static void
++f_system(argvars, rettv)
++    typval_T   *argvars;
++    typval_T   *rettv;
++{
++    get_cmd_output_as_rettv(argvars, rettv, FALSE);
++}
++
++/*
++ * "systemlist()" function
++ */
++    static void
++f_systemlist(argvars, rettv)
++    typval_T   *argvars;
++    typval_T   *rettv;
++{
++    get_cmd_output_as_rettv(argvars, rettv, TRUE);
+ }
+ 
+ /*
+@@ -18688,7 +19051,6 @@
      typval_T   *argvars UNUSED;
      typval_T   *rettv UNUSED;
@@ -40454 +41964 @@
  
      rettv->v_type = VAR_STRING;
-@@ -18699,7 +18842,6 @@
+@@ -18699,7 +19061,6 @@
      /* A non-zero number or non-empty string argument: reset mode. */
      if (non_zero_arg(&argvars[0]))
@@ -40462 +41972 @@
  
  /*
-@@ -19073,14 +19215,12 @@
+@@ -18923,6 +19284,49 @@
+ }
+ 
+ /*
++ * Write list of strings to file
++ */
++    static int
++write_list(fd, list, binary)
++    FILE       *fd;
++    list_T     *list;
++    int                binary;
++{
++    listitem_T *li;
++    int                c;
++    int                ret = OK;
++    char_u     *s;
++
++    for (li = list->lv_first; li != NULL; li = li->li_next)
++    {
++       for (s = get_tv_string(&li->li_tv); *s != NUL; ++s)
++       {
++           if (*s == '\n')
++               c = putc(NUL, fd);
++           else
++               c = putc(*s, fd);
++           if (c == EOF)
++           {
++               ret = FAIL;
++               break;
++           }
++       }
++       if (!binary || li->li_next != NULL)
++           if (putc('\n', fd) == EOF)
++           {
++               ret = FAIL;
++               break;
++           }
++       if (ret == FAIL)
++       {
++           EMSG(_(e_write));
++           break;
++       }
++    }
++    return ret;
++}
++
++/*
+  * "writefile()" function
+  */
+     static void
+@@ -18933,10 +19337,7 @@
+     int                binary = FALSE;
+     char_u     *fname;
+     FILE       *fd;
+-    listitem_T *li;
+-    char_u     *s;
+     int                ret = 0;
+-    int                c;
+ 
+     if (check_restricted() || check_secure())
+        return;
+@@ -18963,33 +19364,8 @@
+     }
+     else
+     {
+-       for (li = argvars[0].vval.v_list->lv_first; li != NULL;
+-                                                            li = li->li_next)
+-       {
+-           for (s = get_tv_string(&li->li_tv); *s != NUL; ++s)
+-           {
+-               if (*s == '\n')
+-                   c = putc(NUL, fd);
+-               else
+-                   c = putc(*s, fd);
+-               if (c == EOF)
+-               {
+-                   ret = -1;
+-                   break;
+-               }
+-           }
+-           if (!binary || li->li_next != NULL)
+-               if (putc('\n', fd) == EOF)
+-               {
+-                   ret = -1;
+-                   break;
+-               }
+-           if (ret < 0)
+-           {
+-               EMSG(_(e_write));
+-               break;
+-           }
+-       }
++       if (write_list(fd, argvars[0].vval.v_list, binary) == FAIL)
++           ret = -1;
+        fclose(fd);
+     }
+ 
+@@ -19073,14 +19449,12 @@
         return NULL;
      if (name[0] == '.')                                /* cursor */
@@ -40477 +42084 @@
      {
         pp = getmark_buf_fnum(curbuf, name[1], FALSE, fnum);
-@@ -19719,11 +19859,12 @@
+@@ -19719,11 +20093,12 @@
   * Return OK or FAIL.
   */
@@ -40491 +42098 @@
      int                ret = OK;
      typval_T   *tv = NULL;
-@@ -19750,7 +19891,7 @@
+@@ -19750,7 +20125,7 @@
       */
      else
@@ -40500 +42107 @@
             tv = &v->di_tv;
      }
-@@ -19790,24 +19931,30 @@
+@@ -19790,24 +20165,30 @@
      while (ret == OK
             && (**arg == '['
@@ -40537 +42144 @@
             /* Stop the expression evaluation when immediately aborting on
              * error, or when an interrupt occurred or an exception was thrown
-@@ -20146,9 +20293,10 @@
+@@ -20094,6 +20475,9 @@
+     return res != NULL ? res : (char_u *)"";
+ }
+ 
++/*
++ * Careful: This uses a single, static buffer.  YOU CAN ONLY USE IT ONCE!
++ */
+     char_u *
+ get_tv_string_chk(varp)
+     typval_T   *varp;
+@@ -20146,9 +20530,10 @@
   * hashtab_T used.
   */
@@ -40549 +42166 @@
      char_u     *varname;
      hashtab_T  *ht;
-@@ -20158,7 +20306,7 @@
+@@ -20158,7 +20543,7 @@
         *htp = ht;
      if (ht == NULL)
@@ -40558 +42175 @@
  
  /*
-@@ -20166,11 +20314,11 @@
+@@ -20166,11 +20551,11 @@
   * Returns NULL if not found.
   */
@@ -40572 +42189 @@
      hashitem_T *hi;
  
-@@ -20202,7 +20350,7 @@
+@@ -20202,7 +20587,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
@@ -40581 +42198 @@
             /* Note: script_autoload() may make "hi" invalid. It must either
              * be obtained again or not used. */
-@@ -20282,7 +20430,7 @@
+@@ -20282,7 +20667,7 @@
  {
      dictitem_T *v;
@@ -40590 +42207 @@
         return NULL;
      return get_tv_string(&v->di_tv);
-@@ -20560,6 +20708,13 @@
+@@ -20560,6 +20945,13 @@
                 v->di_tv.vval.v_number = get_tv_number(tv);
                 if (STRCMP(varname, "searchforward") == 0)
@@ -40604 +42221 @@
             return;
         }
-@@ -21361,6 +21516,7 @@
+@@ -21206,6 +21598,8 @@
+      * dict.func    existing dict entry that's not a Funcref
+      *             "name" == NULL, "fudi.fd_dict" set,
+      *             "fudi.fd_di" set, "fudi.fd_newkey" == NULL
++     * s:func      script-local function name
++     * g:func      global function name, same as "func"
+      */
+     p = eap->arg;
+     name = trans_function_name(&p, eap->skip, 0, &fudi);
+@@ -21361,6 +21755,7 @@
                 if (STRCMP(((char_u **)(newargs.ga_data))[i], arg) == 0)
                 {
@@ -40612 +42238 @@
                 }
  
-@@ -21604,7 +21760,7 @@
+@@ -21604,7 +21999,7 @@
       */
      if (fudi.fd_dict == NULL)
@@ -40621 +42247 @@
         {
             emsg_funcname(N_("E707: Function name conflicts with variable: %s"),
-@@ -21762,8 +21918,9 @@
+@@ -21762,8 +22157,9 @@
   * Also handles a Funcref in a List or Dictionary.
   * Returns the function name in allocated memory, or NULL for failure.
@@ -40633 +42259 @@
   */
      static char_u *
-@@ -21801,7 +21958,8 @@
+@@ -21801,7 +22197,8 @@
      if (lead > 2)
         start += lead;
@@ -40643 +42269 @@
      if (end == start)
      {
-@@ -21863,14 +22021,14 @@
+@@ -21863,14 +22260,14 @@
      if (lv.ll_exp_name != NULL)
      {
@@ -40660 +42286 @@
             name = NULL;
      }
-@@ -22078,7 +22236,8 @@
+@@ -21896,7 +22293,8 @@
+     }
+     else
+     {
+-       if (lead == 2)  /* skip over "s:" */
++       /* skip over "s:" and "g:" */
++       if (lead == 2 || (lv.ll_name[0] == 'g' && lv.ll_name[1] == ':'))
+            lv.ll_name += 2;
+        len = (int)(end - lv.ll_name);
+     }
+@@ -21924,11 +22322,23 @@
+            lead += (int)STRLEN(sid_buf);
+        }
+     }
+-    else if (!(flags & TFN_INT) && builtin_function(lv.ll_name))
++    else if (!(flags & TFN_INT) && builtin_function(lv.ll_name, len))
+     {
+-       EMSG2(_("E128: Function name must start with a capital or contain a colon: %s"), lv.ll_name);
++       EMSG2(_("E128: Function name must start with a capital or \"s:\": %s"),
++                                                                      start);
+        goto theend;
+     }
++    if (!skip && !(flags & TFN_QUIET))
++    {
++       char_u *cp = vim_strchr(lv.ll_name, ':');
++
++       if (cp != NULL && cp < end)
++       {
++           EMSG2(_("E884: Function name cannot contain a colon: %s"), start);
++           goto theend;
++       }
++    }
++
+     name = alloc((unsigned)(len + lead + 1));
+     if (name != NULL)
+     {
+@@ -21941,7 +22351,7 @@
+                STRCPY(name + 3, sid_buf);
+        }
+        mch_memmove(name + lead, lv.ll_name, (size_t)len);
+-       name[len + lead] = NUL;
++       name[lead + len] = NUL;
+     }
+     *pp = end;
+ 
+@@ -22062,7 +22472,7 @@
+ translated_function_exists(name)
+     char_u     *name;
+ {
+-    if (builtin_function(name))
++    if (builtin_function(name, -1))
+        return find_internal_func(name) >= 0;
+     return find_func(name) != NULL;
+ }
+@@ -22078,7 +22488,8 @@
      char_u  *p;
      int            n = FALSE;
@@ -40670 +42350 @@
  
      /* Only accept "funcname", "funcname ", "funcname (..." and
-@@ -22325,10 +22484,6 @@
+@@ -22109,14 +22520,20 @@
+ 
+ /*
+  * Return TRUE if "name" looks like a builtin function name: starts with a
+- * lower case letter and doesn't contain a ':' or AUTOLOAD_CHAR.
++ * lower case letter and doesn't contain AUTOLOAD_CHAR.
++ * "len" is the length of "name", or -1 for NUL terminated.
+  */
+     static int
+-builtin_function(name)
++builtin_function(name, len)
+     char_u *name;
++    int len;
+ {
+-    return ASCII_ISLOWER(name[0]) && vim_strchr(name, ':') == NULL
+-                                  && vim_strchr(name, AUTOLOAD_CHAR) == NULL;
++    char_u *p;
++
++    if (!ASCII_ISLOWER(name[0]))
++       return FALSE;
++    p = vim_strchr(name, AUTOLOAD_CHAR);
++    return p == NULL || (len > 0 && p > name + len);
+ }
+ 
+ #if defined(FEAT_PROFILE) || defined(PROTO)
+@@ -22325,10 +22742,6 @@
      int                ret = FALSE;
      int                i;
@@ -40681 +42386 @@
      p = vim_strchr(name, AUTOLOAD_CHAR);
      if (p == NULL || p == name)
-@@ -24260,6 +24415,17 @@
+@@ -24260,6 +24673,17 @@
         }
      }
@@ -40699 +42404 @@
  }
  
-@@ -24283,6 +24449,7 @@
+@@ -24283,6 +24707,7 @@
      garray_T   ga;
      char_u     *ret;
@@ -40707 +42412 @@
      /* Make 'cpoptions' empty, so that the 'l' flag doesn't work here */
      save_cpo = p_cpo;
-@@ -24299,6 +24466,19 @@
+@@ -24299,6 +24724,19 @@
         tail = str;
         while (vim_regexec_nl(&regmatch, str, (colnr_T)(tail - str)))
@@ -40727 +42432 @@
              * Get some space for a temporary buffer to do the substitution
              * into.  It will contain:
-@@ -24321,20 +24501,9 @@
+@@ -24321,20 +24759,9 @@
             (void)vim_regsub(&regmatch, sub, (char_u *)ga.ga_data
                                           + ga.ga_len + i, TRUE, TRUE, FALSE);
@@ -40753 +42458 @@
 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-03-30 20:09:04.499388630 +0000
++++ vim74/src/ex_cmds.c 2014-04-27 05:20:58.141769246 +0000
 @@ -1012,7 +1012,18 @@
  
@@ -40800 +42505 @@
  #ifdef FEAT_AUTOCMD
      if ((command != NULL || newlnum > (linenr_T)0)
-@@ -4097,12 +4108,12 @@
+@@ -3332,6 +3343,12 @@
+ #endif
+            buf = buflist_new(ffname, sfname, 0L,
+                    BLN_CURBUF | ((flags & ECMD_SET_HELP) ? 0 : BLN_LISTED));
++#ifdef FEAT_AUTOCMD
++           /* autocommands may change curwin and curbuf */
++           if (oldwin != NULL)
++               oldwin = curwin;
++           old_curbuf = curbuf;
++#endif
+        }
+        if (buf == NULL)
+            goto theend;
+@@ -4097,12 +4114,12 @@
       * 'scroll' */
      if (eap->forceit)
@@ -40816 +42534 @@
         bigness = 1;
  
-@@ -4740,11 +4751,17 @@
+@@ -4409,6 +4426,31 @@
+        endcolumn = (curwin->w_curswant == MAXCOL);
+     }
+ 
++    /* Recognize ":%s/\n//" and turn it into a join command, which is much
++     * more efficient.
++     * TODO: find a generic solution to make line-joining operations more
++     * efficient, avoid allocating a string that grows in size.
++     */
++    if (pat != NULL && STRCMP(pat, "\\n") == 0
++           && *sub == NUL
++           && (*cmd == NUL || (cmd[1] == NUL && (*cmd == 'g' || *cmd == 'l'
++                                            || *cmd == 'p' || *cmd == '#'))))
++    {
++       curwin->w_cursor.lnum = eap->line1;
++       if (*cmd == 'l')
++           eap->flags = EXFLAG_LIST;
++       else if (*cmd == '#')
++           eap->flags = EXFLAG_NR;
++       else if (*cmd == 'p')
++           eap->flags = EXFLAG_PRINT;
++
++       (void)do_join(eap->line2 - eap->line1 + 1, FALSE, TRUE, FALSE);
++       sub_nlines = sub_nsubs = eap->line2 - eap->line1 + 1;
++       (void)do_sub_msg(FALSE);
++       ex_may_print(eap);
++       return;
++    }
++
+     /*
+      * Find trailing options.  When '&' is used, keep old options.
+      */
+@@ -4740,11 +4782,17 @@
                             char_u      *resp;
                             colnr_T     sc, ec;
@@ -40835 +42585 @@
                             for (i = 0; i < (long)sc; ++i)
                                 msg_putchar(' ');
-@@ -5928,14 +5945,18 @@
+@@ -5928,14 +5976,18 @@
                                "?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
                                "/\\?", "/\\z(\\)", "\\=", ":s\\=",
@@ -40856 +42606 @@
  
      d = IObuff;                    /* assume IObuff is long enough! */
-@@ -5974,7 +5995,7 @@
+@@ -5974,7 +6026,7 @@
           /* Replace:
            * "[:...:]" with "\[:...:]"
@@ -40865 +42615 @@
             if ((arg[0] == '[' && (arg[1] == ':'
                          || (arg[1] == '+' && arg[2] == '+')))
-@@ -7658,7 +7679,7 @@
+@@ -7658,7 +7710,7 @@
  # ifdef FEAT_WINDOWS
             ++emsg_off;
@@ -40876 +42626 @@
 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-03-30 20:09:04.499388630 +0000
++++ vim74/src/ex_cmds.h 2014-04-27 05:20:58.141769246 +0000
 @@ -477,6 +477,8 @@
                         NEEDARG|EXTRA|NOTRLCOM),
@@ -40914 +42664 @@
 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-03-30 20:09:04.499388630 +0000
++++ vim74/src/ex_cmds2.c        2014-04-27 05:20:58.145102663 +0000
 @@ -1436,20 +1436,20 @@
  }
@@ -41010 +42760 @@
         /* start at the first argument/window/buffer */
         i = 0;
+@@ -4329,7 +4341,7 @@
+     /* Find all available locales by running command "locale -a".  If this
+      * doesn't work we won't have completion. */
+     char_u *locale_a = get_cmd_output((char_u *)"locale -a",
+-                                                       NULL, SHELL_SILENT);
++                                                   NULL, SHELL_SILENT, NULL);
+     if (locale_a == NULL)
+        return NULL;
+     ga_init2(&locales_ga, sizeof(char_u *), 20);
 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-03-30 20:09:04.502722073 +0000
-@@ -1843,6 +1843,11 @@
++++ vim74/src/ex_docmd.c        2014-04-27 05:20:58.148436078 +0000
+@@ -316,7 +316,6 @@
+ static void    ex_operators __ARGS((exarg_T *eap));
+ static void    ex_put __ARGS((exarg_T *eap));
+ static void    ex_copymove __ARGS((exarg_T *eap));
+-static void    ex_may_print __ARGS((exarg_T *eap));
+ static void    ex_submagic __ARGS((exarg_T *eap));
+ static void    ex_join __ARGS((exarg_T *eap));
+ static void    ex_at __ARGS((exarg_T *eap));
+@@ -1843,6 +1842,11 @@
                             cmdmod.keepalt = TRUE;
                             continue;
@@ -41025 +42792 @@
                             break;
                         cmdmod.keepjumps = TRUE;
-@@ -1869,18 +1874,23 @@
+@@ -1869,18 +1873,23 @@
  #endif
                         continue;
@@ -41058 +42825 @@
  
             case 'r':   if (!checkforcmd(&ea.cmd, "rightbelow", 6))
-@@ -2584,12 +2594,15 @@
+@@ -2584,12 +2593,15 @@
             case CMD_keepalt:
             case CMD_keepjumps:
@@ -41074 +42841 @@
             case CMD_psearch:
             case CMD_python:
-@@ -3089,9 +3102,11 @@
+@@ -3089,9 +3101,11 @@
      {"keepalt", 5, FALSE},
      {"keepjumps", 5, FALSE},
@@ -41086 +42853 @@
      {"sandbox", 3, FALSE},
      {"silent", 3, FALSE},
-@@ -3254,7 +3269,11 @@
+@@ -3254,7 +3268,11 @@
             ++p;
         /* for python 3.x: ":py3*" commands completion */
@@ -41098 +42865 @@
  
         if (len == 0)
-@@ -3597,8 +3616,11 @@
+@@ -3597,8 +3615,11 @@
         case CMD_keepalt:
         case CMD_keepjumps:
@@ -41110 +42877 @@
         case CMD_sandbox:
         case CMD_silent:
-@@ -6565,7 +6587,9 @@
+@@ -4559,25 +4580,15 @@
+ 
+        /* For a shell command a '!' must be escaped. */
+        if ((eap->usefilter || eap->cmdidx == CMD_bang)
+-                           && vim_strpbrk(repl, (char_u *)"!&;()<>") != NULL)
++                           && vim_strpbrk(repl, (char_u *)"!") != NULL)
+        {
+            char_u      *l;
+ 
+-           l = vim_strsave_escaped(repl, (char_u *)"!&;()<>");
++           l = vim_strsave_escaped(repl, (char_u *)"!");
+            if (l != NULL)
+            {
+                vim_free(repl);
+                repl = l;
+-               /* For a sh-like shell escape "!" another time. */
+-               if (strstr((char *)p_sh, "sh") != NULL)
+-               {
+-                   l = vim_strsave_escaped(repl, (char_u *)"!");
+-                   if (l != NULL)
+-                   {
+-                       vim_free(repl);
+-                       repl = l;
+-                   }
+-               }
+            }
+        }
+ 
+@@ -4830,7 +4841,7 @@
+     if (*arg == '+')       /* +[command] */
+     {
+        ++arg;
+-       if (vim_isspace(*arg))
++       if (vim_isspace(*arg) || *arg == NUL)
+            command = dollar_command;
+        else
+        {
+@@ -6565,7 +6576,9 @@
      if (check_more(FALSE, eap->forceit) == OK && only_one_window())
         exiting = TRUE;
@@ -41121 +42925 @@
             || (only_one_window() && check_changed_any(eap->forceit)))
      {
-@@ -7099,7 +7123,7 @@
+@@ -7099,7 +7112,7 @@
      if (!P_HID(curbuf) && !split)
      {
@@ -41130 +42934 @@
      }
      if (split)
-@@ -7361,7 +7385,11 @@
+@@ -7361,7 +7374,11 @@
  {
      /* Set recoverymode right away to avoid the ATTENTION prompt. */
@@ -41143 +42947 @@
                              || setfname(curbuf, eap->arg, NULL, TRUE) == OK))
         ml_recover();
-@@ -7910,6 +7938,8 @@
+@@ -7910,6 +7927,8 @@
                                                ? ECMD_ONE : eap->do_ecmd_lnum,
                     (P_HID(curbuf) ? ECMD_HIDE : 0)
@@ -41152 +42956 @@
                     + (eap->cmdidx == CMD_badd ? ECMD_ADDBUF : 0 )
  #endif
-@@ -8036,6 +8066,8 @@
+@@ -8036,6 +8055,8 @@
  {
  #ifdef FEAT_SCROLLBIND
@@ -41161 +42965 @@
      long       y;
      linenr_T   old_linenr = curwin->w_cursor.lnum;
-@@ -8067,13 +8099,13 @@
+@@ -8067,13 +8088,13 @@
  
  
@@ -41177 +42981 @@
             if (y > 0)
                 scrollup(y, TRUE);
-@@ -8087,7 +8119,8 @@
+@@ -8087,7 +8108,8 @@
  #endif
         }
@@ -41187 +42991 @@
      {
         did_syncbind = TRUE;
-@@ -8207,6 +8240,7 @@
+@@ -8207,6 +8229,7 @@
      int                local;
  {
@@ -41195 +42999 @@
      {
         /* If still in global directory, need to remember current
-@@ -8223,7 +8257,6 @@
+@@ -8223,7 +8246,6 @@
          * name. */
         vim_free(globaldir);
@@ -41203 +43007 @@
  
      shorten_fnames(TRUE);
-@@ -8350,7 +8383,7 @@
+@@ -8350,7 +8372,7 @@
      {
         n = W_WINROW(curwin) + curwin->w_wrow - msg_scrolled;
@@ -41212 +43016 @@
  
      len = eap->line2;
-@@ -8556,6 +8589,9 @@
+@@ -8556,6 +8578,9 @@
         beginline(BL_SOL | BL_FIX);
      }
@@ -41222 +43026 @@
      {
         case CMD_delete:
-@@ -8965,11 +9001,7 @@
+@@ -8647,7 +8672,7 @@
+ /*
+  * Print the current line if flags were given to the Ex command.
+  */
+-    static void
++    void
+ ex_may_print(eap)
+     exarg_T    *eap;
+ {
+@@ -8965,11 +8990,7 @@
      RedrawingDisabled = 0;
      p_lz = FALSE;
@@ -41235 +43048 @@
      if (need_maketitle)
         maketitle();
-@@ -9004,11 +9036,7 @@
+@@ -9004,11 +9025,7 @@
         status_redraw_all();
      else
@@ -41248 +43061 @@
      p_lz = p;
      out_flush();
-@@ -10355,7 +10383,7 @@
+@@ -10355,7 +10372,7 @@
      }
  
@@ -41257 +43070 @@
         return FAIL;
  
-@@ -10929,9 +10957,9 @@
+@@ -10929,9 +10946,9 @@
      char_u     *buf = NULL;
      char_u     *s;
@@ -41270 +43083 @@
      for (i = 0; i < gap->ga_len; ++i)
      {
-@@ -10948,7 +10976,9 @@
+@@ -10948,7 +10965,9 @@
                     s = buf;
                 }
@@ -41281 +43094 @@
                 vim_free(buf);
                 return FAIL;
-@@ -10956,7 +10986,7 @@
+@@ -10956,7 +10975,7 @@
             vim_free(buf);
         }
@@ -41290 +43103 @@
  
  /*
-@@ -11389,7 +11419,7 @@
+@@ -11389,7 +11408,7 @@
  ex_nohlsearch(eap)
      exarg_T    *eap UNUSED;
@@ -41301 +43114 @@
 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-03-30 20:09:04.502722073 +0000
++++ vim74/src/ex_eval.c 2014-04-27 05:20:58.148436078 +0000
 @@ -321,6 +321,17 @@
  }
@@ -41487 +43300 @@
 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-03-30 20:09:04.506055515 +0000
++++ vim74/src/ex_getln.c        2014-04-27 05:20:58.151769494 +0000
 @@ -2280,7 +2280,7 @@
  
@@ -41539 +43352 @@
 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-03-30 20:09:04.506055515 +0000
++++ vim74/src/feature.h 2014-04-27 05:20:58.151769494 +0000
 @@ -211,18 +211,11 @@
  #endif
@@ -41606 +43419 @@
 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-03-30 20:09:04.512722401 +0000
++++ vim74/src/fileio.c  2014-04-27 05:20:58.155102910 +0000
 @@ -428,13 +428,13 @@
         }
@@ -41717 +43530 @@
      }
      *lenp = CRYPT_MAGIC_LEN + salt_len + seed_len;
+@@ -4024,7 +4030,7 @@
+                                                )
+                            mch_setperm(backup,
+                                          (perm & 0707) | ((perm & 07) << 3));
+-# ifdef HAVE_SELINUX
++# if defined(HAVE_SELINUX) || defined(HAVE_SMACK)
+                        mch_copy_sec(fname, backup);
+ # endif
+ #endif
+@@ -4063,7 +4069,7 @@
+ #ifdef HAVE_ACL
+                        mch_set_acl(backup, acl);
+ #endif
+-#ifdef HAVE_SELINUX
++#if defined(HAVE_SELINUX) || defined(HAVE_SMACK)
+                        mch_copy_sec(fname, backup);
+ #endif
+                        break;
+@@ -4712,7 +4718,7 @@
+     }
+ #endif
+ 
+-#ifdef HAVE_SELINUX
++#if defined(HAVE_SELINUX) || defined(HAVE_SMACK)
+     /* Probably need to set the security context. */
+     if (!backup_copy)
+        mch_copy_sec(backup, wfname);
 @@ -5288,7 +5294,7 @@
      if (shortmess(SHM_LINES))
@@ -41739 +43579 @@
      mch_free_acl(acl);
  #endif
-+#ifdef HAVE_SELINUX
++#if defined(HAVE_SELINUX) || defined(HAVE_SMACK)
 +    mch_copy_sec(from, to);
 +#endif
@@ -41783 +43623 @@
             fname = vim_strsave(fname);
         else
+@@ -9536,13 +9548,19 @@
+ 
+     /*
+      * 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.
+      */
+     if (!autocmd_busy)
+     {
+        restore_search_patterns();
+        restoreRedobuff();
+        did_filetype = FALSE;
++       while (au_pending_free_buf != NULL)
++       {
++           buf_T *b = au_pending_free_buf->b_next;
++           vim_free(au_pending_free_buf);
++           au_pending_free_buf = b;
++       }
+     }
+ 
+     /*
 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-03-30 20:09:04.512722401 +0000
++++ vim74/src/fold.c    2014-04-27 05:20:58.158436326 +0000
 @@ -430,11 +430,9 @@
      }
@@ -41837 +43698 @@
 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-03-30 20:09:04.512722401 +0000
++++ vim74/src/getchar.c 2014-04-27 05:20:58.158436326 +0000
 @@ -40,13 +40,13 @@
  
@@ -42314 +44175 @@
 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-03-30 20:09:04.516055846 +0000
-@@ -662,7 +662,6 @@
++++ vim74/src/globals.h 2014-04-27 05:20:58.161769742 +0000
+@@ -386,6 +386,11 @@
+ /* 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. */
++EXTERN buf_T   *au_pending_free_buf INIT(= NULL);
+ #endif
+ 
+ #ifdef FEAT_MOUSE
+@@ -662,7 +667,6 @@
                                 /* set to TRUE when "-s" commandline argument
                                  * used for ex */
@@ -42323 +44196 @@
  EXTERN int     VIsual_active INIT(= FALSE);
                                 /* whether Visual mode is active */
-@@ -677,7 +676,6 @@
+@@ -677,7 +681,6 @@
  
  EXTERN int     redo_VIsual_busy INIT(= FALSE);
@@ -42331 +44204 @@
  #ifdef FEAT_MOUSE
  /*
-@@ -752,6 +750,12 @@
+@@ -752,6 +755,12 @@
   */
  EXTERN pos_T   Insstart;               /* This is where the latest
@@ -42344 +44217 @@
  /*
   * Stuff for VREPLACE mode.
-@@ -979,11 +983,6 @@
+@@ -979,11 +988,6 @@
  EXTERN int     readonlymode INIT(= FALSE); /* Set to TRUE for "view" */
  EXTERN int     recoverymode INIT(= FALSE); /* Set to TRUE for "-r" option */
@@ -42356 +44229 @@
  #ifdef DO_INIT
                     = {NULL, NULL, 0, 0, 0, 0, 0, 0, 0}
-@@ -1177,11 +1176,9 @@
+@@ -1177,11 +1181,9 @@
  EXTERN int     fill_diff INIT(= '-');
  #endif
@@ -42368 +44241 @@
  #ifdef FEAT_CMDWIN
  EXTERN int     cedit_key INIT(= -1);   /* key value of 'cedit' option */
-@@ -1490,6 +1487,7 @@
+@@ -1490,6 +1492,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"));
@@ -42378 +44251 @@
 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-03-30 20:09:04.516055846 +0000
++++ vim74/src/gui.c     2014-04-27 05:20:58.161769742 +0000
 @@ -3132,11 +3132,9 @@
       */
@@ -42391 +44264 @@
         /*
          * When 'mousemodel' is "popup", shift-left is translated to right.
+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-04-27 05:20:58.171769991 +0000
+@@ -732,7 +732,10 @@
+ gui_mch_start_blink(void)
+ {
+     if (blink_timer)
++    {
+        gtk_timeout_remove(blink_timer);
++       blink_timer = 0;
++    }
+     /* Only switch blinking on if none of the times is zero */
+     if (blink_waittime && blink_ontime && blink_offtime && gui.in_focus)
+     {
 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-03-30 20:09:04.532723060 +0000
++++ vim74/src/gui_mac.c 2014-04-27 05:20:58.175103406 +0000
 @@ -1068,11 +1068,7 @@
      }
@@ -42426 +44313 @@
 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-03-30 20:09:04.539389946 +0000
++++ vim74/src/gui_w48.c 2014-04-27 05:20:58.181770239 +0000
 @@ -1008,7 +1008,7 @@
      static LPARAM last_lParam = 0L;
@@ -42488 +44375 @@
 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-03-30 20:09:04.556057162 +0000
++++ vim74/src/if_perl.xs        2014-04-27 05:20:58.191770487 +0000
 @@ -14,7 +14,8 @@
  #define IN_PERL_FILE   /* don't include if_perl.pro from proto.h */
@@ -42655 +44542 @@
 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-03-30 20:09:04.559390604 +0000
++++ vim74/src/if_py_both.h      2014-04-27 05:20:58.195103903 +0000
 @@ -13,6 +13,11 @@
   * Common code for if_python.c and if_python3.c.
@@ -43491 +45378 @@
 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-03-30 20:09:04.559390604 +0000
++++ vim74/src/if_python.c       2014-04-27 05:20:58.198437320 +0000
 @@ -196,6 +196,7 @@
  # define PyTuple_Size dll_PyTuple_Size
@@ -43593 +45480 @@
 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-03-30 20:09:04.559390604 +0000
++++ vim74/src/if_python3.c      2014-04-27 05:20:58.198437320 +0000
 @@ -97,6 +97,19 @@
  #define Py_ssize_t_fmt "n"
@@ -43750 +45637 @@
 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-03-30 20:09:04.559390604 +0000
++++ vim74/src/if_ruby.c 2014-04-27 05:20:58.198437320 +0000
 @@ -88,14 +88,20 @@
  # define rb_int2big rb_int2big_stub
@@ -43857 +45744 @@
 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-03-30 20:09:04.562724049 +0000
++++ vim74/src/if_tcl.c  2014-04-27 05:20:58.201770736 +0000
 @@ -165,6 +165,7 @@
   */
@@ -43890 +45777 @@
 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-03-30 20:09:04.569390934 +0000
++++ vim74/src/main.c    2014-04-27 05:20:58.208437568 +0000
 @@ -702,6 +702,11 @@
         TIME_MSG("reading viminfo");
@@ -43963 +45850 @@
             else if (redraw_cmdline || clear_cmdline)
                 showmode();
-@@ -2727,6 +2723,7 @@
+@@ -1606,6 +1602,7 @@
+ 
+ #ifdef FEAT_EVAL
+     set_vim_var_string(VV_PROGNAME, initstr, -1);
++    set_vim_var_string(VV_PROGPATH, (char_u *)parmp->argv[0], -1);
+ #endif
+ 
+     if (TOLOWER_ASC(initstr[0]) == 'r')
+@@ -2727,6 +2724,7 @@
      int                arg_idx;                /* index in argument list */
      int                i;
@@ -43971 +45866 @@
  # ifdef FEAT_AUTOCMD
      /*
-@@ -2816,24 +2813,22 @@
+@@ -2816,24 +2814,22 @@
  # ifdef FEAT_AUTOCMD
      --autocmd_no_enter;
@@ -44010 +45905 @@
 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-03-30 20:09:04.576057820 +0000
++++ vim74/src/mark.c    2014-04-27 05:20:58.208437568 +0000
 @@ -98,7 +98,6 @@
         return OK;
@@ -44126 +46021 @@
 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-03-30 20:09:04.576057820 +0000
++++ vim74/src/mbyte.c   2014-04-27 05:20:58.211770985 +0000
 @@ -83,10 +83,18 @@
  # ifndef WIN32_LEAN_AND_MEAN
@@ -44206 +46101 @@
         else
             return (int)classes[mid].class;
+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-04-27 05:20:58.211770985 +0000
+@@ -1358,7 +1358,7 @@
+        if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
+            fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
+ #endif
+-#ifdef HAVE_SELINUX
++#if defined(HAVE_SELINUX) || defined(HAVE_SMACK)
+        mch_copy_sec(fname, mfp->mf_fname);
+ #endif
+        mch_hide(mfp->mf_fname);    /* try setting the 'hidden' flag */
 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-03-30 20:09:04.579391263 +0000
++++ vim74/src/memline.c 2014-04-27 05:20:58.215104401 +0000
 @@ -289,6 +289,9 @@
      buf->b_ml.ml_chunksize = NULL;
@@ -44406 +46313 @@
 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-03-30 20:09:04.582724706 +0000
++++ vim74/src/menu.c    2014-04-27 05:20:58.215104401 +0000
 @@ -1640,7 +1640,6 @@
         idx = MENU_INDEX_INSERT;
@@ -44440 +46347 @@
 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-03-30 20:09:04.586058149 +0000
++++ vim74/src/message.c 2014-04-27 05:20:58.218437816 +0000
 @@ -887,6 +887,8 @@
      int                oldState;
@@ -44483 +46390 @@
 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-03-30 20:09:04.589391593 +0000
++++ vim74/src/misc1.c   2014-04-27 05:20:58.218437816 +0000
 @@ -303,10 +303,18 @@
         ml_replace(curwin->w_cursor.lnum, newline, FALSE);
@@ -44901 +46808 @@
 -     */
 -    int ind_no_brace = 0;
-+    /* Column where the first { of a function should be located }. */
-+    buf->b_ind_first_open = 0;
- 
+-
 -    /*
 -     * column where the first { of a function should be located }
 -     */
 -    int ind_first_open = 0;
-+    /* Spaces from the prevailing indent a leftmost open brace should be
-+     * located. */
-+    buf->b_ind_open_extra = 0;
++    /* Column where the first { of a function should be located }. */
++    buf->b_ind_first_open = 0;
  
 -    /*
@@ -44917 +46821 @@
 -     */
 -    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
@@ -45149 +47056 @@
 +     * while(). */
 +    buf->b_ind_if_for_while = 0;
- 
++
 +    for (p = buf->b_p_cino; *p; )
 +    {
@@ -45229 +47136 @@
 +    }
 +}
-+
+ 
 +    int
 +get_c_indent()
@@ -46234 +48141 @@
      getout(1);
  }
+@@ -10710,7 +10665,7 @@
+     else
+ #endif
+        buffer = get_cmd_output(cmd, NULL,
+-                                     (flags & EW_SILENT) ? SHELL_SILENT : 0);
++                               (flags & EW_SILENT) ? SHELL_SILENT : 0, NULL);
+     vim_free(cmd);
+     if (buffer == NULL)
+        return 0;
+@@ -10773,7 +10728,7 @@
+        return;
+ 
+     /* If the file isn't executable, may not add it.  Do accept directories. */
+-    if (!isdir && (flags & EW_EXEC) && !mch_can_exe(f))
++    if (!isdir && (flags & EW_EXEC) && !mch_can_exe(f, NULL))
+        return;
+ 
+     /* Make room for another item in the file list. */
+@@ -10810,13 +10765,16 @@
+ 
+ /*
+  * Get the stdout of an external command.
++ * If "ret_len" is NULL replace NUL characters with NL.  When "ret_len" is not
++ * NULL store the length there.
+  * Returns an allocated string, or NULL for error.
+  */
+     char_u *
+-get_cmd_output(cmd, infile, flags)
++get_cmd_output(cmd, infile, flags, ret_len)
+     char_u     *cmd;
+     char_u     *infile;        /* optional input file name */
+     int                flags;          /* can be SHELL_SILENT */
++    int                *ret_len;
+ {
+     char_u     *tempname;
+     char_u     *command;
+@@ -10886,7 +10844,7 @@
+        vim_free(buffer);
+        buffer = NULL;
+     }
+-    else
++    else if (ret_len == NULL)
+     {
+        /* Change NUL into SOH, otherwise the string is truncated. */
+        for (i = 0; i < len; ++i)
+@@ -10895,6 +10853,8 @@
+ 
+        buffer[len] = NUL;      /* make sure the buffer is terminated */
+     }
++    else
++       *ret_len = len;
+ 
+ done:
+     vim_free(tempname);
 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-03-30 20:09:04.589391593 +0000
++++ vim74/src/misc2.c   2014-04-27 05:20:58.221771232 +0000
 @@ -31,9 +31,7 @@
      if (virtual_op != MAYBE)
@@ -46403 +48364 @@
 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-03-30 20:09:04.592725036 +0000
++++ vim74/src/move.c    2014-04-27 05:20:58.225104649 +0000
 @@ -20,6 +20,7 @@
  #include "vim.h"
@@ -46546 +48507 @@
 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-03-30 20:09:04.596058479 +0000
++++ vim74/src/netbeans.c        2014-04-27 05:20:58.228438065 +0000
 @@ -2232,11 +2232,9 @@
  
@@ -46561 +48522 @@
 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-03-30 20:09:04.599391922 +0000
++++ vim74/src/normal.c  2014-04-27 05:20:58.228438065 +0000
 @@ -14,17 +14,15 @@
  
@@ -48190 +50151 @@
 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-03-30 20:09:04.599391922 +0000
++++ vim74/src/ops.c     2014-04-27 05:20:58.231771480 +0000
 @@ -57,9 +57,7 @@
      char_u     **y_array;      /* pointer to array of line pointers */
@@ -48201 +50162 @@
  
  static struct yankreg  *y_current;         /* ptr to current yankreg */
-@@ -107,17 +105,13 @@
+@@ -107,19 +105,15 @@
  static int     yank_copy_line __ARGS((struct block_def *bd, long y_idx));
  #ifdef FEAT_CLIPBOARD
@@ -48217 +50178 @@
 -#endif
  #if defined(FEAT_CLIPBOARD) || defined(FEAT_EVAL)
- static void    str_to_reg __ARGS((struct yankreg *y_ptr, int type, char_u *str, long len, long blocklen));
+-static void    str_to_reg __ARGS((struct yankreg *y_ptr, int type, char_u *str, long len, long blocklen));
++static void    str_to_reg __ARGS((struct yankreg *y_ptr, int yank_type, char_u *str, long len, long blocklen, int str_list));
  #endif
+ static int     ends_in_white __ARGS((linenr_T lnum));
+ #ifdef FEAT_COMMENTS
 @@ -187,7 +181,6 @@
      return i;
@@ -49040 +51004 @@
      else
      {
+@@ -6005,7 +6005,7 @@
+ 
+     clip_free_selection(cbd);
+ 
+-    str_to_reg(y_ptr, type, str, len, 0L);
++    str_to_reg(y_ptr, type, str, len, 0L, FALSE);
+ }
+ 
+ /*
 @@ -6078,7 +6078,6 @@
  }
@@ -49056 +51029 @@
  #endif /* FEAT_CLIPBOARD || PROTO */
  
-@@ -6154,15 +6152,15 @@
+@@ -6115,7 +6113,7 @@
+     curr = y_current;
+     y_current = &y_regs[TILDE_REGISTER];
+     free_yank_all();
+-    str_to_reg(y_current, MCHAR, str, len, 0L);
++    str_to_reg(y_current, MCHAR, str, len, 0L, FALSE);
+     y_current = curr;
+ }
+ #endif
+@@ -6154,30 +6152,63 @@
      regname = may_get_selection(regname);
  #endif
@@ -49075 +51057 @@
      }
      return MAUTO;
-@@ -6340,11 +6338,6 @@
-     get_yank_register(name, TRUE);
-     if (!y_append && !must_append)
-        free_yank_all();
+ }
+ 
++static char_u *getreg_wrap_one_line __ARGS((char_u *s, int flags));
++
++/*
++ * When "flags" has GREG_LIST return a list with text "s".
++ * Otherwise just return "s".
++ */
++    static char_u *
++getreg_wrap_one_line(s, flags)
++    char_u     *s;
++    int                flags;
++{
++    if (flags & GREG_LIST)
++    {
++       list_T *list = list_alloc();
++
++       if (list != NULL)
++       {
++           if (list_append_string(list, NULL, -1) == FAIL)
++           {
++               list_free(list, TRUE);
++               return NULL;
++           }
++           list->lv_first->li_tv.vval.v_string = s;
++       }
++       return (char_u *)list;
++    }
++    return s;
++}
++
+ /*
+  * Return the contents of a register as a single allocated string.
+  * Used for "@r" in expressions and for getreg().
+  * Returns NULL for error.
++ * Flags:
++ *     GREG_NO_EXPR    Do not allow expression register
++ *     GREG_EXPR_SRC   For the expression register: return expression itself,
++ *                     not the result of its evaluation.
++ *     GREG_LIST       Return a list of lines in place of a single string.
+  */
+     char_u *
+-get_reg_contents(regname, allowexpr, expr_src)
++get_reg_contents(regname, flags)
+     int                regname;
+-    int                allowexpr;      /* allow "=" register */
+-    int                expr_src;       /* get expression for "=" register */
++    int                flags;
+ {
+     long       i;
+     char_u     *retval;
+@@ -6187,13 +6218,11 @@
+     /* Don't allow using an expression register inside an expression */
+     if (regname == '=')
+     {
+-       if (allowexpr)
+-       {
+-           if (expr_src)
+-               return get_expr_line_src();
+-           return get_expr_line();
+-       }
+-       return NULL;
++       if (flags & GREG_NO_EXPR)
++           return NULL;
++       if (flags & GREG_EXPR_SRC)
++           return getreg_wrap_one_line(get_expr_line_src(), flags);
++       return getreg_wrap_one_line(get_expr_line(), flags);
+     }
+ 
+     if (regname == '@')            /* "@@" is used for unnamed register */
+@@ -6211,15 +6240,33 @@
+     {
+        if (retval == NULL)
+            return NULL;
+-       if (!allocated)
+-           retval = vim_strsave(retval);
+-       return retval;
++       if (allocated)
++           return getreg_wrap_one_line(retval, flags);
++       return getreg_wrap_one_line(vim_strsave(retval), flags);
+     }
+ 
+     get_yank_register(regname, FALSE);
+     if (y_current->y_array == NULL)
+        return NULL;
+ 
++    if (flags & GREG_LIST)
++    {
++       list_T  *list = list_alloc();
++       int     error = FALSE;
++
++       if (list == NULL)
++           return NULL;
++       for (i = 0; i < y_current->y_size; ++i)
++           if (list_append_string(list, y_current->y_array[i], -1) == FAIL)
++               error = TRUE;
++       if (error)
++       {
++           list_free(list, TRUE);
++           return NULL;
++       }
++       return (char_u *)list;
++    }
++
+     /*
+      * Compute length of resulting string.
+      */
+@@ -6261,6 +6308,47 @@
+     return retval;
+ }
+ 
++    static int
++init_write_reg(name, old_y_previous, old_y_current, must_append, yank_type)
++    int                    name;
++    struct yankreg  **old_y_previous;
++    struct yankreg  **old_y_current;
++    int                    must_append;
++    int                    *yank_type UNUSED;
++{
++    if (!valid_yank_reg(name, TRUE))       /* check for valid reg name */
++    {
++       emsg_invreg(name);
++       return FAIL;
++    }
++
++    /* Don't want to change the current (unnamed) register */
++    *old_y_previous = y_previous;
++    *old_y_current = y_current;
++
++    get_yank_register(name, TRUE);
++    if (!y_append && !must_append)
++       free_yank_all();
++    return OK;
++}
++
++    static void
++finish_write_reg(name, old_y_previous, old_y_current)
++    int                    name;
++    struct yankreg  *old_y_previous;
++    struct yankreg  *old_y_current;
++{
++# ifdef FEAT_CLIPBOARD
++    /* Send text of clipboard register to the clipboard. */
++    may_set_selection();
++# endif
++
++    /* ':let @" = "val"' should change the meaning of the "" register */
++    if (name != '"')
++       y_previous = old_y_previous;
++    y_current = old_y_current;
++}
++
+ /*
+  * Store string "str" in register "name".
+  * "maxlen" is the maximum number of bytes to use, -1 for all bytes.
+@@ -6281,6 +6369,51 @@
+ }
+ 
+     void
++write_reg_contents_lst(name, strings, maxlen, must_append, yank_type, block_len)
++    int                name;
++    char_u     **strings;
++    int                maxlen UNUSED;
++    int                must_append;
++    int                yank_type;
++    long       block_len;
++{
++    struct yankreg  *old_y_previous, *old_y_current;
++
++    if (name == '/'
++#ifdef FEAT_EVAL
++           || name == '='
++#endif
++           )
++    {
++       char_u  *s;
++
++       if (strings[0] == NULL)
++           s = (char_u *)"";
++       else if (strings[1] != NULL)
++       {
++           EMSG(_("E883: search pattern and expression register may not "
++                       "contain two or more lines"));
++           return;
++       }
++       else
++           s = strings[0];
++       write_reg_contents_ex(name, s, -1, must_append, yank_type, block_len);
++       return;
++    }
++
++    if (name == '_')       /* black hole: nothing to do */
++       return;
++
++    if (init_write_reg(name, &old_y_previous, &old_y_current, must_append,
++               &yank_type) == FAIL)
++       return;
++
++    str_to_reg(y_current, yank_type, (char_u *) strings, -1, block_len, TRUE);
++
++    finish_write_reg(name, old_y_previous, old_y_current);
++}
++
++    void
+ write_reg_contents_ex(name, str, maxlen, must_append, yank_type, block_len)
+     int                name;
+     char_u     *str;
+@@ -6317,45 +6450,22 @@
+            s = concat_str(get_expr_line_src(), p);
+            vim_free(p);
+            p = s;
+-
+        }
+        set_expr_line(p);
+        return;
+     }
+ #endif
+ 
+-    if (!valid_yank_reg(name, TRUE))       /* check for valid reg name */
+-    {
+-       emsg_invreg(name);
+-       return;
+-    }
+-
+     if (name == '_')       /* black hole: nothing to do */
+        return;
+ 
+-    /* Don't want to change the current (unnamed) register */
+-    old_y_previous = y_previous;
+-    old_y_current = y_current;
++    if (init_write_reg(name, &old_y_previous, &old_y_current, must_append,
++               &yank_type) == FAIL)
++       return;
+ 
+-    get_yank_register(name, TRUE);
+-    if (!y_append && !must_append)
+-       free_yank_all();
 -#ifndef FEAT_VISUAL
 -    /* Just in case - make sure we don't use MBLOCK */
@@ -49084 +51299 @@
 -       yank_type = MAUTO;
 -#endif
-     str_to_reg(y_current, yank_type, str, len, block_len);
- 
- # ifdef FEAT_CLIPBOARD
-@@ -6382,9 +6375,7 @@
+-    str_to_reg(y_current, yank_type, str, len, block_len);
++    str_to_reg(y_current, yank_type, str, len, block_len, FALSE);
+ 
+-# ifdef FEAT_CLIPBOARD
+-    /* Send text of clipboard register to the clipboard. */
+-    may_set_selection();
+-# endif
+-
+-    /* ':let @" = "val"' should change the meaning of the "" register */
+-    if (name != '"')
+-       y_previous = old_y_previous;
+-    y_current = old_y_current;
++    finish_write_reg(name, old_y_previous, old_y_current);
+ }
+ #endif /* FEAT_EVAL */
+ 
+@@ -6365,12 +6475,13 @@
+  * is appended.
+  */
+     static void
+-str_to_reg(y_ptr, yank_type, str, len, blocklen)
++str_to_reg(y_ptr, yank_type, str, len, blocklen, str_list)
+     struct yankreg     *y_ptr;         /* pointer to yank register */
+     int                        yank_type;      /* MCHAR, MLINE, MBLOCK, MAUTO */
+     char_u             *str;           /* string to put in register */
+     long               len;            /* length of string */
+     long               blocklen;       /* width of Visual block */
++    int                        str_list;       /* TRUE if str is char_u ** */
+ {
+     int                type;                   /* MCHAR, MLINE or MBLOCK */
+     int                lnum;
+@@ -6381,16 +6492,16 @@
+     int                extraline = 0;          /* extra line at the end */
      int                append = FALSE;         /* append to last line in register */
      char_u     *s;
++    char_u     **ss;
      char_u     **pp;
 -#ifdef FEAT_VISUAL
@@ -49097 +51342 @@
      if (y_ptr->y_array == NULL)                /* NULL means empty register */
         y_ptr->y_size = 0;
-@@ -6425,9 +6416,7 @@
+ 
+     if (yank_type == MAUTO)
+-       type = ((len > 0 && (str[len - 1] == NL || str[len - 1] == CAR))
++       type = ((str_list || (len > 0 && (str[len - 1] == NL
++                                           || str[len - 1] == CAR)))
+                                                             ? MLINE : MCHAR);
+     else
+        type = yank_type;
+@@ -6399,18 +6510,26 @@
+      * Count the number of lines within the string
+      */
+     newlines = 0;
+-    for (i = 0; i < len; i++)
+-       if (str[i] == '\n')
+-           ++newlines;
+-    if (type == MCHAR || len == 0 || str[len - 1] != '\n')
++    if (str_list)
+     {
+-       extraline = 1;
+-       ++newlines;     /* count extra newline at the end */
++       for (ss = (char_u **) str; *ss != NULL; ++ss)
++           ++newlines;
+     }
+-    if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR)
++    else
+     {
+-       append = TRUE;
+-       --newlines;     /* uncount newline when appending first line */
++       for (i = 0; i < len; i++)
++           if (str[i] == '\n')
++               ++newlines;
++       if (type == MCHAR || len == 0 || str[len - 1] != '\n')
++       {
++           extraline = 1;
++           ++newlines; /* count extra newline at the end */
++       }
++       if (y_ptr->y_size > 0 && y_ptr->y_type == MCHAR)
++       {
++           append = TRUE;
++           --newlines; /* uncount newline when appending first line */
++       }
+     }
+ 
+     /*
+@@ -6425,58 +6544,65 @@
         pp[lnum] = y_ptr->y_array[lnum];
      vim_free(y_ptr->y_array);
@@ -49107 +51396 @@
      /*
       * Find the end of each line and save it into the array.
-@@ -6438,10 +6427,8 @@
-            if (str[i] == '\n')
-                break;
-        i -= start;                     /* i is now length of line */
+      */
+-    for (start = 0; start < len + extraline; start += i + 1)
++    if (str_list)
+     {
+-       for (i = start; i < len; ++i)   /* find the end of the line */
+-           if (str[i] == '\n')
+-               break;
+-       i -= start;                     /* i is now length of line */
 -#ifdef FEAT_VISUAL
-        if (i > maxlen)
-            maxlen = i;
+-       if (i > maxlen)
+-           maxlen = i;
 -#endif
-        if (append)
+-       if (append)
++       for (ss = (char_u **) str; *ss != NULL; ++ss, ++lnum)
         {
-            --lnum;
-@@ -6471,12 +6458,10 @@
+-           --lnum;
+-           extra = (int)STRLEN(y_ptr->y_array[lnum]);
++           i = STRLEN(*ss);
++           pp[lnum] = vim_strnsave(*ss, i);
++           if (i > maxlen)
++               maxlen = i;
+        }
+-       else
+-           extra = 0;
+-       s = alloc((unsigned)(i + extra + 1));
+-       if (s == NULL)
+-           break;
+-       if (extra)
+-           mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra);
+-       if (append)
+-           vim_free(y_ptr->y_array[lnum]);
+-       if (i)
+-           mch_memmove(s + extra, str + start, (size_t)i);
+-       extra += i;
+-       s[extra] = NUL;
+-       y_ptr->y_array[lnum++] = s;
+-       while (--extra >= 0)
+-       {
+-           if (*s == NUL)
+-               *s = '\n';          /* replace NUL with newline */
+-           ++s;
++    }
++    else
++    {
++       for (start = 0; start < len + extraline; start += i + 1)
++       {
++           for (i = start; i < len; ++i)       /* find the end of the line */
++               if (str[i] == '\n')
++                   break;
++           i -= start;                 /* i is now length of line */
++           if (i > maxlen)
++               maxlen = i;
++           if (append)
++           {
++               --lnum;
++               extra = (int)STRLEN(y_ptr->y_array[lnum]);
++           }
++           else
++               extra = 0;
++           s = alloc((unsigned)(i + extra + 1));
++           if (s == NULL)
++               break;
++           if (extra)
++               mch_memmove(s, y_ptr->y_array[lnum], (size_t)extra);
++           if (append)
++               vim_free(y_ptr->y_array[lnum]);
++           if (i)
++               mch_memmove(s + extra, str + start, (size_t)i);
++           extra += i;
++           s[extra] = NUL;
++           y_ptr->y_array[lnum++] = s;
++           while (--extra >= 0)
++           {
++               if (*s == NUL)
++                   *s = '\n';      /* replace NUL with newline */
++               ++s;
++           }
++           append = FALSE;                 /* only first line is appended */
+        }
+-       append = FALSE;             /* only first line is appended */
      }
      y_ptr->y_type = type;
@@ -49131 +51488 @@
  #endif /* FEAT_CLIPBOARD || FEAT_EVAL || PROTO */
  
-@@ -6570,12 +6555,10 @@
+@@ -6570,12 +6696,10 @@
      long       word_count_cursor = 0;
      int                eol_size;
@@ -49144 +51501 @@
      /*
       * Compute the length of the file in characters.
-@@ -6591,7 +6574,6 @@
+@@ -6591,7 +6715,6 @@
         else
             eol_size = 1;
@@ -49152 +51509 @@
         {
             if (lt(VIsual, curwin->w_cursor))
-@@ -6635,7 +6617,6 @@
+@@ -6635,7 +6758,6 @@
             }
             line_count_selected = max_pos.lnum - min_pos.lnum + 1;
@@ -49160 +51517 @@
         for (lnum = 1; lnum <= curbuf->b_ml.ml_line_count; ++lnum)
         {
-@@ -6648,7 +6629,6 @@
+@@ -6648,7 +6770,6 @@
                 last_check = byte_count + 100000L;
             }
@@ -49168 +51525 @@
             if (VIsual_active
                     && lnum >= min_pos.lnum && lnum <= max_pos.lnum)
-@@ -6659,13 +6639,13 @@
+@@ -6659,13 +6780,13 @@
                 switch (VIsual_mode)
                 {
@@ -49186 +51543 @@
                         len = (long)bd.textlen;
                         break;
-@@ -6697,7 +6677,6 @@
+@@ -6697,7 +6818,6 @@
                 }
             }
@@ -49194 +51551 @@
                 /* In non-visual mode, check for the line the cursor is on */
                 if (lnum == curwin->w_cursor.lnum)
-@@ -6719,7 +6698,6 @@
+@@ -6719,7 +6839,6 @@
         if (!curbuf->b_p_eol && curbuf->b_p_bin)
             byte_count -= eol_size;
@@ -49202 +51559 @@
         {
             if (VIsual_mode == Ctrl_V && curwin->w_curswant < MAXCOL)
-@@ -6750,7 +6728,6 @@
+@@ -6750,7 +6869,6 @@
                         byte_count_cursor, byte_count);
         }
@@ -49212 +51569 @@
 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-03-30 20:09:04.602725365 +0000
++++ vim74/src/option.c  2014-04-27 05:20:58.235104897 +0000
 @@ -134,6 +134,7 @@
  #define PV_KP          OPT_BOTH(OPT_BUF(BV_KP))
@@ -49638 +51995 @@
 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-03-30 20:09:04.606058808 +0000
++++ vim74/src/option.h  2014-04-27 05:20:58.238438314 +0000
 @@ -31,9 +31,9 @@
  #     define DFLT_EFM  "%A%p^,%C%%CC-%t-%m,%Cat line number %l in file %f,%f|%l| %m"
@@ -49695 +52052 @@
 +/* Value for b_p_ul indicating the global value must be used. */
 +#define NO_LOCAL_UNDOLEVEL -123456
+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-04-27 05:20:58.238438314 +0000
+@@ -884,8 +884,9 @@
+  * Return -1 if unknown.
+  */
+     int
+-mch_can_exe(name)
++mch_can_exe(name, path)
+     char_u     *name;
++    char_u     **path;
+ {
+     /* TODO */
+     return -1;
 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-03-30 20:09:04.606058808 +0000
++++ vim74/src/os_dos.h  2014-04-27 05:20:58.238438314 +0000
 @@ -109,7 +109,7 @@
  #endif
@@ -49718 +52089 @@
 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-03-30 20:09:04.606058808 +0000
++++ vim74/src/os_mac.h  2014-04-27 05:20:58.238438314 +0000
 @@ -16,6 +16,11 @@
  # define OPAQUE_TOOLBOX_STRUCTS 0
@@ -49742 +52113 @@
 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-03-30 20:09:04.612725695 +0000
++++ vim74/src/os_msdos.c        2014-04-27 05:20:58.245105145 +0000
 @@ -2270,9 +2270,7 @@
                 default:
@@ -49763 +52134 @@
  
         movedata(
+@@ -2949,14 +2945,17 @@
+  * Return -1 if unknown.
+  */
+     int
+-mch_can_exe(name)
++mch_can_exe(name, path)
+     char_u     *name;
++    char_u     **path;
+ {
+     char       *p;
+ 
+     p = searchpath(name);
+     if (p == NULL || mch_isdir(p))
+        return FALSE;
++    if (path != NULL)
++       *path = vim_strsave(p);
+     return TRUE;
+ }
+ 
 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-03-30 20:09:04.616059138 +0000
++++ vim74/src/os_mswin.c        2014-04-27 05:20:58.245105145 +0000
 @@ -456,7 +456,14 @@
      int
@@ -50173 +52563 @@
 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-03-30 20:09:04.616059138 +0000
++++ vim74/src/os_os2_cfg.h      2014-04-27 05:20:58.248438561 +0000
 @@ -47,7 +47,7 @@
  #undef UNIX    /* define always by current configure script */
@@ -50185 +52575 @@
 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-03-30 20:09:04.616059138 +0000
++++ vim74/src/os_qnx.c  2014-04-27 05:20:58.248438561 +0000
 @@ -78,9 +78,7 @@
                 default: /* fallthrough to line type */
@@ -50208 +52598 @@
 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-03-30 20:09:04.619392580 +0000
-@@ -168,7 +168,7 @@
++++ vim74/src/os_unix.c 2014-04-27 05:20:58.248438561 +0000
+@@ -46,6 +46,14 @@
+ static int selinux_enabled = -1;
+ #endif
+ 
++#ifdef HAVE_SMACK
++# include <attr/xattr.h>
++# include <linux/xattr.h>
++# ifndef SMACK_LABEL_LEN
++#  define SMACK_LABEL_LEN 1024
++# endif
++#endif
++
+ /*
+  * Use this prototype for select, some include files have a wrong prototype
+  */
+@@ -168,7 +176,7 @@
  static pid_t wait4pid __ARGS((pid_t, waitstatus *));
  
@@ -50218 +52623 @@
  #else
  static int  RealWaitForChar __ARGS((int, long, int *));
-@@ -435,7 +435,6 @@
+@@ -435,7 +443,6 @@
         /* Process the queued netbeans messages. */
         netbeans_parse_messages();
@@ -50226 +52631 @@
          * We want to be interrupted by the winch signal
          * or by an event on the monitored file descriptors.
-@@ -446,7 +445,6 @@
+@@ -446,7 +453,6 @@
                 handle_resize();
             return 0;
@@ -50234 +52639 @@
         /* If input was put directly in typeahead buffer bail out here. */
         if (typebuf_changed(tb_change_cnt))
-@@ -804,6 +802,10 @@
+@@ -804,6 +810,10 @@
   * completely full.
   */
@@ -50245 +52650 @@
  # define SIGSTKSZ 8000    /* just a guess of how much stack is needed... */
  #endif
-@@ -957,8 +959,10 @@
+@@ -957,8 +967,10 @@
  
  /*
@@ -50257 +52662 @@
      static RETSIGTYPE
  deathtrap SIGDEFARG(sigarg)
-@@ -1090,18 +1094,23 @@
+@@ -1090,18 +1102,23 @@
      }
      if (entered == 2)
@@ -50285 +52690 @@
  #ifdef NBDEBUG
      reset_signals();
-@@ -2956,7 +2965,26 @@
+@@ -2789,6 +2806,84 @@
+ }
+ #endif /* HAVE_SELINUX */
+ 
++#if defined(HAVE_SMACK) && !defined(PROTO)
++/*
++ * Copy security info from "from_file" to "to_file".
++ */
++    void
++mch_copy_sec(from_file, to_file)
++    char_u     *from_file;
++    char_u     *to_file;
++{
++    static const char * const smack_copied_attributes[] =
++       {
++           XATTR_NAME_SMACK,
++           XATTR_NAME_SMACKEXEC,
++           XATTR_NAME_SMACKMMAP
++       };
++
++    char       buffer[SMACK_LABEL_LEN];
++    const char *name;
++    int                index;
++    int                ret;
++    ssize_t    size;
++
++    if (from_file == NULL)
++       return;
++
++    for (index = 0 ; index < (int)(sizeof(smack_copied_attributes)
++                             / sizeof(smack_copied_attributes)[0]) ; index++)
++    {
++       /* get the name of the attribute to copy */
++       name = smack_copied_attributes[index];
++
++       /* get the value of the attribute in buffer */
++       size = getxattr((char*)from_file, name, buffer, sizeof(buffer));
++       if (size >= 0)
++       {
++           /* copy the attribute value of buffer */
++           ret = setxattr((char*)to_file, name, buffer, (size_t)size, 0);
++           if (ret < 0)
++           {
++               MSG_PUTS(_("Could not set security context "));
++               MSG_PUTS(name);
++               MSG_PUTS(_(" for "));
++               msg_outtrans(to_file);
++               msg_putchar('\n');
++           }
++       }
++       else
++       {
++           /* what reason of not having the attribute value? */
++           switch (errno)
++           {
++               case ENOTSUP:
++                   /* extended attributes aren't supported or enabled */
++                   /* should a message be echoed? not sure... */
++                   return; /* leave because it isn't usefull to continue */
++
++               case ERANGE:
++               default:
++                   /* no enough size OR unexpected error */
++                   MSG_PUTS(_("Could not get security context "));
++                   MSG_PUTS(name);
++                   MSG_PUTS(_(" for "));
++                   msg_outtrans(from_file);
++                   MSG_PUTS(_(". Removing it!\n"));
++                   /* FALLTHROUGH to remove the attribute */
++
++               case ENODATA:
++                   /* no attribute of this name */
++                   ret = removexattr((char*)to_file, name);
++                   /* Silently ignore errors, apparently this happens when
++                    * smack is not actually being used. */
++                   break;
++           }
++       }
++    }
++}
++#endif /* HAVE_SMACK */
++
+ /*
+  * Return a pointer to the ACL of file "fname" in allocated memory.
+  * Return NULL if the ACL is not available for whatever reason.
+@@ -2956,7 +3051,26 @@
  
      if (stat((char *)name, &st))
@@ -50312 +52802 @@
  
  /*
-@@ -2974,7 +3002,9 @@
+@@ -2964,8 +3078,9 @@
+  * Return -1 if unknown.
+  */
+     int
+-mch_can_exe(name)
++mch_can_exe(name, path)
+     char_u     *name;
++    char_u     **path;
+ {
+     char_u     *buf;
+     char_u     *p, *e;
+@@ -2974,7 +3089,20 @@
      /* If it's an absolute or relative path don't need to use $PATH. */
      if (mch_isFullName(name) || (name[0] == '.' && (name[1] == '/'
                                       || (name[1] == '.' && name[2] == '/'))))
+-       return executable_file(name);
 +    {
-        return executable_file(name);
++       if (executable_file(name))
++       {
++           if (path != NULL)
++           {
++               if (name[0] == '.')
++                   *path = FullName_save(name, TRUE);
++               else
++                   *path = vim_strsave(name);
++           }
++           return TRUE;
++       }
++       return FALSE;
 +    }
  
      p = (char_u *)getenv("PATH");
      if (p == NULL || *p == NUL)
-@@ -5028,6 +5058,7 @@
+@@ -3002,7 +3130,16 @@
+        STRCAT(buf, name);
+        retval = executable_file(buf);
+        if (retval == 1)
++       {
++           if (path != NULL)
++           {
++               if (buf[0] == '.')
++                   *path = FullName_save(buf, TRUE);
++               else
++                   *path = vim_strsave(buf);
++           }
+            break;
++       }
+ 
+        if (*e != ':')
+            break;
+@@ -5028,6 +5165,7 @@
      return avail;
  }
@@ -50330 +52860 @@
   * Wait "msec" msec until a character is available from file descriptor "fd".
   * "msec" == 0 will check for characters once.
-@@ -5327,13 +5358,7 @@
+@@ -5327,13 +5465,7 @@
         }
  # endif
@@ -50344 +52874 @@
         if (ret == -1 && errno == EINTR)
         {
-@@ -5455,8 +5480,6 @@
+@@ -5455,8 +5587,6 @@
      return (ret > 0);
  }
@@ -50353 +52883 @@
  /*
   * Expand a path into all matching files and/or directories.  Handles "*",
-@@ -5979,7 +6002,7 @@
+@@ -5569,7 +5699,7 @@
+                    continue;
+ 
+                /* Skip files that are not executable if we check for that. */
+-               if (!dir && (flags & EW_EXEC) && !mch_can_exe(p))
++               if (!dir && (flags & EW_EXEC) && !mch_can_exe(p, NULL))
+                    continue;
+ 
+                if (--files_free == 0)
+@@ -5979,7 +6109,7 @@
         {
             /* If there is a NUL, set did_find_nul, else set check_spaces */
@@ -50362 +52901 @@
             else
                 check_spaces = TRUE;
+@@ -6067,7 +6197,7 @@
+            continue;
+ 
+        /* Skip files that are not executable if we check for that. */
+-       if (!dir && (flags & EW_EXEC) && !mch_can_exe((*file)[i]))
++       if (!dir && (flags & EW_EXEC) && !mch_can_exe((*file)[i], NULL))
+            continue;
+ 
+        p = alloc((unsigned)(STRLEN((*file)[i]) + 1 + dir));
+@@ -6294,7 +6424,7 @@
+ 
+ /* Reads gpm event and adds special keys to input buf. Returns length of
+  * generated key sequence.
+- * This function is made after gui_send_mouse_event
++ * This function is styled after gui_send_mouse_event().
+  */
+     static int
+ mch_gpm_process()
 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-03-30 20:09:04.619392580 +0000
++++ vim74/src/os_unix.h 2014-04-27 05:20:58.251771978 +0000
 @@ -225,6 +225,8 @@
  # include <starlet.h>
@@ -50405 +52962 @@
 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-03-30 20:09:04.619392580 +0000
++++ vim74/src/os_vms.c  2014-04-27 05:20:58.251771978 +0000
 @@ -11,6 +11,23 @@
  
@@ -50504 +53061 @@
             cnt = vms_match_num;
  
+@@ -452,7 +483,7 @@
+                continue;
+ 
+            /* Skip files that are not executable if we check for that. */
+-           if (!dir && (flags & EW_EXEC) && !mch_can_exe(vms_fmatch[i]))
++           if (!dir && (flags & EW_EXEC) && !mch_can_exe(vms_fmatch[i], NULL))
+                continue;
+ 
+            /* allocate memory for pointers */
 @@ -480,10 +511,18 @@
  mch_expandpath(garray_T *gap, char_u *path, int flags)
@@ -50644 +53210 @@
 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-03-30 20:09:04.619392580 +0000
++++ vim74/src/os_vms_conf.h     2014-04-27 05:20:58.251771978 +0000
 @@ -23,7 +23,7 @@
  #define HAVE_DATE_TIME
@@ -50686 +53252 @@
 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-03-30 20:09:04.619392580 +0000
++++ vim74/src/os_win16.h        2014-04-27 05:20:58.255105394 +0000
 @@ -55,8 +55,8 @@
  
@@ -50700 +53266 @@
 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-03-30 20:09:04.626059466 +0000
++++ vim74/src/os_win32.c        2014-04-27 05:20:58.255105394 +0000
 @@ -78,16 +78,6 @@
  # endif
@@ -50906 +53472 @@
             if (did_create_conin)
                 read_error_exit();
-@@ -2500,9 +2582,125 @@
+@@ -1800,7 +1882,7 @@
+  * TODO: Should somehow check if it's really executable.
+  */
+     static int
+-executable_exists(char *name)
++executable_exists(char *name, char_u **path)
+ {
+     char       *dum;
+     char       fname[_MAX_PATH];
+@@ -1823,6 +1905,8 @@
+                    return FALSE;
+                if (GetFileAttributesW(fnamew) & FILE_ATTRIBUTE_DIRECTORY)
+                    return FALSE;
++               if (path != NULL)
++                   *path = utf16_to_enc(fnamew, NULL);
+                return TRUE;
+            }
+            /* Retry with non-wide function (for Windows 98). */
+@@ -1833,6 +1917,8 @@
+        return FALSE;
+     if (mch_isdir(fname))
+        return FALSE;
++    if (path != NULL)
++       *path = vim_strsave(fname);
+     return TRUE;
+ }
+ 
+@@ -1914,7 +2000,7 @@
+            vimrun_path = (char *)vim_strsave(vimrun_location);
+            s_dont_use_vimrun = FALSE;
+        }
+-       else if (executable_exists("vimrun.exe"))
++       else if (executable_exists("vimrun.exe", NULL))
+            s_dont_use_vimrun = FALSE;
+ 
+        /* Don't give the warning for a missing vimrun.exe right now, but only
+@@ -1928,7 +2014,7 @@
+      * If "finstr.exe" doesn't exist, use "grep -n" for 'grepprg'.
+      * Otherwise the default "findstr /n" is used.
+      */
+-    if (!executable_exists("findstr.exe"))
++    if (!executable_exists("findstr.exe", NULL))
+        set_option_value((char_u *)"grepprg", 0, (char_u *)"grep -n", 0);
+ 
+ #ifdef FEAT_CLIPBOARD
+@@ -2500,9 +2586,125 @@
  }
  
@@ -51032 +53643 @@
      void
  fname_case(
-@@ -2520,11 +2718,44 @@
+@@ -2520,11 +2722,44 @@
      int                        slen;
  
@@ -51078 +53689 @@
      porig = name;
      ptrue = szTrueName;
-@@ -2534,8 +2765,8 @@
+@@ -2534,8 +2769,8 @@
         /* copy leading drive letter */
         *ptrue++ = *porig++;
@@ -51088 +53699 @@
      while (*porig != NUL)
      {
-@@ -2629,6 +2860,28 @@
+@@ -2629,6 +2864,28 @@
      char szUserName[256 + 1];  /* UNLEN is 256 */
      DWORD cch = sizeof szUserName;
@@ -51117 +53728 @@
      {
         vim_strncpy(s, szUserName, len - 1);
-@@ -2649,6 +2902,28 @@
+@@ -2649,6 +2906,28 @@
  {
      DWORD cch = len;
@@ -51146 +53757 @@
         vim_strncpy(s, "PC (Win32 Vim)", len - 1);
  }
-@@ -2695,6 +2970,8 @@
+@@ -2695,6 +2974,8 @@
                 return OK;
             }
@@ -51155 +53766 @@
      }
  #endif
-@@ -2702,18 +2979,17 @@
+@@ -2702,18 +2983,17 @@
  }
  
@@ -51178 +53789 @@
  
  
-@@ -2736,7 +3012,7 @@
+@@ -2736,7 +3016,7 @@
         {
             n = _wchmod(p, perm);
@@ -51187 +53798 @@
             /* Retry with non-wide function (for Windows 98). */
         }
-@@ -2955,8 +3231,7 @@
+@@ -2955,8 +3235,7 @@
   * -1 : error
   * else FILE_ATTRIBUTE_* defined in winnt.h
@@ -51197 +53808 @@
  {
      int                attr;
-@@ -3107,6 +3382,9 @@
+@@ -3055,7 +3334,7 @@
+  * Return -1 if unknown.
+  */
+     int
+-mch_can_exe(char_u *name)
++mch_can_exe(char_u *name, char_u **path)
+ {
+     char_u     buf[_MAX_PATH];
+     int                len = (int)STRLEN(name);
+@@ -3068,7 +3347,7 @@
+      * this with a Unix-shell like 'shell'. */
+     if (vim_strchr(gettail(name), '.') != NULL
+                               || strstr((char *)gettail(p_sh), "sh") != NULL)
+-       if (executable_exists((char *)name))
++       if (executable_exists((char *)name, path))
+            return TRUE;
+ 
+     /*
+@@ -3090,7 +3369,7 @@
+        }
+        else
+            copy_option_part(&p, buf + len, _MAX_PATH - len, ";");
+-       if (executable_exists((char *)buf))
++       if (executable_exists((char *)buf, path))
+            return TRUE;
+     }
+     return FALSE;
+@@ -3107,6 +3386,9 @@
  {
      HANDLE     hFile;
@@ -51207 +53845 @@
      /* 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 +3392,41 @@
+@@ -3114,14 +3396,41 @@
      if (STRNCMP(name, "\\\\.\\", 4) == 0)
         return NODE_WRITABLE;
@@ -51256 +53894 @@
         return NODE_NORMAL;
  
-@@ -3618,6 +3923,50 @@
+@@ -3618,6 +3927,50 @@
  }
  #endif /* FEAT_GUI_W32 */
@@ -51307 +53945 @@
  
  #if defined(FEAT_GUI_W32) || defined(PROTO)
-@@ -3664,18 +4013,8 @@
+@@ -3664,18 +4017,8 @@
         cmd += 3;
  
@@ -51328 +53966 @@
      /* Wait for the command to terminate before continuing */
      if (g_PlatformId != VER_PLATFORM_WIN32s)
-@@ -4007,22 +4346,11 @@
+@@ -4007,22 +4350,11 @@
             p = cmd;
      }
@@ -51356 +53994 @@
      if (p != cmd)
         vim_free(p);
-@@ -4049,10 +4377,10 @@
+@@ -4049,10 +4381,10 @@
      {
         MSG     msg;
@@ -51369 +54007 @@
  
         /* write pipe information in the window */
-@@ -4240,7 +4568,25 @@
+@@ -4240,7 +4572,25 @@
  }
  #else
@@ -51396 +54034 @@
  #endif
  
-@@ -4325,6 +4671,7 @@
+@@ -4325,6 +4675,7 @@
             DWORD               flags = CREATE_NEW_CONSOLE;
             char_u              *p;
@@ -51404 +54042 @@
             si.lpReserved = NULL;
             si.lpDesktop = NULL;
-@@ -4408,16 +4755,7 @@
+@@ -4408,16 +4759,7 @@
              * inherit our handles which causes unpleasant dangling swap
              * files if we exit before the spawned process
@@ -51422 +54060 @@
             else
             {
-@@ -4430,9 +4768,9 @@
+@@ -4430,9 +4772,9 @@
             if (newcmd != cmdbase)
                 vim_free(newcmd);
@@ -51434 +54072 @@
             }
             /* Close the handles to the subprocess, so that it goes away */
-@@ -5716,7 +6054,7 @@
+@@ -5716,7 +6058,7 @@
         {
             f = _wopen(wn, flags, mode);
@@ -51443 +54081 @@
             /* 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 +6105,7 @@
+@@ -5767,7 +6109,7 @@
         _set_fmode(oldMode);
  # endif
@@ -51452 +54090 @@
         /* 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 +6440,7 @@
+@@ -6102,6 +6444,7 @@
                     while (i > 0)
                         free(argv[--i]);
@@ -51462 +54100 @@
 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-03-30 20:09:04.626059466 +0000
++++ vim74/src/os_win32.h        2014-04-27 05:20:58.255105394 +0000
 @@ -68,7 +68,7 @@
  #endif
@@ -51494 +54132 @@
 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-03-30 20:09:04.626059466 +0000
++++ vim74/src/osdef.sh  2014-04-27 05:20:58.255105394 +0000
 @@ -47,11 +47,7 @@
  #endif
@@ -51510 +54148 @@
 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-03-30 20:09:04.636059795 +0000
++++ vim74/src/po/eo.po  2014-04-27 05:20:58.268439058 +0000
 @@ -23,8 +23,8 @@
  msgstr ""
@@ -52260 +54898 @@
 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-03-30 20:09:04.679394556 +0000
++++ vim74/src/po/ru.cp1251.po   2014-04-27 05:20:58.305106636 +0000
 @@ -3,14 +3,14 @@
  # Îá óñëîâèÿõ èñïîëüçîâàíèÿ ÷èòàéòå â ðåäàêòîðå Vim ":help uganda"
@@ -52512 +55150 @@
 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-03-30 20:09:04.679394556 +0000
++++ vim74/src/po/ru.po  2014-04-27 05:20:58.308440052 +0000
 @@ -3,14 +3,14 @@
  # Об услПвОяÑ
@@ -52772 +55410 @@
 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-03-30 20:09:04.692728328 +0000
++++ vim74/src/po/uk.cp1251.po   2014-04-27 05:20:58.315106883 +0000
 @@ -2,19 +2,17 @@
  # Ukrainian Vim translation [uk]
@@ -53605 +56243 @@
 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-03-30 20:09:04.692728328 +0000
++++ vim74/src/po/uk.po  2014-04-27 05:20:58.318440300 +0000
 @@ -2,19 +2,17 @@
  # Ukrainian Vim translation [uk]
@@ -54448 +57086 @@
 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-03-30 20:09:04.702728656 +0000
++++ vim74/src/popupmnu.c        2014-04-27 05:20:58.328440548 +0000
 @@ -282,6 +282,10 @@
      int                round;
@@ -54473 +57111 @@
 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-03-30 20:09:04.702728656 +0000
++++ vim74/src/proto/blowfish.pro        2014-04-27 05:20:58.328440548 +0000
 @@ -1,6 +1,6 @@
  /* blowfish.c */
@@ -54484 +57122 @@
 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-03-30 20:09:04.706062100 +0000
++++ vim74/src/proto/eval.pro    2014-04-27 05:20:58.331773964 +0000
 @@ -60,6 +60,7 @@
  int list_append_string __ARGS((list_T *l, char_u *str, int len));
@@ -54495 +57133 @@
 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-03-30 20:09:04.706062100 +0000
++++ vim74/src/proto/ex_cmds2.pro        2014-04-27 05:20:58.331773964 +0000
 @@ -35,7 +35,7 @@
  int prof_def_func __ARGS((void));
@@ -54505 +57143 @@
  void dialog_changed __ARGS((buf_T *buf, int checkall));
  int can_abandon __ARGS((buf_T *buf, int forceit));
+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-04-27 05:20:58.331773964 +0000
+@@ -54,4 +54,5 @@
+ int put_line __ARGS((FILE *fd, char *s));
+ void dialog_msg __ARGS((char_u *buff, char *format, char_u *fname));
+ char_u *get_behave_arg __ARGS((expand_T *xp, int idx));
++void ex_may_print __ARGS((exarg_T *eap));
+ /* vim: set ft=c : */
 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-03-30 20:09:04.706062100 +0000
++++ vim74/src/proto/ex_eval.pro 2014-04-27 05:20:58.331773964 +0000
 @@ -4,8 +4,10 @@
  int should_abort __ARGS((int retcode));
@@ -54521 +57168 @@
 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-03-30 20:09:04.712728987 +0000
++++ vim74/src/proto/getchar.pro 2014-04-27 05:20:58.335107381 +0000
 @@ -1,8 +1,9 @@
  /* getchar.c */
@@ -54535 +57182 @@
 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-03-30 20:09:04.726062759 +0000
++++ vim74/src/proto/misc1.pro   2014-04-27 05:20:58.345107629 +0000
 @@ -69,6 +69,7 @@
  char_u *getnextcomp __ARGS((char_u *fname));
@@ -54556 +57203 @@
  int get_expr_indent __ARGS((void));
  int get_lisp_indent __ARGS((void));
+@@ -98,7 +100,7 @@
+ 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));
+ void addfile __ARGS((garray_T *gap, char_u *f, int flags));
+-char_u *get_cmd_output __ARGS((char_u *cmd, char_u *infile, int flags));
++char_u *get_cmd_output __ARGS((char_u *cmd, char_u *infile, int flags, int *ret_len));
+ void FreeWild __ARGS((int count, char_u **files));
+ int goto_im __ARGS((void));
+ /* vim: set ft=c : */
 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-03-30 20:09:04.729396202 +0000
++++ vim74/src/proto/misc2.pro   2014-04-27 05:20:58.345107629 +0000
 @@ -32,7 +32,7 @@
  char_u *vim_strsave_escaped __ARGS((char_u *string, char_u *esc_chars));
@@ -54568 +57224 @@
  char_u *vim_strnsave_up __ARGS((char_u *string, int len));
  void vim_strup __ARGS((char_u *p));
+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-04-27 05:20:58.348441045 +0000
+@@ -53,9 +53,10 @@
+ int clip_convert_selection __ARGS((char_u **str, long_u *len, VimClipboard *cbd));
+ void dnd_yank_drag_data __ARGS((char_u *str, long len));
+ char_u get_reg_type __ARGS((int regname, long *reglen));
+-char_u *get_reg_contents __ARGS((int regname, int allowexpr, int expr_src));
++char_u *get_reg_contents __ARGS((int regname, int flags));
+ void write_reg_contents __ARGS((int name, char_u *str, int maxlen, int must_append));
+ void write_reg_contents_ex __ARGS((int name, char_u *str, int maxlen, int must_append, int yank_type, long block_len));
++void write_reg_contents_lst __ARGS((int name, char_u **strings, int maxlen, int must_append, int yank_type, long block_len));
+ void clear_oparg __ARGS((oparg_T *oap));
+ void cursor_pos_info __ARGS((void));
+ /* vim: set ft=c : */
 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-03-30 20:09:04.729396202 +0000
++++ vim74/src/proto/option.pro  2014-04-27 05:20:58.348441045 +0000
 @@ -23,6 +23,7 @@
  char_u *check_stl_option __ARGS((char_u *s));
@@ -54588 +57259 @@
  void find_mps_values __ARGS((int *initc, int *findc, int *backwards, int switchit));
  /* 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-04-27 05:20:58.348441045 +0000
+@@ -26,7 +26,7 @@
+ void mch_hide __ARGS((char_u *name));
+ int mch_isdir __ARGS((char_u *name));
+ int mch_mkdir __ARGS((char_u *name));
+-int mch_can_exe __ARGS((char_u *name));
++int mch_can_exe __ARGS((char_u *name, char_u **path));
+ int mch_nodetype __ARGS((char_u *name));
+ void mch_early_init __ARGS((void));
+ void mch_exit __ARGS((int r));
+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-04-27 05:20:58.348441045 +0000
+@@ -38,7 +38,7 @@
+ int mch_setperm __ARGS((char_u *name, long perm));
+ void mch_hide __ARGS((char_u *name));
+ int mch_isdir __ARGS((char_u *name));
+-int mch_can_exe __ARGS((char_u *name));
++int mch_can_exe __ARGS((char_u *name, char_u **path));
+ int mch_nodetype __ARGS((char_u *name));
+ int mch_dirname __ARGS((char_u *buf, int len));
+ int mch_remove __ARGS((char_u *name));
+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-04-27 05:20:58.348441045 +0000
+@@ -42,7 +42,7 @@
+ void mch_free_acl __ARGS((vim_acl_T aclent));
+ void mch_hide __ARGS((char_u *name));
+ int mch_isdir __ARGS((char_u *name));
+-int mch_can_exe __ARGS((char_u *name));
++int mch_can_exe __ARGS((char_u *name, char_u **path));
+ int mch_nodetype __ARGS((char_u *name));
+ void mch_early_init __ARGS((void));
+ void mch_free_mem __ARGS((void));
 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-03-30 20:09:04.732729645 +0000
++++ vim74/src/proto/os_vms.pro  2014-04-27 05:20:58.348441045 +0000
 @@ -7,6 +7,7 @@
  int vms_sys __ARGS((char *cmd, char *out, char *inp));
@@ -54599 +57306 @@
  int mch_expandpath __ARGS((garray_T *gap, char_u *path, int flags));
  void *vms_fixfilename __ARGS((void *instring));
+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-04-27 05:20:58.348441045 +0000
+@@ -26,7 +26,7 @@
+ int mch_is_linked __ARGS((char_u *fname));
+ int win32_fileinfo __ARGS((char_u *fname, BY_HANDLE_FILE_INFORMATION *info));
+ int mch_writable __ARGS((char_u *name));
+-int mch_can_exe __ARGS((char_u *name));
++int mch_can_exe __ARGS((char_u *name, char_u **path));
+ int mch_nodetype __ARGS((char_u *name));
+ vim_acl_T mch_get_acl __ARGS((char_u *fname));
+ void mch_set_acl __ARGS((char_u *fname, vim_acl_T acl));
+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-04-27 05:20:58.351774461 +0000
+@@ -10,6 +10,7 @@
+ int vim_regsub __ARGS((regmatch_T *rmp, char_u *source, char_u *dest, int copy, int magic, int backslash));
+ int vim_regsub_multi __ARGS((regmmatch_T *rmp, linenr_T lnum, char_u *source, char_u *dest, int copy, int magic, int backslash));
+ char_u *reg_submatch __ARGS((int no));
++list_T *reg_submatch_list __ARGS((int no));
+ regprog_T *vim_regcomp __ARGS((char_u *expr_arg, int re_flags));
+ void vim_regfree __ARGS((regprog_T *prog));
+ int vim_regexec __ARGS((regmatch_T *rmp, char_u *line, colnr_T col));
 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-03-30 20:09:04.736063088 +0000
++++ vim74/src/proto/spell.pro   2014-04-27 05:20:58.351774461 +0000
 @@ -3,6 +3,7 @@
  int spell_move_to __ARGS((win_T *wp, int dir, int allwords, int curline, hlf_T *attrp));
@@ -54612 +57342 @@
 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-03-30 20:09:04.736063088 +0000
++++ vim74/src/proto/term.pro    2014-04-27 05:20:58.355107876 +0000
 @@ -35,7 +35,7 @@
  void starttermcap __ARGS((void));
@@ -54624 +57354 @@
 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-03-30 20:09:04.736063088 +0000
++++ vim74/src/proto/winclip.pro 2014-04-27 05:20:58.355107876 +0000
 @@ -11,4 +11,5 @@
  short_u *enc_to_utf16 __ARGS((char_u *str, int *lenp));
@@ -54633 +57363 @@
 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-03-30 20:09:04.736063088 +0000
++++ vim74/src/proto/window.pro  2014-04-27 05:20:58.355107876 +0000
 @@ -9,7 +9,7 @@
  void win_equal __ARGS((win_T *next_curwin, int current, int dir));
@@ -54645 +57375 @@
 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-03-30 20:09:04.739396532 +0000
++++ vim74/src/quickfix.c        2014-04-27 05:20:58.358441293 +0000
 @@ -751,7 +751,10 @@
                 fmt_start = fmt_ptr;
@@ -54692 +57422 @@
 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-03-30 20:09:04.742729974 +0000
-@@ -4179,9 +4179,8 @@
++++ vim74/src/regexp.c  2014-04-27 05:20:58.361774709 +0000
+@@ -3709,25 +3709,28 @@
+ /* TRUE if using multi-line regexp. */
+ #define REG_MULTI      (reg_match == NULL)
+ 
+-static int  bt_regexec __ARGS((regmatch_T *rmp, char_u *line, colnr_T col));
++static int  bt_regexec_nl __ARGS((regmatch_T *rmp, char_u *line, colnr_T col, int line_lbr));
++
+ 
+ /*
+  * Match a regexp against a string.
+  * "rmp->regprog" is a compiled regexp as returned by vim_regcomp().
+  * Uses curbuf for line count and 'iskeyword'.
++ * if "line_lbr" is TRUE  consider a "\n" in "line" to be a line break.
+  *
+  * Return TRUE if there is a match, FALSE if not.
+  */
+     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;
+-    reg_line_lbr = FALSE;
++    reg_line_lbr = line_lbr;
+     reg_buf = curbuf;
+     reg_win = NULL;
+     ireg_ic = rmp->rm_ic;
+@@ -3738,35 +3741,6 @@
+     return (bt_regexec_both(line, col, NULL) != 0);
+ }
+ 
+-#if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) \
+-       || defined(FIND_REPLACE_DIALOG) || defined(PROTO)
+-
+-static int  bt_regexec_nl __ARGS((regmatch_T *rmp, char_u *line, colnr_T col));
+-
+-/*
+- * Like vim_regexec(), but consider a "\n" in "line" to be a line break.
+- */
+-    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;
+-    reg_line_lbr = TRUE;
+-    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);
+-}
+-#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 +4120,8 @@
+            {
+                /* Only accept single line matches. */
+                if (reg_startzpos[i].lnum >= 0
+-                       && reg_endzpos[i].lnum == reg_startzpos[i].lnum)
++                       && reg_endzpos[i].lnum == reg_startzpos[i].lnum
++                       && reg_endzpos[i].col >= reg_startzpos[i].col)
+                    re_extmatch_out->matches[i] =
+                        vim_strnsave(reg_getline(reg_startzpos[i].lnum)
+                                                       + reg_startzpos[i].col,
+@@ -4179,9 +4154,8 @@
                             - (*mb_head_off)(regline, reginput - 1), reg_buf);
      return -1;
@@ -54704 +57512 @@
  
  /*
-@@ -4258,7 +4257,6 @@
+@@ -4258,7 +4232,6 @@
      }
      return TRUE;
@@ -54712 +57520 @@
  #define ADVANCE_REGINPUT() mb_ptr_adv(reginput)
  
-@@ -4311,8 +4309,8 @@
+@@ -4311,8 +4284,8 @@
     */
    for (;;)
@@ -54723 +57531 @@
  
  #ifdef DEBUG
-@@ -4440,9 +4438,7 @@
+@@ -4440,9 +4413,7 @@
             break;
  
@@ -54733 +57541 @@
             break;
  
-@@ -6455,7 +6451,8 @@
+@@ -6455,7 +6426,8 @@
  /*
   * Check whether a backreference matches.
@@ -54743 +57551 @@
      static int
  match_with_backref(start_lnum, start_col, end_lnum, end_col, bytelen)
-@@ -6511,6 +6508,8 @@
+@@ -6511,6 +6483,8 @@
  
         /* Advance to next line. */
@@ -54752 +57560 @@
         ccol = 0;
         if (got_int)
-@@ -8016,12 +8015,11 @@
+@@ -7381,6 +7355,7 @@
+     reg_mmatch = NULL;
+     reg_maxline = 0;
+     reg_buf = curbuf;
++    reg_line_lbr = TRUE;
+     return vim_regsub_both(source, dest, copy, magic, backslash);
+ }
+ #endif
+@@ -7400,6 +7375,7 @@
+     reg_buf = curbuf;          /* always works on the current buffer! */
+     reg_firstlnum = lnum;
+     reg_maxline = curbuf->b_ml.ml_line_count - lnum;
++    reg_line_lbr = FALSE;
+     return vim_regsub_both(source, dest, copy, magic, backslash);
+ }
+ 
+@@ -7898,17 +7874,92 @@
+ 
+     return retval;
+ }
++
++/*
++ * Used for the submatch() function with the optional non-zero argument: get
++ * the list of strings from the n'th submatch in allocated memory with NULs
++ * represented in NLs.
++ * Returns a list of allocated strings.  Returns NULL when not in a ":s"
++ * command, for a non-existing submatch and for any error.
++ */
++    list_T *
++reg_submatch_list(no)
++    int                no;
++{
++    char_u     *s;
++    linenr_T   slnum;
++    linenr_T   elnum;
++    colnr_T    scol;
++    colnr_T    ecol;
++    int                i;
++    list_T     *list;
++    int                error = FALSE;
++
++    if (!can_f_submatch || no < 0)
++       return NULL;
++
++    if (submatch_match == NULL)
++    {
++       slnum = submatch_mmatch->startpos[no].lnum;
++       elnum = submatch_mmatch->endpos[no].lnum;
++       if (slnum < 0 || elnum < 0)
++           return NULL;
++
++       scol = submatch_mmatch->startpos[no].col;
++       ecol = submatch_mmatch->endpos[no].col;
++
++       list = list_alloc();
++       if (list == NULL)
++           return NULL;
++
++       s = reg_getline_submatch(slnum) + scol;
++       if (slnum == elnum)
++       {
++           if (list_append_string(list, s, ecol - scol) == FAIL)
++               error = TRUE;
++       }
++       else
++       {
++           if (list_append_string(list, s, -1) == FAIL)
++               error = TRUE;
++           for (i = 1; i < elnum - slnum; i++)
++           {
++               s = reg_getline_submatch(slnum + i);
++               if (list_append_string(list, s, -1) == FAIL)
++                   error = TRUE;
++           }
++           s = reg_getline_submatch(elnum);
++           if (list_append_string(list, s, ecol) == FAIL)
++               error = TRUE;
++       }
++    }
++    else
++    {
++       s = submatch_match->startp[no];
++       if (s == NULL || submatch_match->endp[no] == NULL)
++           return NULL;
++       list = list_alloc();
++       if (list == NULL)
++           return NULL;
++       if (list_append_string(list, s,
++                                (int)(submatch_match->endp[no] - s)) == FAIL)
++           error = TRUE;
++    }
++
++    if (error)
++    {
++       list_free(list, TRUE);
++       return NULL;
++    }
++    return list;
++}
+ #endif
+ 
+ static regengine_T bt_regengine =
+ {
+     bt_regcomp,
+     bt_regfree,
+-    bt_regexec,
+-#if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) \
+-       || defined(FIND_REPLACE_DIALOG) || defined(PROTO)
+     bt_regexec_nl,
+-#endif
+     bt_regexec_multi
+ #ifdef DEBUG
+     ,(char_u *)""
+@@ -7922,11 +7973,7 @@
+ {
+     nfa_regcomp,
+     nfa_regfree,
+-    nfa_regexec,
+-#if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) \
+-       || defined(FIND_REPLACE_DIALOG) || defined(PROTO)
+     nfa_regexec_nl,
+-#endif
+     nfa_regexec_multi
+ #ifdef DEBUG
+     ,(char_u *)""
+@@ -8016,12 +8063,11 @@
         }
  #endif
@@ -54768 +57701 @@
  
      return prog;
+@@ -8051,7 +8097,7 @@
+     char_u      *line;  /* string to match against */
+     colnr_T     col;    /* column to start looking for match */
+ {
+-    return rmp->regprog->engine->regexec(rmp, line, col);
++    return rmp->regprog->engine->regexec_nl(rmp, line, col, FALSE);
+ }
+ 
+ #if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) \
+@@ -8065,7 +8111,7 @@
+     char_u *line;
+     colnr_T col;
+ {
+-    return rmp->regprog->engine->regexec_nl(rmp, line, col);
++    return rmp->regprog->engine->regexec_nl(rmp, line, col, TRUE);
+ }
+ #endif
+ 
+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-04-27 05:20:58.361774709 +0000
+@@ -149,11 +149,7 @@
+ {
+     regprog_T  *(*regcomp)(char_u*, int);
+     void       (*regfree)(regprog_T *);
+-    int                (*regexec)(regmatch_T*, char_u*, colnr_T);
+-#if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) \
+-       || defined(FIND_REPLACE_DIALOG) || defined(PROTO)
+-    int                (*regexec_nl)(regmatch_T*, char_u*, colnr_T);
+-#endif
++    int                (*regexec_nl)(regmatch_T*, char_u*, colnr_T, int);
+     long       (*regexec_multi)(regmmatch_T*, win_T*, buf_T*, linenr_T, colnr_T, proftime_T*);
+ #ifdef DEBUG
+     char_u     *expr;
 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-03-30 20:09:04.746063417 +0000
++++ vim74/src/regexp_nfa.c      2014-04-27 05:20:58.361774709 +0000
 @@ -29,11 +29,14 @@
  # define NFA_REGEXP_DEBUG_LOG  "nfa_regexp_debug.log"
@@ -54821 +57788 @@
  /* NFA regexp \ze operator encountered. */
  static int nfa_has_zend;
+@@ -302,7 +311,7 @@
+ static long nfa_regexec_both __ARGS((char_u *line, colnr_T col));
+ static regprog_T *nfa_regcomp __ARGS((char_u *expr, int re_flags));
+ static void nfa_regfree __ARGS((regprog_T *prog));
+-static int nfa_regexec __ARGS((regmatch_T *rmp, char_u *line, colnr_T col));
++static int  nfa_regexec_nl __ARGS((regmatch_T *rmp, char_u *line, colnr_T col, int line_lbr));
+ static long nfa_regexec_multi __ARGS((regmmatch_T *rmp, win_T *win, buf_T *buf, linenr_T lnum, colnr_T col, proftime_T *tm));
+ static int match_follows __ARGS((nfa_state_T *startstate, int depth));
+ static int failure_chance __ARGS((nfa_state_T *state, int depth));
 @@ -578,6 +587,8 @@
   * On failure, return 0 (=FAIL)
@@ -55747 +58723 @@
                     addstate_here(thislist, add_state, &t->subs, pim, &listidx);
                 else
+@@ -6402,8 +6781,10 @@
+            {
+                struct multipos *mpos = &subs.synt.list.multi[i];
+ 
+-               /* Only accept single line matches. */
+-               if (mpos->start.lnum >= 0 && mpos->start.lnum == mpos->end.lnum)
++               /* Only accept single line matches that are valid. */
++               if (mpos->start.lnum >= 0
++                       && mpos->start.lnum == mpos->end.lnum
++                       && mpos->end.col >= mpos->start.col)
+                    re_extmatch_out->matches[i] =
+                        vim_strnsave(reg_getline(mpos->start.lnum)
+                                                            + mpos->start.col,
+@@ -6679,47 +7060,21 @@
+  * Match a regexp against a string.
+  * "rmp->regprog" is a compiled regexp as returned by nfa_regcomp().
+  * Uses curbuf for line count and 'iskeyword'.
++ * If "line_lbr" is TRUE consider a "\n" in "line" to be a line break.
+  *
+  * Return TRUE if there is a match, FALSE if not.
+  */
+     static int
+-nfa_regexec(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;
+-    reg_line_lbr = FALSE;
+-    reg_buf = curbuf;
+-    reg_win = NULL;
+-    ireg_ic = rmp->rm_ic;
+-#ifdef FEAT_MBYTE
+-    ireg_icombine = FALSE;
+-#endif
+-    ireg_maxcol = 0;
+-    return (nfa_regexec_both(line, col) != 0);
+-}
+-
+-#if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) \
+-       || defined(FIND_REPLACE_DIALOG) || defined(PROTO)
+-
+-static int  nfa_regexec_nl __ARGS((regmatch_T *rmp, char_u *line, colnr_T col));
+-
+-/*
+- * Like nfa_regexec(), but consider a "\n" in "line" to be a line break.
+- */
+-    static int
+-nfa_regexec_nl(rmp, line, col)
++nfa_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_line_lbr = line_lbr;
+     reg_buf = curbuf;
+     reg_win = NULL;
+     ireg_ic = rmp->rm_ic;
+@@ -6729,7 +7084,6 @@
+     ireg_maxcol = 0;
+     return (nfa_regexec_both(line, col) != 0);
+ }
+-#endif
+ 
+ 
+ /*
 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-03-30 20:09:04.749396860 +0000
++++ vim74/src/screen.c  2014-04-27 05:20:58.365108126 +0000
 @@ -446,8 +446,6 @@
  #endif
@@ -56022 +59071 @@
 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-03-30 20:09:04.749396860 +0000
++++ vim74/src/search.c  2014-04-27 05:20:58.368441542 +0000
 @@ -201,7 +201,7 @@
       * Save the currently used pattern in the appropriate place,
@@ -56482 +59531 @@
 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-03-30 20:09:04.756063747 +0000
++++ vim74/src/spell.c   2014-04-27 05:20:58.375108373 +0000
 @@ -317,7 +317,7 @@
  
@@ -56905 +59954 @@
 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-03-30 20:09:04.756063747 +0000
++++ vim74/src/structs.h 2014-04-27 05:20:58.375108373 +0000
 @@ -346,9 +346,7 @@
  #endif
@@ -57105 +60154 @@
 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-03-30 20:09:04.762730633 +0000
++++ vim74/src/syntax.c  2014-04-27 05:20:58.378441790 +0000
 @@ -6837,10 +6837,8 @@
         CENT("SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue",
@@ -57139 +60188 @@
 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-03-30 20:09:04.762730633 +0000
-@@ -1326,6 +1326,7 @@
++++ vim74/src/tag.c     2014-04-27 05:20:58.381775206 +0000
+@@ -741,8 +741,10 @@
+                            break;
+                        msg_advance(15);
+ 
+-                       /* skip backslash used for escaping command char */
+-                       if (*p == '\\' && *(p + 1) == *tagp.command)
++                       /* skip backslash used for escaping a command char or
++                        * a backslash */
++                       if (*p == '\\' && (*(p + 1) == *tagp.command
++                                       || *(p + 1) == '\\'))
+                            ++p;
+ 
+                        if (*p == TAB)
+@@ -1326,6 +1328,7 @@
      int                match_no_ic = 0;/* matches with rm_ic == FALSE */
      int                match_re;       /* match with regexp */
@@ -57148 +60210 @@
  #ifdef FEAT_EMACS_TAGS
      /*
-@@ -1442,7 +1443,10 @@
+@@ -1442,7 +1445,10 @@
      if (p_tl != 0 && orgpat.len > p_tl)                /* adjust for 'taglength' */
         orgpat.len = p_tl;
@@ -57159 +60221 @@
         goto findtag_end;
  
-@@ -1797,13 +1801,16 @@
+@@ -1797,13 +1803,16 @@
              */
             if (state == TS_START)
@@ -57180 +60242 @@
                      * Read header line.
                      */
-@@ -1898,6 +1905,7 @@
+@@ -1898,6 +1907,7 @@
  #endif
             }
@@ -57188 +60250 @@
              * Figure out where the different strings are in this line.
              * For "normal" tags: Do a quick check if the tag matches.
-@@ -3326,7 +3334,9 @@
+@@ -3326,7 +3336,9 @@
  #ifdef FEAT_SEARCH_EXTRA
         /* restore no_hlsearch when keeping the old search pattern */
@@ -57201 +60263 @@
 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-03-30 20:09:04.766064076 +0000
++++ vim74/src/term.c    2014-04-27 05:20:58.381775206 +0000
 @@ -3356,7 +3356,7 @@
   * it must be called immediately after entering termcap mode.
@@ -57315 +60377 @@
 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-03-30 20:09:04.769397519 +0000
-@@ -33,7 +33,9 @@
++++ vim74/src/testdir/Make_amiga.mak    2014-04-27 05:20:58.385108623 +0000
+@@ -33,7 +33,11 @@
                 test76.out test77.out test78.out test79.out test80.out \
                 test81.out test82.out test83.out test84.out test88.out \
@@ -57323 +60385 @@
 +               test94.out test95.out test96.out test97.out test98.out \
 +               test99.out test100.out test101.out test102.out test103.out \
-+               test104.out test105.out test106.out
++               test104.out test105.out test106.out \
++               test_eval.out \
++               test_options.out
  
  .SUFFIXES: .in .out
  
-@@ -148,3 +150,11 @@
+@@ -148,3 +152,13 @@
  test96.out: test96.in
  test97.out: test97.in
@@ -57339 +60403 @@
 +test105.out: test105.in
 +test106.out: test106.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-03-30 20:09:04.769397519 +0000
-@@ -32,7 +32,9 @@
++++ vim74/src/testdir/Make_dos.mak      2014-04-27 05:20:58.385108623 +0000
+@@ -32,7 +32,11 @@
                 test79.out test80.out test81.out test82.out test83.out \
                 test84.out test85.out test86.out test87.out test88.out \
@@ -57349 +60415 @@
 +               test94.out test95.out test96.out test98.out test99.out \
 +               test100.out test101.out test102.out test103.out test104.out \
-+               test105.out test106.out
++               test105.out test106.out \
++               test_eval.out \
++               test_options.out
  
  SCRIPTS32 =    test50.out test70.out
@@ -57355 +60423 @@
 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-03-30 20:09:04.769397519 +0000
-@@ -52,7 +52,9 @@
++++ vim74/src/testdir/Make_ming.mak     2014-04-27 05:20:58.385108623 +0000
+@@ -52,7 +52,11 @@
                 test79.out test80.out test81.out test82.out test83.out \
                 test84.out test85.out test86.out test87.out test88.out \
@@ -57363 +60431 @@
 +               test94.out test95.out test96.out test98.out test99.out \
 +               test100.out test101.out test102.out test103.out test104.out \
-+               test105.out test106.out
++               test105.out test106.out \
++               test_eval.out \
++               test_options.out
  
  SCRIPTS32 =    test50.out test70.out
@@ -57369 +60439 @@
 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-03-30 20:09:04.769397519 +0000
-@@ -34,7 +34,9 @@
++++ vim74/src/testdir/Make_os2.mak      2014-04-27 05:20:58.385108623 +0000
+@@ -34,7 +34,11 @@
                 test76.out test77.out test78.out test79.out test80.out \
                 test81.out test82.out test83.out test84.out test88.out \
@@ -57377 +60447 @@
 +               test94.out test95.out test96.out test98.out test99.out \
 +               test100.out test101.out test102.out test103.out test104.out \
-+               test105.out test106.out
++               test105.out test106.out \
++               test_eval.out \
++               test_options.out
  
  .SUFFIXES: .in .out
@@ -57383 +60455 @@
 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-03-30 20:09:04.772730962 +0000
++++ vim74/src/testdir/Make_vms.mms      2014-04-27 05:20:58.385108623 +0000
 @@ -4,7 +4,7 @@
  # Authors:     Zoltan Arpadffy, <arpadffy@polarhome.com>
@@ -57426 +60498 @@
  # End of configuration section.
  #
-@@ -63,35 +78,44 @@
+@@ -63,35 +78,46 @@
  
  SCRIPT = test1.out  test2.out  test3.out  test4.out  test5.out  \
@@ -57453 +60525 @@
 +        test95.out test96.out test98.out test99.out \
 +        test100.out test101.out test103.out test104.out \
-+        test105.out test106.out
++        test105.out test106.out \
++        test_eval.out \
++        test_options.out
  
  # Known problems:
@@ -57482 +60556 @@
  .IFDEF WANT_GUI
  SCRIPT_GUI = test16.out
-@@ -99,7 +123,7 @@
+@@ -99,7 +125,7 @@
  .ENDIF
  
@@ -57491 +60565 @@
  
  .IFDEF WANT_WIN
-@@ -114,6 +138,10 @@
+@@ -114,6 +140,10 @@
  SCRIPT_MZSCH = test70.out 
  .ENDIF
@@ -57502 +60576 @@
  SCRIPT_GZIP = test11.out
  .ENDIF
-@@ -122,10 +150,28 @@
+@@ -122,10 +152,28 @@
  SCRIPT_GDIFF = test47.out
  .ENDIF
@@ -57531 +60605 @@
         -@ write sys$output "-----------------------------------------------"
         -@ write sys$output "                "$*" "
-@@ -138,9 +184,10 @@
+@@ -138,9 +186,10 @@
         -@ if "''F$SEARCH("$*.out.*")'"   .NES. "" then differences /par $*.out $*.ok;
         -@ !clean up after the test
@@ -57544 +60618 @@
         -@ write sys$output "-----------------------------------------------"
         -@ write sys$output "                All done"
-@@ -163,13 +210,18 @@
+@@ -163,13 +212,18 @@
         -@ write sys$output "                Test results:"
         -@ write sys$output "-----------------------------------------------"
@@ -57570 +60644 @@
         -@ write sys$output "-----------------------------------------------"
         -@ type VMS.VIM
-@@ -179,6 +231,9 @@
+@@ -179,6 +233,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.*
@@ -57580 +60654 @@
         -@ if "''F$SEARCH("*.failed")'"     .NES. "" then delete/noconfirm/nolog *.failed.*
         -@ if "''F$SEARCH("*.rej")'"        .NES. "" then delete/noconfirm/nolog *.rej.*
-@@ -186,6 +241,6 @@
+@@ -186,6 +243,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.*
@@ -57590 +60664 @@
 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-03-30 20:09:04.772730962 +0000
-@@ -29,7 +29,9 @@
++++ vim74/src/testdir/Makefile  2014-04-27 05:20:58.385108623 +0000
+@@ -3,6 +3,7 @@
+ #
+ 
+ VIMPROG = ../vim
++SCRIPTSOURCE = ../../runtime
+ 
+ # Uncomment this line to use valgrind for memory leaks and extra warnings.
+ #   The output goes into a file "valgrind.testN"
+@@ -29,7 +30,10 @@
                 test79.out test80.out test81.out test82.out test83.out \
                 test84.out test85.out test86.out test87.out test88.out \
@@ -57598 +60680 @@
 +               test94.out test95.out test96.out test97.out test98.out \
 +               test99.out test100.out test101.out test102.out test103.out \
-+               test104.out test105.out test106.out
++               test104.out test105.out test106.out \
++               test_options.out
  
  SCRIPTS_GUI = test16.out
  
-@@ -57,9 +59,13 @@
+@@ -51,15 +55,19 @@
+ 
+ RM_ON_RUN = test.out X* viminfo
+ RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok
+-RUN_VIM = $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in
++RUN_VIM = export VIMRUNTIME=$(SCRIPTSOURCE); $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in
+ 
+ clean:
         -rm -rf *.out *.failed *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.*
  
@@ -57620 +60710 @@
 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-03-30 20:09:04.779397848 +0000
++++ vim74/src/testdir/sautest/autoload/Test104.vim      2014-04-27 05:20:58.391775454 +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-03-30 20:09:04.779397848 +0000
++++ vim74/src/testdir/sautest/autoload/footest.vim      2014-04-27 05:20:58.391775454 +0000
 @@ -0,0 +1,5 @@
 +" Autoload script used by test55 and test60
@@ -57634 +60724 @@
 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-03-30 20:09:04.779397848 +0000
++++ vim74/src/testdir/test1.in  2014-04-27 05:20:58.391775454 +0000
 @@ -18,6 +18,10 @@
  Similar logic is applied to the +lua feature, using lua.vim.
@@ -57648 +60738 @@
 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-03-30 20:09:04.779397848 +0000
++++ vim74/src/testdir/test100.in        2014-04-27 05:20:58.395108870 +0000
 @@ -0,0 +1,50 @@
 +Tests for 'undolevel' and 'lispwords' settings being global-local
@@ -57702 +60792 @@
 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-03-30 20:09:04.779397848 +0000
++++ vim74/src/testdir/test100.ok        2014-04-27 05:20:58.395108870 +0000
 @@ -0,0 +1,51 @@
 +ONE: expecting global undolevels: 5, local undolevels: -123456 (default)
@@ -57757 +60847 @@
 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-03-30 20:09:04.779397848 +0000
++++ vim74/src/testdir/test101.in        2014-04-27 05:20:58.395108870 +0000
 @@ -0,0 +1,45 @@
 +Test for v:hlsearch     vim: set ft=vim :
@@ -57806 +60896 @@
 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-03-30 20:09:04.782731291 +0000
++++ vim74/src/testdir/test101.ok        2014-04-27 05:20:58.395108870 +0000
 @@ -0,0 +1,11 @@
 +start:
@@ -57821 +60911 @@
 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-03-30 20:09:04.782731291 +0000
++++ vim74/src/testdir/test102.in        2014-04-27 05:20:58.395108870 +0000
 @@ -0,0 +1,12 @@
 +Test if fnameescape is correct for special chars like !
@@ -57837 +60927 @@
 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-03-30 20:09:04.782731291 +0000
++++ vim74/src/testdir/test102.ok        2014-04-27 05:20:58.395108870 +0000
 @@ -0,0 +1,3 @@
 +
@@ -57844 +60934 @@
 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-03-30 20:09:04.782731291 +0000
++++ vim74/src/testdir/test103.in        2014-04-27 05:20:58.395108870 +0000
 @@ -0,0 +1,37 @@
 +Test for visual mode not being reset causing E315 error.
@@ -57885 +60975 @@
 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-03-30 20:09:04.782731291 +0000
++++ vim74/src/testdir/test103.ok        2014-04-27 05:20:58.395108870 +0000
 @@ -0,0 +1,2 @@
 +
@@ -57891 +60981 @@
 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-03-30 20:09:04.782731291 +0000
++++ vim74/src/testdir/test104.in        2014-04-27 05:20:58.395108870 +0000
 @@ -0,0 +1,30 @@
 +Tests for :let.  vim: set ft=vim ts=8 :
@@ -57925 +61015 @@
 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-03-30 20:09:04.782731291 +0000
++++ vim74/src/testdir/test104.ok        2014-04-27 05:20:58.395108870 +0000
 @@ -0,0 +1,13 @@
 +Results of test104:
@@ -57942 +61032 @@
 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-03-30 20:09:04.782731291 +0000
++++ vim74/src/testdir/test105.in        2014-04-27 05:20:58.395108870 +0000
 @@ -0,0 +1,45 @@
 +Test filename modifiers     vim: set ft=vim :
@@ -57991 +61081 @@
 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-03-30 20:09:04.782731291 +0000
++++ vim74/src/testdir/test105.ok        2014-04-27 05:20:58.398442287 +0000
 @@ -0,0 +1,29 @@
 +fnamemodify('.',              ':p'      )[-1:] '/'
@@ -58024 +61114 @@
 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-03-30 20:09:04.782731291 +0000
++++ vim74/src/testdir/test106.in        2014-04-27 05:20:58.398442287 +0000
 @@ -0,0 +1,16 @@
 +Tests for errorformat.  vim: set ft=vim ts=8 :
@@ -58044 +61134 @@
 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-03-30 20:09:04.786064734 +0000
++++ vim74/src/testdir/test106.ok        2014-04-27 05:20:58.398442287 +0000
 @@ -0,0 +1,4 @@
 +Results of test106:
@@ -58052 +61142 @@
 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-03-30 20:09:04.786064734 +0000
++++ vim74/src/testdir/test14.in 2014-04-27 05:20:58.398442287 +0000
 @@ -47,7 +47,19 @@
  /two
@@ -58084 +61174 @@
 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-03-30 20:09:04.786064734 +0000
++++ vim74/src/testdir/test14.ok 2014-04-27 05:20:58.398442287 +0000
 @@ -20,3 +20,7 @@
  1
@@ -58095 +61185 @@
 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-03-30 20:09:04.789398178 +0000
++++ vim74/src/testdir/test20.in 2014-04-27 05:20:58.401775704 +0000
 @@ -9,11 +9,17 @@
  @auY:quit!
@@ -58118 +61208 @@
 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-03-30 20:09:04.789398178 +0000
++++ vim74/src/testdir/test20.ok 2014-04-27 05:20:58.401775704 +0000
 @@ -1,3 +1,7 @@
 +123start here56
@@ -58129 +61219 @@
 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-03-30 20:09:04.799398506 +0000
++++ vim74/src/testdir/test32.in 2014-04-27 05:20:58.408442535 +0000
 @@ -36,6 +36,9 @@
  :w Xtest11.one
@@ -58142 +61232 @@
 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-03-30 20:09:04.799398506 +0000
++++ vim74/src/testdir/test34.in 2014-04-27 05:20:58.411775950 +0000
 @@ -1,6 +1,7 @@
  Test for user functions.
@@ -58172 +61262 @@
 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-03-30 20:09:04.799398506 +0000
++++ vim74/src/testdir/test34.ok 2014-04-27 05:20:58.411775950 +0000
 @@ -6,3 +6,5 @@
  1. one again
@@ -58181 +61271 @@
 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-03-30 20:09:04.799398506 +0000
++++ vim74/src/testdir/test37.ok 2014-04-27 05:20:58.411775950 +0000
 @@ -27,7 +27,7 @@
  
@@ -58195 +61285 @@
 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-03-30 20:09:04.802731950 +0000
++++ vim74/src/testdir/test39.in 2014-04-27 05:20:58.415109367 +0000
 @@ -19,6 +19,28 @@
  :" Test block-change
@@ -58267 +61357 @@
 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-03-30 20:09:04.802731950 +0000
++++ vim74/src/testdir/test39.ok 2014-04-27 05:20:58.415109367 +0000
 @@ -3,6 +3,24 @@
  axyzqqqqef mno        ghijklm
@@ -58321 +61411 @@
 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-03-30 20:09:04.806065393 +0000
++++ vim74/src/testdir/test44.in 2014-04-27 05:20:58.418442783 +0000
 @@ -1,9 +1,11 @@
  Tests for regexp with multi-byte encoding and various magic settings.
@@ -58336 +61426 @@
 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-03-30 20:09:04.812732279 +0000
++++ vim74/src/testdir/test53.in 2014-04-27 05:20:58.421776200 +0000
 @@ -4,6 +4,8 @@
  
@@ -58410 +61500 @@
 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-03-30 20:09:04.812732279 +0000
++++ vim74/src/testdir/test53.ok 2014-04-27 05:20:58.425109616 +0000
 @@ -18,6 +18,28 @@
  a
@@ -58459 +61549 @@
 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-03-30 20:09:04.812732279 +0000
++++ vim74/src/testdir/test55.in 2014-04-27 05:20:58.425109616 +0000
 @@ -282,6 +282,13 @@
  :    $put =ps
@@ -58494 +61584 @@
 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-03-30 20:09:04.812732279 +0000
++++ vim74/src/testdir/test55.ok 2014-04-27 05:20:58.425109616 +0000
 @@ -86,16 +86,21 @@
  FFpFFpp
@@ -58524 +61614 @@
 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-03-30 20:09:04.816065722 +0000
++++ vim74/src/testdir/test60.in 2014-04-27 05:20:58.428443032 +0000
 @@ -1,4 +1,4 @@
 -Tests for the exists() function.  vim: set ft=vim :
-+Tests for the exists() function.  vim: set ft=vim ts=8 :
++Tests for the exists() and has() functions.  vim: set ft=vim ts=8 sw=2 :
  
  STARTTEST
@@ -58575 +61665 @@
      let local_list = ["blue", "orange"]
      echo 'local_list: 1'
-@@ -566,6 +581,10 @@
+@@ -566,9 +581,23 @@
  
      call TestFuncArg("arg1", "arg2")
@@ -58586 +61676 @@
  endfunction
  :call TestExists()
-@@ -576,5 +595,6 @@
++:"
++:function TestHas()
++  redir >> test.out
++  for pl in ['6.9.999', '7.1.999', '7.4.123', '9.1.0', '9.9.1']
++    echo 'has patch ' . pl . ': ' . has('patch-' . pl)
++  endfor
++  redir END
++endfunc
++:call TestHas()
++:"
+ :delfunc TestExists
+ :delfunc RunTest
+ :delfunc TestFuncArg
+@@ -576,5 +605,6 @@
  :set ff=unix
  :w
@@ -58595 +61698 @@
 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-03-30 20:09:04.816065722 +0000
++++ vim74/src/testdir/test60.ok 2014-04-27 05:20:58.428443032 +0000
 @@ -71,6 +71,10 @@
  OK
@@ -58616 +61719 @@
  OK
  local_list[1]: 1
-@@ -195,3 +201,6 @@
+@@ -195,3 +201,11 @@
  OK
  a:2: 0
@@ -58623 +61726 @@
 +   footest#F() 0
 +UndefFun() 0
++has patch 6.9.999: 1
++has patch 7.1.999: 1
++has patch 7.4.123: 1
++has patch 9.1.0: 0
++has patch 9.9.1: 0
 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-03-30 20:09:04.819399166 +0000
++++ vim74/src/testdir/test64.in 2014-04-27 05:20:58.431776447 +0000
 @@ -289,15 +289,29 @@
  :call add(tl, [2, '.a\%$', " a\n "])
@@ -58716 +61824 @@
 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-03-30 20:09:04.822732609 +0000
++++ vim74/src/testdir/test64.ok 2014-04-27 05:20:58.431776447 +0000
 @@ -650,30 +650,72 @@
  OK 0 - .a\%$
@@ -58875 +61983 @@
 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-03-30 20:09:04.822732609 +0000
++++ vim74/src/testdir/test68.in 2014-04-27 05:20:58.435109863 +0000
 @@ -62,6 +62,20 @@
  }
@@ -58899 +62007 @@
 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-03-30 20:09:04.822732609 +0000
++++ vim74/src/testdir/test68.ok 2014-04-27 05:20:58.435109863 +0000
 @@ -43,6 +43,15 @@
  
@@ -58918 +62026 @@
 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-03-30 20:09:04.822732609 +0000
++++ vim74/src/testdir/test69.in 2014-04-27 05:20:58.435109863 +0000
 @@ -1,6 +1,7 @@
  Test for multi-byte text formatting.
@@ -58961 +62069 @@
 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-03-30 20:09:04.822732609 +0000
++++ vim74/src/testdir/test69.ok 2014-04-27 05:20:58.435109863 +0000
 @@ -149,3 +149,14 @@
  aaaa
@@ -58979 +62087 @@
 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-03-30 20:09:04.822732609 +0000
++++ vim74/src/testdir/test72.in 2014-04-27 05:20:58.438443280 +0000
 @@ -105,7 +105,11 @@
  u:.w >>test.out
@@ -58995 +62103 @@
 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-03-30 20:09:04.829399494 +0000
++++ vim74/src/testdir/test75.in 2014-04-27 05:20:58.438443280 +0000
 @@ -1,8 +1,11 @@
 -" Tests for functions.
@@ -59032 +62140 @@
 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-03-30 20:09:04.829399494 +0000
++++ vim74/src/testdir/test75.ok 2014-04-27 05:20:58.438443280 +0000
 @@ -4,3 +4,4 @@
  {'silent': 0, 'noremap': 0, 'lhs': 'foo', 'mode': ' ', 'nowait': 1, 'expr': 0, 'sid': 0, 'rhs': 'bar', 'buffer': 1}
@@ -59040 +62148 @@
 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-03-30 20:09:04.829399494 +0000
++++ vim74/src/testdir/test77a.com       2014-04-27 05:20:58.438443280 +0000
 @@ -0,0 +1,8 @@
 +$! test77a - help file creating checksum on VMS
@@ -59052 +62160 @@
 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-03-30 20:09:04.829399494 +0000
++++ vim74/src/testdir/test77a.in        2014-04-27 05:20:58.438443280 +0000
 @@ -0,0 +1,31 @@
 +Inserts 2 million lines with consecutive integers starting from 1
@@ -59087 +62195 @@
 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-03-30 20:09:04.829399494 +0000
++++ vim74/src/testdir/test77a.ok        2014-04-27 05:20:58.438443280 +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-04-27 05:20:58.441776697 +0000
+@@ -1,6 +1,7 @@
+ Test for *sub-replace-special* and *sub-replace-expression* on :substitute.
+ Test for submatch() on :substitue.
+ Test for *:s%* on :substitute.
++Test for :s replacing \n with  line break.
+ 
+ STARTTEST
+ :so small.vim
+@@ -181,10 +182,12 @@
+ :set cpo&
+ /^TEST/
+ j:s/A\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)/\=submatch(0) . submatch(9) . submatch(8) . submatch(7) . submatch(6) . submatch(5) . submatch(4) . submatch(3) . submatch(2) . submatch(1)/
++j:s/B\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)/\=string([submatch(0, 1), submatch(9, 1), submatch(8, 1), submatch(7, 1), submatch(6, 1), submatch(5, 1), submatch(4, 1), submatch(3, 1), submatch(2, 1), submatch(1, 1)])/
+ ENDTEST
+ 
+ TEST_5:
+ A123456789
++B123456789
+ 
+ STARTTEST
+ :set magic&
+@@ -209,6 +212,9 @@
+ /^TEST_7/
+ j:s/A./\=submatch(0)/
+ j:s/B./\=submatch(0)/
++j:s/C./\=strtrans(string(submatch(0, 1)))/
++j:s/D.\nD/\=strtrans(string(submatch(0, 1)))/
++j:s/E\_.\{-}E/\=strtrans(string(submatch(0, 1)))/
+ /^Q$
+ :s/Q[^\n]Q/\=submatch(0)."foobar"/
+ :" Avoid :s error breaks dotest map on Windows.
+@@ -217,10 +223,33 @@
+ TEST_7:
+ A
+A
+ BB
++CC
++D
++D
++E
++
++
++
++E
+ Q
+ Q
+ 
+ STARTTEST
++:function! TitleString()
++  let check = 'foo' =~ 'bar'
++  return ""
++endfunction
++:set titlestring=%{TitleString()}
++:/^test_one/s/.*/\="foo\nbar"/
++:/^test_two/s/.*/\="foo\nbar"/c
++y
++ENDTEST
++
++test_one
++test_two
++
++STARTTEST
+ :g/^STARTTEST/.,/^ENDTEST/d
+ :1;/^Results/,$wq! test.out
++:call getchar()
+ ENDTEST
+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-04-27 05:20:58.441776697 +0000
+@@ -105,6 +105,7 @@
+ 
+ TEST_5:
+ A123456789987654321
++[['B123456789'], ['9'], ['8'], ['7'], ['6'], ['5'], ['4'], ['3'], ['2'], ['1']]
+ 
+ 
+ TEST_6:
+@@ -119,6 +120,15 @@
+ A
+ B
+ B
++['C^@']C
++['D^@', 'D']
++['E^@', '^@', '^@', '^@', '^@E']
+ Q
+ Q
+ 
++
++foo
++bar
++foo
++bar
++
 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-03-30 20:09:04.832732937 +0000
-@@ -142,6 +142,8 @@
++++ vim74/src/testdir/test80.in 2014-04-27 05:20:58.441776697 +0000
+@@ -117,6 +117,7 @@
+ :set cpo&
+ :$put =\"\n\nTEST_5:\"
+ :$put =substitute('A123456789', 'A\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)', '\=submatch(0) . submatch(9) . submatch(8) . submatch(7) . submatch(6) . submatch(5) . submatch(4) . submatch(3) . submatch(2) . submatch(1)', '')
++:$put =substitute('A123456789', 'A\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)', '\=string([submatch(0, 1), submatch(9, 1), submatch(8, 1), submatch(7, 1), submatch(6, 1), submatch(5, 1), submatch(4, 1), submatch(3, 1), submatch(2, 1), submatch(1, 1)])', '')
+ /^TEST_6
+ ENDTEST
+ 
+@@ -142,6 +143,9 @@
  :$put =\"\n\nTEST_7:\"
  :$put =substitute('A
 A', 'A.', '\=submatch(0)', '')
  :$put =substitute(\"B\nB\", 'B.', '\=submatch(0)', '')
++:$put =substitute(\"B\nB\", 'B.', '\=string(submatch(0, 1))', '')
 +:$put =substitute('-bb', '\zeb', 'a', 'g')
 +:$put =substitute('-bb', '\ze', 'c', 'g')
@@ -59103 +62316 @@
  ENDTEST
  
-@@ -174,6 +176,23 @@
+@@ -174,6 +178,23 @@
  TEST_10:
  
@@ -59129 +62342 @@
 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-03-30 20:09:04.832732937 +0000
-@@ -103,6 +103,8 @@
++++ vim74/src/testdir/test80.ok 2014-04-27 05:20:58.441776697 +0000
+@@ -90,6 +90,7 @@
+ 
+ TEST_5:
+ A123456789987654321
++[['A123456789'], ['9'], ['8'], ['7'], ['6'], ['5'], ['4'], ['3'], ['2'], ['1']]
+ 
+ 
+ TEST_6:
+@@ -103,6 +104,10 @@
  A
 A
  B
  B
++['B
++']B
 +-abab
 +c-cbcbc
@@ -59140 +62363 @@
  
  TEST_8:
-@@ -113,3 +115,14 @@
+@@ -113,3 +118,14 @@
  
  TEST_9:
@@ -59157 +62380 @@
 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-03-30 20:09:04.836066381 +0000
++++ vim74/src/testdir/test86.in 2014-04-27 05:20:58.445110113 +0000
 @@ -39,6 +39,7 @@
  py << EOF
@@ -59494 +62717 @@
 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-03-30 20:09:04.836066381 +0000
++++ vim74/src/testdir/test86.ok 2014-04-27 05:20:58.448443529 +0000
 @@ -41,6 +41,9 @@
  [2, 3]
@@ -59722 +62945 @@
 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-03-30 20:09:04.836066381 +0000
++++ vim74/src/testdir/test87.in 2014-04-27 05:20:58.448443529 +0000
 @@ -33,6 +33,7 @@
  py3 << EOF
@@ -60084 +63307 @@
 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-03-30 20:09:04.839399824 +0000
++++ vim74/src/testdir/test87.ok 2014-04-27 05:20:58.448443529 +0000
 @@ -41,6 +41,9 @@
  [2, 3]
@@ -60323 +63546 @@
 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-03-30 20:09:04.842733267 +0000
++++ vim74/src/testdir/test92.in 2014-04-27 05:20:58.451776944 +0000
 @@ -33,7 +33,7 @@
  :mksession! test.out
@@ -60335 +63558 @@
 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-03-30 20:09:04.842733267 +0000
++++ vim74/src/testdir/test93.in 2014-04-27 05:20:58.451776944 +0000
 @@ -33,7 +33,7 @@
  :mksession! test.out
@@ -60347 +63570 @@
 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-03-30 20:09:04.846066710 +0000
++++ vim74/src/testdir/test99.in 2014-04-27 05:20:58.455110360 +0000
 @@ -0,0 +1,68 @@
 +Tests for regexp with multi-byte encoding and various magic settings.
@@ -60425 +63648 @@
 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-03-30 20:09:04.846066710 +0000
++++ vim74/src/testdir/test99.ok 2014-04-27 05:20:58.455110360 +0000
 @@ -0,0 +1,24 @@
 +1 a aa abb abbcc
@@ -60456 +63679 @@
 +א
 +ג
+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-04-27 05:20:58.455110360 +0000
+@@ -0,0 +1,188 @@
++Test for various eval features.   vim: set ft=vim :
++
++Note: system clipboard support is not tested. I do not think anybody will thank 
++me for messing with clipboard.
++
++STARTTEST
++:so small.vim
++:set encoding=latin1
++:set noswapfile
++:lang C
++:fun AppendRegContents(reg)
++    call append('$', printf('%s: type %s; value: %s (%s), expr: %s (%s)', a:reg, getregtype(a:reg), getreg(a:reg), string(getreg(a:reg, 0, 1)), getreg(a:reg, 1), string(getreg(a:reg, 1, 1))))
++endfun
++:command -nargs=? AR :call AppendRegContents(<q-args>)
++:fun SetReg(...)
++    call call('setreg', a:000)
++    call append('$', printf('{{{2 setreg(%s)', string(a:000)[1:-2]))
++    call AppendRegContents(a:1)
++    if a:1 isnot# '='
++        execute "silent normal! Go==\n==\e\"".a:1."P"
++    endif
++endfun
++:fun ErrExe(str)
++    call append('$', 'Executing '.a:str)
++    try
++        execute a:str
++    catch
++        $put =v:exception
++    endtry
++endfun
++:fun Test()
++$put ='{{{1 let tests'
++let @" = 'abc'
++AR "
++let @" = "abc\n"
++AR "
++let @" = "abc\<C-m>"
++AR "
++let @= = '"abc"'
++AR =
++
++$put ='{{{1 Basic setreg tests'
++call SetReg('a', 'abcA', 'c')
++call SetReg('b', 'abcB', 'v')
++call SetReg('c', 'abcC', 'l')
++call SetReg('d', 'abcD', 'V')
++call SetReg('e', 'abcE', 'b')
++call SetReg('f', 'abcF', "\<C-v>")
++call SetReg('g', 'abcG', 'b10')
++call SetReg('h', 'abcH', "\<C-v>10")
++call SetReg('I', 'abcI')
++
++$put ='{{{1 Appending single lines with setreg()'
++call SetReg('A', 'abcAc', 'c')
++call SetReg('A', 'abcAl', 'l')
++call SetReg('A', 'abcAc2','c')
++call SetReg('b', 'abcBc', 'ca')
++call SetReg('b', 'abcBb', 'ba')
++call SetReg('b', 'abcBc2','ca')
++call SetReg('b', 'abcBb2','b50a')
++
++call SetReg('C', 'abcCl', 'l')
++call SetReg('C', 'abcCc', 'c')
++call SetReg('D', 'abcDb', 'b')
++
++call SetReg('E', 'abcEb', 'b')
++call SetReg('E', 'abcEl', 'l')
++call SetReg('F', 'abcFc', 'c')
++
++$put ='{{{1 Appending NL with setreg()'
++call setreg('a', 'abcA2', 'c')
++call setreg('b', 'abcB2', 'v')
++call setreg('c', 'abcC2', 'l')
++call setreg('d', 'abcD2', 'V')
++call setreg('e', 'abcE2', 'b')
++call setreg('f', 'abcF2', "\<C-v>")
++call setreg('g', 'abcG2', 'b10')
++call setreg('h', 'abcH2', "\<C-v>10")
++call setreg('I', 'abcI2')
++
++call SetReg('A', "\n")
++call SetReg('B', "\n", 'c')
++call SetReg('C', "\n")
++call SetReg('D', "\n", 'l')
++call SetReg('E', "\n")
++call SetReg('F', "\n", 'b')
++
++$put ='{{{1 Setting lists with setreg()'
++call SetReg('a', ['abcA3'], 'c')
++call SetReg('b', ['abcB3'], 'l')
++call SetReg('c', ['abcC3'], 'b')
++call SetReg('d', ['abcD3'])
++call SetReg('e', [1, 2, 'abc', 3])
++call SetReg('f', [1, 2, 3])
++
++$put ='{{{1 Appending lists with setreg()'
++call SetReg('A', ['abcA3c'], 'c')
++call SetReg('b', ['abcB3l'], 'la')
++call SetReg('C', ['abcC3b'], 'lb')
++call SetReg('D', ['abcD32'])
++
++call SetReg('A', ['abcA32'])
++call SetReg('B', ['abcB3c'], 'c')
++call SetReg('C', ['abcC3l'], 'l')
++call SetReg('D', ['abcD3b'], 'b')
++
++$put ='{{{1 Appending lists with NL with setreg()'
++call SetReg('A', ["\n", 'abcA3l2'], 'l')
++call SetReg('B', ["\n", 'abcB3c2'], 'c')
++call SetReg('C', ["\n", 'abcC3b2'], 'b')
++call SetReg('D', ["\n", 'abcD3b50'],'b50')
++
++$put ='{{{1 Setting lists with NLs with setreg()'
++call SetReg('a', ['abcA4-0', "\n", "abcA4-2\n", "\nabcA4-3", "abcA4-4\nabcA4-4-2"])
++call SetReg('b', ['abcB4c-0', "\n", "abcB4c-2\n", "\nabcB4c-3", "abcB4c-4\nabcB4c-4-2"], 'c')
++call SetReg('c', ['abcC4l-0', "\n", "abcC4l-2\n", "\nabcC4l-3", "abcC4l-4\nabcC4l-4-2"], 'l')
++call SetReg('d', ['abcD4b-0', "\n", "abcD4b-2\n", "\nabcD4b-3", "abcD4b-4\nabcD4b-4-2"], 'b')
++call SetReg('e', ['abcE4b10-0', "\n", "abcE4b10-2\n", "\nabcE4b10-3", "abcE4b10-4\nabcE4b10-4-2"], 'b10')
++
++$put ='{{{1 Search and expressions'
++call SetReg('/', ['abc/'])
++call SetReg('/', ["abc/\n"])
++call SetReg('=', ['"abc/"'])
++call SetReg('=', ["\"abc/\n\""])
++
++$put ='{{{1 Errors'
++call ErrExe('call setreg()')
++call ErrExe('call setreg(1)')
++call ErrExe('call setreg(1, 2, 3, 4)')
++call ErrExe('call setreg([], 2)')
++call ErrExe('call setreg(1, {})')
++call ErrExe('call setreg(1, 2, [])')
++call ErrExe('call setreg("/", ["1", "2"])')
++call ErrExe('call setreg("=", ["1", "2"])')
++call ErrExe('call setreg(1, ["", "", [], ""])')
++endfun
++:"
++:call Test()
++:"
++:delfunction SetReg
++:delfunction AppendRegContents
++:delfunction ErrExe
++:delfunction Test
++:delcommand AR
++:call garbagecollect(1)
++:"
++:" function name not starting with capital
++:try
++:func! g:test()
++:echo "test"
++:endfunc
++:catch
++:$put =v:exception
++:endtry
++:"
++:" function name includes a colon
++:try
++:func! b:test()
++:echo "test"
++:endfunc
++:catch
++:$put =v:exception
++:endtry
++:"
++:" function name folowed by #
++:try
++:func! test2() "#
++:echo "test2"
++:endfunc
++:catch
++:$put =v:exception
++:endtry
++:"
++:" function name starting with/without "g:", buffer-local funcref.
++:function! g:Foo(n)
++:  $put ='called Foo(' . a:n . ')'
++:endfunction
++:let b:my_func = function('Foo')
++:call b:my_func(1)
++:echo g:Foo(2)
++:echo Foo(3)
++:"
++:/^start:/+1,$wq! test.out
++:" vim: et ts=4 isk-=\: fmr=???,???
++:call getchar()
++ENDTEST
++
++start:
+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-04-27 05:20:58.458443777 +0000
+@@ -0,0 +1,343 @@
++{{{1 let tests
++": type v; value: abc (['abc']), expr: abc (['abc'])
++": type V; value: abc (['abc']), expr: abc (['abc'])
++": type V; value: abc
+ (['abc
+']), expr: abc
+ (['abc
+'])
++=: type v; value: abc (['abc']), expr: "abc" (['"abc"'])
++{{{1 Basic setreg tests
++{{{2 setreg('a', 'abcA', 'c')
++a: type v; value: abcA (['abcA']), expr: abcA (['abcA'])
++==
++=abcA=
++{{{2 setreg('b', 'abcB', 'v')
++b: type v; value: abcB (['abcB']), expr: abcB (['abcB'])
++==
++=abcB=
++{{{2 setreg('c', 'abcC', 'l')
++c: type V; value: abcC (['abcC']), expr: abcC (['abcC'])
++==
++abcC
++==
++{{{2 setreg('d', 'abcD', 'V')
++d: type V; value: abcD (['abcD']), expr: abcD (['abcD'])
++==
++abcD
++==
++{{{2 setreg('e', 'abcE', 'b')
++e: type 4; value: abcE (['abcE']), expr: abcE (['abcE'])
++==
++=abcE=
++{{{2 setreg('f', 'abcF', '')
++f: type 4; value: abcF (['abcF']), expr: abcF (['abcF'])
++==
++=abcF=
++{{{2 setreg('g', 'abcG', 'b10')
++g: type 10; value: abcG (['abcG']), expr: abcG (['abcG'])
++==
++=abcG      =
++{{{2 setreg('h', 'abcH', '10')
++h: type 10; value: abcH (['abcH']), expr: abcH (['abcH'])
++==
++=abcH      =
++{{{2 setreg('I', 'abcI')
++I: type v; value: abcI (['abcI']), expr: abcI (['abcI'])
++==
++=abcI=
++{{{1 Appending single lines with setreg()
++{{{2 setreg('A', 'abcAc', 'c')
++A: type v; value: abcAabcAc (['abcAabcAc']), expr: abcAabcAc (['abcAabcAc'])
++==
++=abcAabcAc=
++{{{2 setreg('A', 'abcAl', 'l')
++A: type V; value: abcAabcAcabcAl (['abcAabcAcabcAl']), expr: abcAabcAcabcAl (['abcAabcAcabcAl'])
++==
++abcAabcAcabcAl
++==
++{{{2 setreg('A', 'abcAc2', 'c')
++A: type v; value: abcAabcAcabcAlabcAc2 (['abcAabcAcabcAl', 'abcAc2']), expr: abcAabcAcabcAlabcAc2 (['abcAabcAcabcAl', 'abcAc2'])
++==
++=abcAabcAcabcAl
++abcAc2=
++{{{2 setreg('b', 'abcBc', 'ca')
++b: type v; value: abcBabcBc (['abcBabcBc']), expr: abcBabcBc (['abcBabcBc'])
++==
++=abcBabcBc=
++{{{2 setreg('b', 'abcBb', 'ba')
++b: type 5; value: abcBabcBcabcBb (['abcBabcBcabcBb']), expr: abcBabcBcabcBb (['abcBabcBcabcBb'])
++==
++=abcBabcBcabcBb=
++{{{2 setreg('b', 'abcBc2', 'ca')
++b: type v; value: abcBabcBcabcBbabcBc2 (['abcBabcBcabcBb', 'abcBc2']), expr: abcBabcBcabcBbabcBc2 (['abcBabcBcabcBb', 'abcBc2'])
++==
++=abcBabcBcabcBb
++abcBc2=
++{{{2 setreg('b', 'abcBb2', 'b50a')
++b: type 50; value: abcBabcBcabcBbabcBc2abcBb2 (['abcBabcBcabcBb', 'abcBc2abcBb2']), expr: abcBabcBcabcBbabcBc2abcBb2 (['abcBabcBcabcBb', 'abcBc2abcBb2'])
++==
++=abcBabcBcabcBb                                    =
++ abcBc2abcBb2
++{{{2 setreg('C', 'abcCl', 'l')
++C: type V; value: abcCabcCl (['abcC', 'abcCl']), expr: abcCabcCl (['abcC', 'abcCl'])
++==
++abcC
++abcCl
++==
++{{{2 setreg('C', 'abcCc', 'c')
++C: type v; value: abcCabcClabcCc (['abcC', 'abcCl', 'abcCc']), expr: abcCabcClabcCc (['abcC', 'abcCl', 'abcCc'])
++==
++=abcC
++abcCl
++abcCc=
++{{{2 setreg('D', 'abcDb', 'b')
++D: type 5; value: abcDabcDb (['abcD', 'abcDb']), expr: abcDabcDb (['abcD', 'abcDb'])
++==
++=abcD =
++ abcDb
++{{{2 setreg('E', 'abcEb', 'b')
++E: type 5; value: abcEabcEb (['abcE', 'abcEb']), expr: abcEabcEb (['abcE', 'abcEb'])
++==
++=abcE =
++ abcEb
++{{{2 setreg('E', 'abcEl', 'l')
++E: type V; value: abcEabcEbabcEl (['abcE', 'abcEb', 'abcEl']), expr: abcEabcEbabcEl (['abcE', 'abcEb', 'abcEl'])
++==
++abcE
++abcEb
++abcEl
++==
++{{{2 setreg('F', 'abcFc', 'c')
++F: type v; value: abcFabcFc (['abcF', 'abcFc']), expr: abcFabcFc (['abcF', 'abcFc'])
++==
++=abcF
++abcFc=
++{{{1 Appending NL with setreg()
++{{{2 setreg('A', '')
++A: type V; value: abcA2 (['abcA2']), expr: abcA2 (['abcA2'])
++==
++abcA2
++==
++{{{2 setreg('B', '', 'c')
++B: type v; value: abcB2 (['abcB2', '']), expr: abcB2 (['abcB2', ''])
++==
++=abcB2
++=
++{{{2 setreg('C', '')
++C: type V; value: abcC2 (['abcC2', '']), expr: abcC2 (['abcC2', ''])
++==
++abcC2
++
++==
++{{{2 setreg('D', '', 'l')
++D: type V; value: abcD2 (['abcD2', '']), expr: abcD2 (['abcD2', ''])
++==
++abcD2
++
++==
++{{{2 setreg('E', '')
++E: type V; value: abcE2 (['abcE2', '']), expr: abcE2 (['abcE2', ''])
++==
++abcE2
++
++==
++{{{2 setreg('F', '', 'b')
++F: type 0; value: abcF2 (['abcF2', '']), expr: abcF2 (['abcF2', ''])
++==
++=abcF2=
++ 
++{{{1 Setting lists with setreg()
++{{{2 setreg('a', ['abcA3'], 'c')
++a: type v; value: abcA3 (['abcA3']), expr: abcA3 (['abcA3'])
++==
++=abcA3=
++{{{2 setreg('b', ['abcB3'], 'l')
++b: type V; value: abcB3 (['abcB3']), expr: abcB3 (['abcB3'])
++==
++abcB3
++==
++{{{2 setreg('c', ['abcC3'], 'b')
++c: type 5; value: abcC3 (['abcC3']), expr: abcC3 (['abcC3'])
++==
++=abcC3=
++{{{2 setreg('d', ['abcD3'])
++d: type V; value: abcD3 (['abcD3']), expr: abcD3 (['abcD3'])
++==
++abcD3
++==
++{{{2 setreg('e', [1, 2, 'abc', 3])
++e: type V; value: 12abc3 (['1', '2', 'abc', '3']), expr: 12abc3 (['1', '2', 'abc', '3'])
++==
++1
++2
++abc
++3
++==
++{{{2 setreg('f', [1, 2, 3])
++f: type V; value: 123 (['1', '2', '3']), expr: 123 (['1', '2', '3'])
++==
++1
++2
++3
++==
++{{{1 Appending lists with setreg()
++{{{2 setreg('A', ['abcA3c'], 'c')
++A: type v; value: abcA3abcA3c (['abcA3', 'abcA3c']), expr: abcA3abcA3c (['abcA3', 'abcA3c'])
++==
++=abcA3
++abcA3c=
++{{{2 setreg('b', ['abcB3l'], 'la')
++b: type V; value: abcB3abcB3l (['abcB3', 'abcB3l']), expr: abcB3abcB3l (['abcB3', 'abcB3l'])
++==
++abcB3
++abcB3l
++==
++{{{2 setreg('C', ['abcC3b'], 'lb')
++C: type 6; value: abcC3abcC3b (['abcC3', 'abcC3b']), expr: abcC3abcC3b (['abcC3', 'abcC3b'])
++==
++=abcC3 =
++ abcC3b
++{{{2 setreg('D', ['abcD32'])
++D: type V; value: abcD3abcD32 (['abcD3', 'abcD32']), expr: abcD3abcD32 (['abcD3', 'abcD32'])
++==
++abcD3
++abcD32
++==
++{{{2 setreg('A', ['abcA32'])
++A: type V; value: abcA3abcA3cabcA32 (['abcA3', 'abcA3c', 'abcA32']), expr: abcA3abcA3cabcA32 (['abcA3', 'abcA3c', 'abcA32'])
++==
++abcA3
++abcA3c
++abcA32
++==
++{{{2 setreg('B', ['abcB3c'], 'c')
++B: type v; value: abcB3abcB3labcB3c (['abcB3', 'abcB3l', 'abcB3c']), expr: abcB3abcB3labcB3c (['abcB3', 'abcB3l', 'abcB3c'])
++==
++=abcB3
++abcB3l
++abcB3c=
++{{{2 setreg('C', ['abcC3l'], 'l')
++C: type V; value: abcC3abcC3babcC3l (['abcC3', 'abcC3b', 'abcC3l']), expr: abcC3abcC3babcC3l (['abcC3', 'abcC3b', 'abcC3l'])
++==
++abcC3
++abcC3b
++abcC3l
++==
++{{{2 setreg('D', ['abcD3b'], 'b')
++D: type 6; value: abcD3abcD32abcD3b (['abcD3', 'abcD32', 'abcD3b']), expr: abcD3abcD32abcD3b (['abcD3', 'abcD32', 'abcD3b'])
++==
++=abcD3 =
++ abcD32
++ abcD3b
++{{{1 Appending lists with NL with setreg()
++{{{2 setreg('A', ['', 'abcA3l2'], 'l')
++A: type V; value: abcA3abcA3cabcA32abcA3l2 (['abcA3', 'abcA3c', 'abcA32', '', 'abcA3l2']), expr: abcA3abcA3cabcA32abcA3l2 (['abcA3', 'abcA3c', 'abcA32', '', 'abcA3l2'])
++==
++abcA3
++abcA3c
++abcA32
++
++abcA3l2
++==
++{{{2 setreg('B', ['', 'abcB3c2'], 'c')
++B: type v; value: abcB3abcB3labcB3cabcB3c2 (['abcB3', 'abcB3l', 'abcB3c', '', 'abcB3c2']), expr: abcB3abcB3labcB3cabcB3c2 (['abcB3', 'abcB3l', 'abcB3c', '', 'abcB3c2'])
++==
++=abcB3
++abcB3l
++abcB3c
++
++abcB3c2=
++{{{2 setreg('C', ['', 'abcC3b2'], 'b')
++C: type 7; value: abcC3abcC3babcC3labcC3b2 (['abcC3', 'abcC3b', 'abcC3l', '', 'abcC3b2']), expr: abcC3abcC3babcC3labcC3b2 (['abcC3', 'abcC3b', 'abcC3l', '', 'abcC3b2'])
++==
++=abcC3  =
++ abcC3b
++ abcC3l
++ 
++ abcC3b2
++{{{2 setreg('D', ['', 'abcD3b50'], 'b50')
++D: type 50; value: abcD3abcD32abcD3babcD3b50 (['abcD3', 'abcD32', 'abcD3b', '', 'abcD3b50']), expr: abcD3abcD32abcD3babcD3b50 (['abcD3', 'abcD32', 'abcD3b', '', 'abcD3b50'])
++==
++=abcD3                                             =
++ abcD32
++ abcD3b
++ 
++ abcD3b50
++{{{1 Setting lists with NLs with setreg()
++{{{2 setreg('a', ['abcA4-0', '', 'abcA4-2', 'abcA4-3', 'abcA4-4abcA4-4-2'])
++a: type V; value: abcA4-0abcA4-2abcA4-3abcA4-4abcA4-4-2 (['abcA4-0', '', 'abcA4-2', 'abcA4-3', 'abcA4-4abcA4-4-2']), expr: abcA4-0abcA4-2abcA4-3abcA4-4abcA4-4-2 (['abcA4-0', '', 'abcA4-2', 'abcA4-3', 'abcA4-4abcA4-4-2'])
++==
++abcA4-0
++
++abcA4-2
++abcA4-3
++abcA4-4abcA4-4-2
++==
++{{{2 setreg('b', ['abcB4c-0', '', 'abcB4c-2', 'abcB4c-3', 'abcB4c-4abcB4c-4-2'], 'c')
++b: type v; value: abcB4c-0abcB4c-2abcB4c-3abcB4c-4abcB4c-4-2 (['abcB4c-0', '', 'abcB4c-2', 'abcB4c-3', 'abcB4c-4abcB4c-4-2']), expr: abcB4c-0abcB4c-2abcB4c-3abcB4c-4abcB4c-4-2 (['abcB4c-0', '', 'abcB4c-2', 'abcB4c-3', 'abcB4c-4abcB4c-4-2'])
++==
++=abcB4c-0
++
++abcB4c-2
++abcB4c-3
++abcB4c-4abcB4c-4-2=
++{{{2 setreg('c', ['abcC4l-0', '', 'abcC4l-2', 'abcC4l-3', 'abcC4l-4abcC4l-4-2'], 'l')
++c: type V; value: abcC4l-0abcC4l-2abcC4l-3abcC4l-4abcC4l-4-2 (['abcC4l-0', '', 'abcC4l-2', 'abcC4l-3', 'abcC4l-4abcC4l-4-2']), expr: abcC4l-0abcC4l-2abcC4l-3abcC4l-4abcC4l-4-2 (['abcC4l-0', '', 'abcC4l-2', 'abcC4l-3', 'abcC4l-4abcC4l-4-2'])
++==
++abcC4l-0
++
++abcC4l-2
++abcC4l-3
++abcC4l-4abcC4l-4-2
++==
++{{{2 setreg('d', ['abcD4b-0', '', 'abcD4b-2', 'abcD4b-3', 'abcD4b-4abcD4b-4-2'], 'b')
++d: type 19; value: abcD4b-0abcD4b-2abcD4b-3abcD4b-4abcD4b-4-2 (['abcD4b-0', '', 'abcD4b-2', 'abcD4b-3', 'abcD4b-4abcD4b-4-2']), expr: abcD4b-0abcD4b-2abcD4b-3abcD4b-4abcD4b-4-2 (['abcD4b-0', '', 'abcD4b-2', 'abcD4b-3', 'abcD4b-4abcD4b-4-2'])
++==
++=abcD4b-0           =
++ 
++ abcD4b-2
++ abcD4b-3
++ abcD4b-4abcD4b-4-2
++{{{2 setreg('e', ['abcE4b10-0', '', 'abcE4b10-2', 'abcE4b10-3', 'abcE4b10-4abcE4b10-4-2'], 'b10')
++e: type 10; value: abcE4b10-0abcE4b10-2abcE4b10-3abcE4b10-4abcE4b10-4-2 (['abcE4b10-0', '', 'abcE4b10-2', 'abcE4b10-3', 'abcE4b10-4abcE4b10-4-2']), expr: abcE4b10-0abcE4b10-2abcE4b10-3abcE4b10-4abcE4b10-4-2 (['abcE4b10-0', '', 'abcE4b10-2', 'abcE4b10-3', 'abcE4b10-4abcE4b10-4-2'])
++==
++=abcE4b10-0=
++ 
++ abcE4b10-2
++ abcE4b10-3
++ abcE4b10-4abcE4b10-4-2
++{{{1 Search and expressions
++{{{2 setreg('/', ['abc/'])
++/: type v; value: abc/ (['abc/']), expr: abc/ (['abc/'])
++==
++=abc/=
++{{{2 setreg('/', ['abc/'])
++/: type v; value: abc/ (['abc/']), expr: abc/ (['abc/'])
++==
++=abc/=
++{{{2 setreg('=', ['"abc/"'])
++=: type v; value: abc/ (['abc/']), expr: "abc/" (['"abc/"'])
++{{{2 setreg('=', ['"abc/"'])
++=: type v; value: abc/ (['abc/']), expr: "abc/" (['"abc/"'])
++{{{1 Errors
++Executing call setreg()
++Vim(call):E119: Not enough arguments for function: setreg
++Executing call setreg(1)
++Vim(call):E119: Not enough arguments for function: setreg
++Executing call setreg(1, 2, 3, 4)
++Vim(call):E118: Too many arguments for function: setreg
++Executing call setreg([], 2)
++Vim(call):E730: using List as a String
++Executing call setreg(1, {})
++Vim(call):E731: using Dictionary as a String
++Executing call setreg(1, 2, [])
++Vim(call):E730: using List as a String
++Executing call setreg("/", ["1", "2"])
++Vim(call):E883: search pattern and expression register may not contain two or more lines
++Executing call setreg("=", ["1", "2"])
++Vim(call):E883: search pattern and expression register may not contain two or more lines
++Executing call setreg(1, ["", "", [], ""])
++Vim(call):E730: using List as a String
++Vim(function):E128: Function name must start with a capital or "s:": g:test()
++Vim(function):E128: Function name must start with a capital or "s:": b:test()
++Vim(function):E128: Function name must start with a capital or "s:": test2() "#
++called Foo(1)
++called Foo(2)
++called Foo(3)
+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-04-27 05:20:58.458443777 +0000
+@@ -0,0 +1,17 @@
++Test for ":options".
++
++STARTTEST
++:so small.vim
++:let caught = 'ok'
++:try
++  :options
++:catch 
++  :let caught = v:throwpoint . "\n" . v:exception
++:endtry
++:buf 1
++:$put =caught
++:/^result/,$w! test.out
++:qa!
++ENDTEST
++
++result
+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-04-27 05:20:58.458443777 +0000
+@@ -0,0 +1,2 @@
++result
++ok
 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-03-30 20:09:04.849400153 +0000
++++ vim74/src/ui.c      2014-04-27 05:20:58.458443777 +0000
 @@ -2610,13 +2610,11 @@
         if (on_sep_line)
@@ -60547 +64340 @@
 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-03-30 20:09:04.852733596 +0000
++++ vim74/src/undo.c    2014-04-27 05:20:58.461777194 +0000
 @@ -83,6 +83,7 @@
  
@@ -60674 +64467 @@
  
      /* Optional fields. */
+@@ -1449,7 +1455,7 @@
+ # endif
+        )
+        mch_setperm(file_name, (perm & 0707) | ((perm & 07) << 3));
+-# ifdef HAVE_SELINUX
++# if defined(HAVE_SELINUX) || defined(HAVE_SMACK)
+     if (buf->b_ffname != NULL)
+        mch_copy_sec(buf->b_ffname, file_name);
+ # endif
 @@ -1604,10 +1610,11 @@
  
@@ -60770 +64572 @@
 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-03-30 20:09:04.856067039 +0000
++++ vim74/src/version.c 2014-04-27 05:20:58.465110609 +0000
 @@ -60,6 +60,11 @@
  
@@ -60814 +64616 @@
         NULL
  };
-@@ -728,6 +735,464 @@
+@@ -728,6 +735,536 @@
  static int included_patches[] =
  {   /* Add new patch number below this line */
  /**/
++    265,
++/**/
++    264,
++/**/
++    263,
++/**/
++    262,
++/**/
++    261,
++/**/
++    260,
++/**/
++    259,
++/**/
++    258,
++/**/
++    257,
++/**/
++    256,
++/**/
++    255,
++/**/
++    254,
++/**/
++    253,
++/**/
++    252,
++/**/
++    251,
++/**/
++    250,
++/**/
++    249,
++/**/
++    248,
++/**/
++    247,
++/**/
++    246,
++/**/
++    245,
++/**/
++    244,
++/**/
++    243,
++/**/
++    242,
++/**/
++    241,
++/**/
++    240,
++/**/
++    239,
++/**/
++    238,
++/**/
++    237,
++/**/
++    236,
++/**/
++    235,
++/**/
++    234,
++/**/
++    233,
++/**/
++    232,
++/**/
++    231,
++/**/
++    230,
++/**/
 +    229,
 +/**/
@@ -61281 +65155 @@
 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-03-30 20:09:04.856067039 +0000
++++ vim74/src/vim.h     2014-04-27 05:20:58.465110609 +0000
 @@ -43,7 +43,7 @@
   * it becomes zero.  This is likely a problem of not being able to run the
@@ -61402 +65276 @@
  #  define MAXCOL (0x3fffffffL)         /* maximum column number, 30 bits */
  # else
-@@ -1864,9 +1877,10 @@
+@@ -1864,9 +1877,11 @@
  #define VV_MOUSE_COL   51
  #define VV_OP          52
@@ -61412 +65286 @@
 +#define VV_OLDFILES    55
 +#define VV_WINDOWID    56
-+#define VV_LEN         57      /* number of v: vars */
++#define VV_PROGPATH    57
++#define VV_LEN         58      /* number of v: vars */
  
  #ifdef FEAT_CLIPBOARD
  
-@@ -2239,6 +2253,7 @@
+@@ -2239,11 +2254,23 @@
  #define SOPT_BUF       0x20    /* Option has buffer-local value */
  #define SOPT_UNSET     0x40    /* Option does not have local value set */
@@ -61424 +65299 @@
  #define SREQ_WIN       1       /* Request window-local option */
  #define SREQ_BUF       2       /* Request buffer-local option */
-@@ -2246,4 +2261,10 @@
+ 
++/* Flags for get_reg_contents */
++#define GREG_NO_EXPR   1       /* Do not allow expression register */
++#define GREG_EXPR_SRC  2       /* Return expression itself for "=" register */
++#define GREG_LIST      4       /* Return list */
++
  /* Character used as separated in autoload function/variable names. */
  #define AUTOLOAD_CHAR '#'
@@ -61437 +65317 @@
 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-03-30 20:09:04.862733925 +0000
++++ vim74/src/winclip.c 2014-04-27 05:20:58.471777440 +0000
 @@ -797,4 +797,29 @@
         vim_free(widestr);
@@ -61470 +65350 @@
 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-03-30 20:09:04.866067369 +0000
++++ vim74/src/window.c  2014-04-27 05:20:58.471777440 +0000
 @@ -130,9 +130,7 @@
      case Ctrl_S:
@@ -61732 +65612 @@
 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-03-30 20:09:04.872734255 +0000
++++ vim74/src/xxd/Make_cyg.mak  2014-04-27 05:20:58.481777690 +0000
 @@ -8,7 +8,7 @@
  DEFINES =