aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/editfns.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d8bbe5a97be..8c19c83378a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-12-11 RĂ¼diger Sonderfeld <ruediger@c-plusplus.de>
2
3 * editfns.c (Fformat_time_string): Mention %F in the doc.
4
12013-12-11 Martin Rudalics <rudalics@gmx.at> 52013-12-11 Martin Rudalics <rudalics@gmx.at>
2 6
3 * window.c (resize_frame_windows): Don't return immediately when 7 * window.c (resize_frame_windows): Don't return immediately when
diff --git a/src/editfns.c b/src/editfns.c
index 8e47d1f82e4..f67b95a8e81 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1723,6 +1723,7 @@ by text that describes the specified date and time in TIME:
1723%c is the locale's date and time format. 1723%c is the locale's date and time format.
1724%x is the locale's "preferred" date format. 1724%x is the locale's "preferred" date format.
1725%D is like "%m/%d/%y". 1725%D is like "%m/%d/%y".
1726%F is the ISO 8601 date format (like "%Y-%m-%d").
1726 1727
1727%R is like "%H:%M", %T is like "%H:%M:%S", %r is like "%I:%M:%S %p". 1728%R is like "%H:%M", %T is like "%H:%M:%S", %r is like "%I:%M:%S %p".
1728%X is the locale's "preferred" time format. 1729%X is the locale's "preferred" time format.
@@ -1741,7 +1742,7 @@ The modifiers are `E' and `O'. For certain characters X,
1741%EX is a locale's alternative version of %X; 1742%EX is a locale's alternative version of %X;
1742%OX is like %X, but uses the locale's number symbols. 1743%OX is like %X, but uses the locale's number symbols.
1743 1744
1744For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z". 1745For example, to produce full ISO 8601 format, use "%FT%T%z".
1745 1746
1746usage: (format-time-string FORMAT-STRING &optional TIME UNIVERSAL) */) 1747usage: (format-time-string FORMAT-STRING &optional TIME UNIVERSAL) */)
1747 (Lisp_Object format_string, Lisp_Object timeval, Lisp_Object universal) 1748 (Lisp_Object format_string, Lisp_Object timeval, Lisp_Object universal)