Merge changes made in Emacs trunk

* color.el: Don't require cl.
  (color-complement): `caddr' -> `nth 2'.
* time-date.el (time-to-seconds): De-obsolete.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 07f5475..d5b615d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-11-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * color.el: Don't require cl.
+       (color-complement): `caddr' -> `nth 2'.
+
+       * time-date.el (time-to-seconds): De-obsolete.
+
 2012-11-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * message.el (message-get-reply-headers):

diff --git a/lisp/color.el b/lisp/color.el
index 843c12f..baa6c27 100644 (file)
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -33,9 +33,6 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
-
 ;; Emacs < 23.3
 (eval-and-compile
   (unless (boundp 'float-pi)
@@ -69,9 +66,9 @@ RED, GREEN, and BLUE should be numbers between 0.0 and 1.0, inclusive."
 COLOR-NAME should be a string naming a color (e.g. \"white\"), or
 a string specifying a color's RGB components (e.g. \"#ff12ec\")."
   (let ((color (color-name-to-rgb color-name)))
-    (list (- 1.0 (car color))
-          (- 1.0 (cadr color))
-          (- 1.0 (caddr color)))))
+    (list (- 1.0 (nth 0 color))
+          (- 1.0 (nth 1 color))
+          (- 1.0 (nth 2 color)))))
 
 (defun color-gradient (start stop step-number)
   "Return a list with STEP-NUMBER colors from START to STOP.

diff --git a/lisp/time-date.el b/lisp/time-date.el
index 38b7660..b953a6f 100644 (file)
--- a/lisp/time-date.el
+++ b/lisp/time-date.el
@@ -134,9 +134,7 @@ If DATE lacks timezone information, GMT is assumed."
 ;;;###autoload(if (or (featurep 'emacs)
 ;;;###autoload        (and (fboundp 'float-time)
 ;;;###autoload             (subrp (symbol-function 'float-time))))
-;;;###autoload    (progn
-;;;###autoload      (defalias 'time-to-seconds 'float-time)
-;;;###autoload      (make-obsolete 'time-to-seconds 'float-time "21.1"))
+;;;###autoload    (defalias 'time-to-seconds 'float-time)
 ;;;###autoload  (autoload 'time-to-seconds "time-date"))
 
 (eval-when-compile