Changes committed gnus/lisp (ChangeLog time-date.el)

"Reiner Steib" <[email protected]> Mon, 05 Jan 2009 21:50:39 +0100
Newsgroups gmane.emacs.gnus.commits
Message-ID <[email protected]>
Modified: ChangeLog time-date.el

Require cl for `declare'.
(format-seconds): Explain `assoc-string'.  Suggested by Dave Love.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1964 gnus/lisp/ChangeLog:7.1965
--- ChangeLog:7.1964	Sat Jan  3 23:48:37 2009
+++ ChangeLog	Mon Jan  5 21:50:39 2009
@@ -1,3 +1,12 @@
+2009-01-05  Dave Love  <[email protected]>
+
+	* time-date.el: Require cl for `declare'.
+
+2009-01-05  Reiner Steib  <[email protected]>
+
+	* time-date.el (format-seconds): Explain `assoc-string'.  Suggested by
+	Dave Love.
+
 2009-01-03  Reiner Steib  <[email protected]>
 
 	* message.el (message-fix-before-sending): Add `eight-bit' to
Index: time-date.el
diff -u gnus/lisp/time-date.el:7.16 gnus/lisp/time-date.el:7.17
--- time-date.el:7.16	Mon May 19 10:47:42 2008
+++ time-date.el	Mon Jan  5 21:50:39 2009
@@ -1,7 +1,7 @@
 ;;; time-date.el --- Date and time handling functions
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008  Free Software Foundation, Inc.
+;;   2007, 2008, 2009  Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <[email protected]>
 ;;	Masanobu Umeda <[email protected]>
@@ -39,6 +39,9 @@
 
 ;;; Code:
 
+;; Only necessary for `declare' when compiling Gnus with Emacs 21.
+(eval-when-compile (require 'cl))
+
 (defmacro with-decoded-time-value (varlist &rest body)
   "Decode a time value and bind it according to VARLIST, then eval BODY.
 
@@ -290,6 +293,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
         (or (setq match (assoc-string spec units t))
             (error "Bad format specifier: `%s'" spec))
         (if (assoc-string spec usedunits t)