# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1203132679 0
# Node ID 773399d06e3264b2fe023155087b8f08abf0ff28
# Parent  c4522ed32e3ac8a76ab70530613d4c5e4b96c2e6
*** empty log message ***

diff -r c4522ed32e3a -r 773399d06e32 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Feb 16 03:30:57 2008 +0000
+++ b/lisp/ChangeLog	Sat Feb 16 03:31:19 2008 +0000
@@ -1,3 +1,14 @@
+2008-02-16  Glenn Morris  <rgm@gnu.org>
+
+	* composite.el (composition-function-table): Doc fix.
+
+	* calendar/time-date.el (format-seconds): Remove `nonzero' argument
+	in favor of `%z' specifier.
+	(emacs-uptime): Move to time.el.
+	* time.el (emacs-uptime): Move here from time-date.el.  Add
+	optional `format' argument.  Doc fix.  Use `%z' rather than
+	removed `nonzero' argument of format-seconds.
+
 2008-02-16  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* bindings.el (mode-line-mule-info): Make the tooltips more explicit.