updated for version 7.0-127

diff --git a/src/memline.c b/src/memline.c
index 6ea2dc5dad53111cc19734a0a2309ab4e1006b36..5c55e70f2c9e82b4ef5c8ea7e604781da378f7fc 100644 (file)
--- a/src/memline.c
+++ b/src/memline.c
@@ -1633,6 +1633,7 @@ swapfile_info(fname)
     int                    fd;
     struct block0   b0;
     time_t         x = (time_t)0;
+    char           *p;
 #ifdef UNIX
     char_u         uname[B0_UNAME_SIZE];
 #endif
@@ -1652,8 +1653,11 @@ swapfile_info(fname)
 #endif
            MSG_PUTS(_("             dated: "));
        x = st.st_mtime;                    /* Manx C can't do &st.st_mtime */
-       MSG_PUTS(ctime(&x));                /* includes '\n' */
-
+       p = ctime(&x);                      /* includes '\n' */
+       if (p == NULL)
+           MSG_PUTS("(invalid)\n");
+       else
+           MSG_PUTS(p);
     }
 
     /*
@@ -3652,6 +3656,7 @@ attention_message(buf, fname)
 {
     struct stat st;
     time_t     x, sx;
+    char       *p;
 
     ++no_wait_return;
     (void)EMSG(_("E325: ATTENTION"));
@@ -3666,7 +3671,11 @@ attention_message(buf, fname)
     {
        MSG_PUTS(_("             dated: "));
        x = st.st_mtime;    /* Manx C can't do &st.st_mtime */
-       MSG_PUTS(ctime(&x));
+       p = ctime(&x);                      /* includes '\n' */
+       if (p == NULL)
+           MSG_PUTS("(invalid)\n");
+       else
+           MSG_PUTS(p);
        if (sx != 0 && x > sx)
            MSG_PUTS(_("      NEWER than swap file!\n"));
     }

diff --git a/src/version.c b/src/version.c
index 5c5685243fa77ce8b338f13d5688adae1ec40632..d0cb708dff661ebc50d885880bd024986080691b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    127,
 /**/
     126,
 /**/