aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorKatsumi Yamaoka2010-09-22 05:19:14 +0000
committerKatsumi Yamaoka2010-09-22 05:19:14 +0000
commit1bf68d5367c15a146157ad36f5b81f3801a32b3d (patch)
tree5df589779a11fdbb5f9233a538ef860c4fba5d69 /lisp
parentcd205c7615336d64c8af41ada17c53da29d90d44 (diff)
downloademacs-1bf68d5367c15a146157ad36f5b81f3801a32b3d.tar.gz
emacs-1bf68d5367c15a146157ad36f5b81f3801a32b3d.zip
calendar/time-date.el (format-seconds): Comment fix.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/calendar/time-date.el8
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8bce44fc89d..11b46901563 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-09-22 Katsumi Yamaoka <yamaoka@jpl.org>
2
3 * calendar/time-date.el (format-seconds): Comment fix.
4
12010-09-22 Glenn Morris <rgm@gnu.org> 52010-09-22 Glenn Morris <rgm@gnu.org>
2 6
3 * emacs-lisp/package.el (package-menu-mode): `revert-buffer-function' 7 * emacs-lisp/package.el (package-menu-mode): `revert-buffer-function'
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index bfb85e2cd73..7a0cafea80f 100644
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -317,10 +317,10 @@ This function does not work for SECONDS greater than `most-positive-fixnum'."
317 (setq start (match-end 0) 317 (setq start (match-end 0)
318 spec (match-string 1 string)) 318 spec (match-string 1 string))
319 (unless (string-equal spec "%") 319 (unless (string-equal spec "%")
320 ;; `assoc-string' is not available in XEmacs or Emacs 21. So when 320 ;; `assoc-string' is not available in XEmacs. So when compiling
321 ;; compiling Gnus (`time-date.el' is part of Gnus) with XEmacs or 321 ;; Gnus (`time-date.el' is part of Gnus) with XEmacs, we get
322 ;; Emacs 21, we get a warning here. But `format-seconds' is not 322 ;; a warning here. But `format-seconds' is not used anywhere in
323 ;; used anywhere in Gnus so it's not a real problem. --rsteib 323 ;; Gnus so it's not a real problem. --rsteib
324 (or (setq match (assoc-string spec units t)) 324 (or (setq match (assoc-string spec units t))
325 (error "Bad format specifier: `%s'" spec)) 325 (error "Bad format specifier: `%s'" spec))
326 (if (assoc-string spec usedunits t) 326 (if (assoc-string spec usedunits t)