aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2006-09-06 06:41:40 +0000
committerKenichi Handa2006-09-06 06:41:40 +0000
commit04e28558df772845d83d5e870300b755b2528b57 (patch)
treeb57b638afdbb348fb882995ca9963a3f12607ff4 /src
parent8687849bab4bd39395fc3c6ef814ef738ddf8ed8 (diff)
downloademacs-04e28558df772845d83d5e870300b755b2528b57.tar.gz
emacs-04e28558df772845d83d5e870300b755b2528b57.zip
(Fformat_time_string): Use make_unibyte_string to make
a Lisp string from the result of emacs_memftimeu call.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/editfns.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5e39f084e9f..715c8109bf1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12006-09-06 Kenichi Handa <handa@m17n.org>
2
3 * editfns.c (Fformat_time_string): Use make_unibyte_string to make
4 a Lisp string from the result of emacs_memftimeu call.
5
12006-09-06 Kim F. Storm <storm@cua.dk> 62006-09-06 Kim F. Storm <storm@cua.dk>
2 7
3 * xdisp.c (pos_visible_p): Remove exact_mode_line_heights_p arg; 8 * xdisp.c (pos_visible_p): Remove exact_mode_line_heights_p arg;
diff --git a/src/editfns.c b/src/editfns.c
index 2c392df564e..1b89bb3668c 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1694,7 +1694,7 @@ For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z". */)
1694 SBYTES (format_string), 1694 SBYTES (format_string),
1695 tm, ut); 1695 tm, ut);
1696 if ((result > 0 && result < size) || (result == 0 && buf[0] == '\0')) 1696 if ((result > 0 && result < size) || (result == 0 && buf[0] == '\0'))
1697 return code_convert_string_norecord (make_string (buf, result), 1697 return code_convert_string_norecord (make_unibyte_string (buf, result),
1698 Vlocale_coding_system, 0); 1698 Vlocale_coding_system, 0);
1699 1699
1700 /* If buffer was too small, make it bigger and try again. */ 1700 /* If buffer was too small, make it bigger and try again. */