# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1170858792 0
# Node ID 6c6d674034cd22139aeea0e01115e33717927e73
# Parent  ba23fa191703f971c659a1ba748c86f73a9a56ec
(frame-set-background-mode): Use `color-values' and `display-color-p',
not `x-color-values' and `x-display-color-p'.

diff -r ba23fa191703 -r 6c6d674034cd lisp/faces.el
--- 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)