aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/editfns.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 039c225c1f6..ef4efb0ad35 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12011-08-07 Juri Linkov <juri@jurta.org>
2
3 * editfns.c (Fformat_time_string): Doc fix, add tag `usage:'
4 to show the arg `TIME' instead of `TIMEVAL'.
5
12011-08-06 Eli Zaretskii <eliz@gnu.org> 62011-08-06 Eli Zaretskii <eliz@gnu.org>
2 7
3 * xdisp.c (set_cursor_from_row): Fix cursor positioning when a 8 * xdisp.c (set_cursor_from_row): Fix cursor positioning when a
diff --git a/src/editfns.c b/src/editfns.c
index 577263c5aea..5eed386afb7 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1695,7 +1695,9 @@ The modifiers are `E' and `O'. For certain characters X,
1695%EX is a locale's alternative version of %X; 1695%EX is a locale's alternative version of %X;
1696%OX is like %X, but uses the locale's number symbols. 1696%OX is like %X, but uses the locale's number symbols.
1697 1697
1698For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z". */) 1698For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z".
1699
1700usage: (format-time-string FORMAT-STRING &optional TIME UNIVERSAL) */)
1699 (Lisp_Object format_string, Lisp_Object timeval, Lisp_Object universal) 1701 (Lisp_Object format_string, Lisp_Object timeval, Lisp_Object universal)
1700{ 1702{
1701 time_t value; 1703 time_t value;