summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2012-08-23 12:59:02 +0200
committerBram Moolenaar <bram@vim.org>2012-08-23 12:59:02 +0200
commit653de38383fcf18ae23247495a18c4824d2e9153 (patch)
treea4bf83351b0bd59d6849191b51aba1c5a113f076
parent4aa669981c4f56b5daf596890ec0fd1fb6df6240 (diff)
downloadvim-653de38383fcf18ae23247495a18c4824d2e9153.tar.gz
updated for version 7.3.634v7.3.634v7-3-634
Problem: Month/Day format for undo is confusing. (Marcin Szamotulski) Solution: Always use Year/Month/Day, should work for everybody.
-rw-r--r--src/undo.c5
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/undo.c b/src/undo.c
index ec06f312..db81ba0c 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 b02216a1..2fbc886e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 634,
+/**/
633,
/**/
632,