summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/undo.c1
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/undo.c b/src/undo.c
index 2f1924ce1..c4558d1c7 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -3117,7 +3117,6 @@ u_add_time(char_u *buf, size_t buflen, time_t tt)
if (vim_time() - tt >= 100)
{
- curtime = localtime(&tt);
# ifdef HAVE_LOCALTIME_R
curtime = localtime_r(&tt, &tmval);
# else
diff --git a/src/version.c b/src/version.c
index 0e40f619a..d31e61122 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1316,
+/**/
1315,
/**/
1314,