Mercurial > emacs

changeset 75705:6c6d674034cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(frame-set-background-mode): Use `color-values' and `display-color-p', not `x-color-values' and `x-display-color-p'.
author Juanma Barranquero <lekktu@gmail.com>
date Wed, 07 Feb 2007 14:33:12 +0000
parents ba23fa191703
children d95bf8fd8b23
files lisp/faces.el
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/faces.el	Wed Feb 07 14:16:37 2007 +0000
+++ b/lisp/faces.el	Wed Feb 07 14:33:12 2007 +0000
@@ -1617,17 +1617,17 @@
 		 (or default-frame-background-mode 'dark))
 		((equal bg-color "unspecified-fg") ; inverted colors
 		 (if (eq default-frame-background-mode 'light) 'dark 'light))
-		((>= (apply '+ (x-color-values bg-color frame))
+		((>= (apply '+ (color-values bg-color frame))
 		    ;; Just looking at the screen, colors whose
 		    ;; values add up to .6 of the white total
 		    ;; still look dark to me.
-		    (* (apply '+ (x-color-values "white" frame)) .6))
+		    (* (apply '+ (color-values "white" frame)) .6))
 		 'light)
 		(t 'dark)))
 	 (display-type
 	  (cond ((null window-system)
 		 (if (tty-display-color-p frame) 'color 'mono))
-		((x-display-color-p frame)
+		((display-color-p frame)
 		 'color)
 		((x-display-grayscale-p frame)
 		 'grayscale)