1
0
forked from aniani/vim

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)
This commit is contained in:
Bram Moolenaar
2012-04-25 16:50:48 +02:00
parent 720ce53af0
commit 68a33fc704
5 changed files with 14 additions and 6 deletions

View File

@@ -12090,7 +12090,7 @@ f_has(argvars, rettv)
#ifdef FEAT_SEARCHPATH #ifdef FEAT_SEARCHPATH
"file_in_path", "file_in_path",
#endif #endif
#if (defined(UNIX) && !defined(USE_SYSTEM)) || defined(WIN3264) #ifdef FEAT_FILTERPIPE
"filterpipe", "filterpipe",
#endif #endif
#ifdef FEAT_FIND_ID #ifdef FEAT_FIND_ID

View File

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

View File

@@ -1316,3 +1316,11 @@
#ifdef FEAT_NORMAL #ifdef FEAT_NORMAL
# define FEAT_PERSISTENT_UNDO # define FEAT_PERSISTENT_UNDO
#endif #endif
/*
* +filterpipe
*/
#if (defined(UNIX) && !defined(USE_SYSTEM)) \
|| (defined(WIN3264) && defined(FEAT_GUI_W32))
# define FEAT_FILTERPIPE
#endif

View File

@@ -2655,10 +2655,6 @@ failed:
} }
#endif #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) if (recoverymode && error)
return FAIL; return FAIL;
return OK; return OK;
@@ -5098,6 +5094,8 @@ nofail:
{ {
aco_save_T aco; aco_save_T aco;
curbuf->b_no_eol_lnum = 0; /* in case it was set by the previous read */
/* /*
* Apply POST autocommands. * Apply POST autocommands.
* Careful: The autocommands may call buf_write() recursively! * Careful: The autocommands may call buf_write() recursively!

View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
505,
/**/ /**/
504, 504,
/**/ /**/