* emacs-lisp/chart.el (x-display-color-cells): Declare.

(chart-face-list): Drop Emacsen without display-color-p.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1cb9f9e8aea8a7467353c63cae6bd98429918c67..9eaa1cb3ddf1ab7fafa770bf9afbfc4835f8eadb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-09-18  Glenn Morris  <rgm@gnu.org>
 
+       * emacs-lisp/chart.el (x-display-color-cells): Declare.
+       (chart-face-list): Drop Emacsen without display-color-p.
+
        * net/eww.el (libxml-parse-html-region): Declare.
        (eww-display-html): Explicit error if no libxml2 support.
 

diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el
index 032eced7592b336f9c34377c5df7e39b2a894c6a..e05c28f23d569c14327ca690aca26aa863011f90 100644 (file)
--- a/lisp/emacs-lisp/chart.el
+++ b/lisp/emacs-lisp/chart.el
@@ -1,7 +1,7 @@
 ;;; chart.el --- Draw charts (bar charts, etc)  -*- lexical-binding: t -*-
 
-;; Copyright (C) 1996, 1998-1999, 2001, 2004-2005, 2007-2013 Free
-;; Software Foundation, Inc.
+;; Copyright (C) 1996, 1998-1999, 2001, 2004-2005, 2007-2013
+;;   Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam  <zappo@gnu.org>
 ;; Version: 0.2
@@ -86,10 +86,10 @@ Useful if new Emacs is used on B&W display.")
   :group 'eieio
   :type 'boolean)
 
+(declare-function x-display-color-cells "xfns.c" (&optional terminal))
+
 (defvar chart-face-list
-  (if (if (fboundp 'display-color-p)
-          (display-color-p)
-        window-system)
+  (if (display-color-p)
       (let ((cl chart-face-color-list)
             (pl chart-face-pixmap-list)
             (faces ())