# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1284444821 0
# Node ID b7aba7c5d378956208b7e9eb21a3bb6ea2a40bd3
# Parent  ea52aa6ade3ee8a152e5475fb35d91cc87afc09a# Parent  b68d97301050a63e523bf111b378a389ee88df73
Merge from mainline.

diff -r ea52aa6ade3e -r b7aba7c5d378 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Sep 14 03:59:07 2010 +0000
+++ b/lisp/ChangeLog	Tue Sep 14 06:13:41 2010 +0000
@@ -1,3 +1,7 @@
+2010-09-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* calendar/time-date.el (format-seconds): Comment fix.
+
 2010-09-13  Michael R. Mauger  <mmaug@yahoo.com>
 
 	* progmodes/sql.el: Version 2.7.
diff -r ea52aa6ade3e -r b7aba7c5d378 lisp/calendar/time-date.el
--- a/lisp/calendar/time-date.el	Tue Sep 14 03:59:07 2010 +0000
+++ b/lisp/calendar/time-date.el	Tue Sep 14 06:13:41 2010 +0000
@@ -317,10 +317,10 @@
       (setq start (match-end 0)
             spec (match-string 1 string))
       (unless (string-equal spec "%")
-	;; `assoc-string' is not available in Emacs 21.  So when compiling
-	;; Gnus (`time-date.el' is part of Gnus) with Emacs 21, we get a
-	;; warning here.  But `format-seconds' is not used anywhere in Gnus so
-	;; it's not a real problem. --rsteib
+	;; `assoc-string' is not available in XEmacs or Emacs 21.  So when
+	;; compiling Gnus (`time-date.el' is part of Gnus) with XEmacs or
+	;; Emacs 21, we get a warning here.  But `format-seconds' is not
+	;; used anywhere in Gnus so it's not a real problem. --rsteib
         (or (setq match (assoc-string spec units t))
             (error "Bad format specifier: `%s'" spec))
         (if (assoc-string spec usedunits t)