Sync up with r21-2-17-1999-07-02-10.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8035b06..93af195 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -72,6 +72,11 @@
        (ccl_driver): New case lable `CCL_Extention'.
        (setup_ccl_program): Initialize the member `private_state' of CCL.
 
+1999-06-30  SL Baur  <steve@miho.m17n.org>
+
+       * editfns.c: Document "%s" format spec.
+       Suggested by Bob Weiner <weiner@altrasoft.com>
+
 1999-06-29  Andy Piper  <andy@xemacs.org>
 
        * event-msw.c: fix definition booboo.

diff --git a/src/editfns.c b/src/editfns.c
index ce1f101..b914b4a 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1040,6 +1040,8 @@ FORMAT-STRING may contain %-sequences to substitute parts of the time.
 %p is replaced by AM or PM, as appropriate.
 %r is a synonym for "%I:%M:%S %p".
 %R is a synonym for "%H:%M".
+%s is replaced by the time in seconds since 00:00:00, Jan 1, 1970 (a
+      nonstandard extension)
 %S is replaced by the second (00-60).
 %t is a synonym for "\\t".
 %T is a synonym for "%H:%M:%S".