summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/os_win32.c3
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/os_win32.c b/src/os_win32.c
index 3f2b3c3a4c..9947150cdf 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -5155,8 +5155,7 @@ mch_system_piped(char *cmd, int options)
)
{
len = 0;
- if (!(options & SHELL_EXPAND)
- && ((options &
+ if (((options &
(SHELL_READ|SHELL_WRITE|SHELL_COOKED))
!= (SHELL_READ|SHELL_WRITE|SHELL_COOKED)
# ifdef FEAT_GUI
diff --git a/src/version.c b/src/version.c
index a0bec91502..650fb4fb4b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 123,
+/**/
122,
/**/
121,