Skip to content

Commit 77a1003

Browse files
committed
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)
1 parent 5e7cb17 commit 77a1003

File tree

5 files changed

+14
-6
lines changed

5 files changed

+14
-6
lines changed

src/eval.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12090,7 +12090,7 @@ f_has(argvars, rettv)
1209012090
#ifdef FEAT_SEARCHPATH
1209112091
"file_in_path",
1209212092
#endif
12093-
#if (defined(UNIX) && !defined(USE_SYSTEM)) || defined(WIN3264)
12093+
#ifdef FEAT_FILTERPIPE
1209412094
"filterpipe",
1209512095
#endif
1209612096
#ifdef FEAT_FIND_ID

src/ex_cmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1113,7 +1113,7 @@ do_filter(line1, line2, eap, cmd, do_in, do_out)
11131113
if (do_out)
11141114
shell_flags |= SHELL_DOOUT;
11151115

1116-
#if (!defined(USE_SYSTEM) && defined(UNIX)) || defined(WIN3264)
1116+
#ifdef FEAT_FILTERPIPE
11171117
if (!do_in && do_out && !p_stmp)
11181118
{
11191119
/* Use a pipe to fetch stdout of the command, do not use a temp file. */

src/feature.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,3 +1316,11 @@
13161316
#ifdef FEAT_NORMAL
13171317
# define FEAT_PERSISTENT_UNDO
13181318
#endif
1319+
1320+
/*
1321+
* +filterpipe
1322+
*/
1323+
#if (defined(UNIX) && !defined(USE_SYSTEM)) \
1324+
|| (defined(WIN3264) && defined(FEAT_GUI_W32))
1325+
# define FEAT_FILTERPIPE
1326+
#endif

src/fileio.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2655,10 +2655,6 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
26552655
}
26562656
#endif
26572657

2658-
/* Reset now, following writes should not omit the EOL. Also, the line
2659-
* number will become invalid because of edits. */
2660-
curbuf->b_no_eol_lnum = 0;
2661-
26622658
if (recoverymode && error)
26632659
return FAIL;
26642660
return OK;
@@ -5098,6 +5094,8 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
50985094
{
50995095
aco_save_T aco;
51005096

5097+
curbuf->b_no_eol_lnum = 0; /* in case it was set by the previous read */
5098+
51015099
/*
51025100
* Apply POST autocommands.
51035101
* Careful: The autocommands may call buf_write() recursively!

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,8 @@ static char *(features[]) =
714714

715715
static int included_patches[] =
716716
{ /* Add new patch number below this line */
717+
/**/
718+
505,
717719
/**/
718720
504,
719721
/**/

0 commit comments

Comments
 (0)