Mercurial > emacs
changeset 110367:b7aba7c5d378
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 14 Sep 2010 06:13:41 +0000 |
| parents | ea52aa6ade3e (current diff) b68d97301050 (diff) |
| children | ccf206bc1b3a |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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)