summaryrefslogtreecommitdiff
path: root/src
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
commitb9ce83e135331d74f09ec094528243f33c3ada85 (patch)
tree35c65291060c9d7015983d35c961da35f5f9a14e /src
parent9b4512500adfab4d44e957329d1a89e97e9a3930 (diff)
downloadvim-b9ce83e135331d74f09ec094528243f33c3ada85.zip
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.
Diffstat (limited to 'src')
-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 ec06f3122..db81ba0cd 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 b02216a1f..2fbc886e3 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,