diff options
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/w32fns.c | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 48ee2eeca69..f19f2a7b01f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-05-04 Juanma Barranquero <lekktu@gmail.com> + + * w32fns.c (Fw32_battery_status): Fix computation of %t (h:min) format. + 2008-05-04 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * image.c [USE_MAC_IMAGE_IO] (image_load_image_io): @@ -257,7 +261,7 @@ attributes only for local files. * w32proc.c (syms_of_ntproc): Change Vw32_get_true_file attributes - default to Qlocal. + default to Qlocal. 2008-04-22 Juri Linkov <juri@jurta.org> @@ -3549,8 +3553,8 @@ (font_put_extra): New function. (font_parse_xlfd): Fix handling of font size. Add QCdpi property in FONT_EXTRA. - (font_parse_fcname): Handle enumenrated values (e.g. bold). Fix - handling font size. Add QCname property that contains only + (font_parse_fcname): Handle enumenrated values (e.g. bold). + Fix handling font size. Add QCname property that contains only unknown properties. (font_score): Change argument. Change caller. Pay attention to FONT_PIXEL_SIZE_QUANTUM. diff --git a/src/w32fns.c b/src/w32fns.c index 7350bbe928c..8b49c1e8a7d 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -8766,14 +8766,14 @@ The following %-sequences are provided: seconds = build_string (buffer); m = seconds_left / 60; - _snprintf (buffer, 16, "%d", m); + _snprintf (buffer, 16, "%ld", m); minutes = build_string (buffer); h = seconds_left / 3600.0; _snprintf (buffer, 16, "%3.1f", h); hours = build_string (buffer); - _snprintf (buffer, 16, "%1.0f:%d", h, m); + _snprintf (buffer, 16, "%ld:%02ld", m / 60, m % 60); remain = build_string (buffer); } sequences[0] = Fcons (make_number ('L'), line_status); |