From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 18 Aug 2020 21:11:02 +0000 (+0200)
Subject: Remove some compat code from htmlfontify.el
X-Git-Tag: emacs-28.0.90~6532
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3c76397bbcad361a17087a24ff706f78b6abde3f;p=emacs.git

Remove some compat code from htmlfontify.el

* lisp/htmlfontify.el (hfy-color-vals): color-values is always
defined.
---

diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 6265537e885..4d653972c95 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -556,10 +556,7 @@ If a window system is unavailable, calls `hfy-fallback-color-values'."
        '(1 2 3))
     ;;(message ">> %s" color)
     (if window-system
-        (if (fboundp 'color-values)
-            (color-values color)
-          ;;(message "[%S]" window-system)
-          (x-color-values color))
+        (color-values color)
       ;; blarg - tty colors are no good - go fetch some X colors:
       (hfy-fallback-color-values color))))
 (define-obsolete-function-alias 'hfy-colour-vals #'hfy-color-vals "27.1")