From a37c5ae47930c15eb3e526bc608ca464dbb19808 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 19 Nov 2012 22:11:15 +0000 Subject: [PATCH] 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. --- lisp/ChangeLog | 7 +++++++ lisp/color.el | 9 +++------ lisp/time-date.el | 4 +--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 07f54757c..d5b615d9e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2012-11-19 Stefan Monnier + + * color.el: Don't require cl. + (color-complement): `caddr' -> `nth 2'. + + * time-date.el (time-to-seconds): De-obsolete. + 2012-11-19 Katsumi Yamaoka * message.el (message-get-reply-headers): diff --git a/lisp/color.el b/lisp/color.el index 843c12f25..baa6c270f 100644 --- 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 38b766084..b953a6fb2 100644 --- 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 -- 2.25.1