From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 23 Aug 2012 10:59:02 +0000 (+0200)
Subject: updated for version 7.3.634
X-Git-Tag: v7.3.634
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9ce83e135331d74f09ec094528243f33c3ada85;p=thirdparty%2Fvim.git

updated for version 7.3.634
Problem:    Month/Day format for undo is confusing. (Marcin Szamotulski)
Solution:   Always use Year/Month/Day, should work for everybody.
---

diff --git a/src/undo.c b/src/undo.c
index ec06f3122c..db81ba0cd2 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -2880,11 +2880,8 @@ u_add_time(buf, buflen, tt)
 	if (time(NULL) - tt < (60L * 60L * 12L))
 	    /* within 12 hours */
 	    (void)strftime((char *)buf, buflen, "%H:%M:%S", curtime);
-	else if (time(NULL) - tt < (60L * 60L * 24L * 180L))
-	    /* within 6 months */
-	    (void)strftime((char *)buf, buflen, "%m/%d %H:%M:%S", curtime);
 	else
-	    /* long ago */
+	    /* longer ago */
 	    (void)strftime((char *)buf, buflen, "%Y/%m/%d %H:%M:%S", curtime);
     }
     else
diff --git a/src/version.c b/src/version.c
index b02216a1f1..2fbc886e3c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    634,
 /**/
     633,
 /**/