From: Reiner Steib Date: Mon, 5 Jan 2009 20:50:39 +0000 (+0000) Subject: Require cl for `declare'. X-Git-Url: https://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=1f5448ea26751a04874cedac2fa90181ef873880 Require cl for `declare'. (format-seconds): Explain `assoc-string'. Suggested by Dave Love. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3bc8e9eb8..e3b10a94c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2009-01-05 Dave Love + + * time-date.el: Require cl for `declare'. + +2009-01-05 Reiner Steib + + * time-date.el (format-seconds): Explain `assoc-string'. Suggested by + Dave Love. + 2009-01-03 Reiner Steib * message.el (message-fix-before-sending): Add `eight-bit' to diff --git a/lisp/time-date.el b/lisp/time-date.el index fd35706ac..9d5cc76f8 100644 --- a/lisp/time-date.el +++ b/lisp/time-date.el @@ -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 ;; Masanobu Umeda @@ -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 @@ This function does not work for SECONDS greater than `most-positive-fixnum'." (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)