summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/os_unix.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 9dde754f3..0b2b5725e 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2681,7 +2681,6 @@ mch_FullName(
verbose_leave();
}
l = fchdir(fd);
- close(fd);
}
else
#endif
@@ -2689,6 +2688,10 @@ mch_FullName(
if (l != 0)
emsg(_(e_prev_dir));
}
+#ifdef HAVE_FCHDIR
+ if (fd >= 0)
+ close(fd);
+#endif
l = STRLEN(buf);
if (l >= len - 1)
diff --git a/src/version.c b/src/version.c
index c3f1fd6ab..227db829a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3544,
+/**/
3543,
/**/
3542,