From 7bb3e76899ec548ac5e1e95e3e38d7b33f3dadf4 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 17 Sep 2013 22:04:41 -0700 Subject: [PATCH] * emacs-lisp/chart.el (x-display-color-cells): Declare. (chart-face-list): Drop Emacsen without display-color-p. --- lisp/ChangeLog | 3 +++ lisp/emacs-lisp/chart.el | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1cb9f9e8ae..9eaa1cb3dd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-09-18 Glenn Morris + * 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 032eced759..e05c28f23d 100644 --- 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 ;; 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 ()) -- 2.20.1