updated for version 7.3.505

Problem:    Test 11 fails on MS-Windows in some versions.
Solution:   Fix #ifdefs for whether filtering through a pipe is possible. Move
            setting b_no_eol_lnum back to where it was before patch 7.3.124.
            (David Pope)

diff --git a/src/eval.c b/src/eval.c
index d460a83be9975cecc2755802cbc3f4a1a5b694fe..33b1947570873939cf3896530e7322138582180a 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -12090,7 +12090,7 @@ f_has(argvars, rettv)
 #ifdef FEAT_SEARCHPATH
        "file_in_path",
 #endif
-#if (defined(UNIX) && !defined(USE_SYSTEM)) || defined(WIN3264)
+#ifdef FEAT_FILTERPIPE
        "filterpipe",
 #endif
 #ifdef FEAT_FIND_ID

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 3d3f12ab450d1b85fd7ec99035621bbf6bb0d4f4..005f28f783c1a8c53df690c22f45f52ee1c437b5 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -1113,7 +1113,7 @@ do_filter(line1, line2, eap, cmd, do_in, do_out)
     if (do_out)
        shell_flags |= SHELL_DOOUT;
 
-#if (!defined(USE_SYSTEM) && defined(UNIX)) || defined(WIN3264)
+#ifdef FEAT_FILTERPIPE
     if (!do_in && do_out && !p_stmp)
     {
        /* Use a pipe to fetch stdout of the command, do not use a temp file. */

diff --git a/src/feature.h b/src/feature.h
index 6d5387ed0df280b09c83a6b1196f2d667229a746..d13e6214220a1681f23ebab11f46b49c89d2f509 100644 (file)
--- a/src/feature.h
+++ b/src/feature.h
@@ -1316,3 +1316,11 @@
 #ifdef FEAT_NORMAL
 # define FEAT_PERSISTENT_UNDO
 #endif
+
+/*
+ * +filterpipe
+ */
+#if (defined(UNIX) && !defined(USE_SYSTEM)) \
+           || (defined(WIN3264) && defined(FEAT_GUI_W32))
+# define FEAT_FILTERPIPE
+#endif

diff --git a/src/fileio.c b/src/fileio.c
index 5d00b753d12083dd781bfc5712657cccc062562f..52eb34b3bfd12fc63dc839fd4ad0d0f5dd26a5f2 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2655,10 +2655,6 @@ failed:
     }
 #endif
 
-    /* Reset now, following writes should not omit the EOL.  Also, the line
-     * number will become invalid because of edits. */
-    curbuf->b_no_eol_lnum = 0;
-
     if (recoverymode && error)
        return FAIL;
     return OK;
@@ -5098,6 +5094,8 @@ nofail:
     {
        aco_save_T      aco;
 
+       curbuf->b_no_eol_lnum = 0;  /* in case it was set by the previous read */
+
        /*
         * Apply POST autocommands.
         * Careful: The autocommands may call buf_write() recursively!

diff --git a/src/version.c b/src/version.c
index 3126205a90e52722ba31c010971921dbad4d9671..7aff2544232a58a4acbf6c10666cdb354df0b808 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    505,
 /**/
     504,
 /**/