From: Simon Marshall <simon@gnu.org>
Date: Mon, 30 Oct 1995 08:31:08 +0000 (+0000)
Subject: Use frame-parameters, not font-lock-background-mode and font-lock-display-type.
X-Git-Tag: emacs-19.34~2527
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=97af0368107351ab3c4f069978fba8dd2cae8f30;p=emacs.git

Use frame-parameters, not font-lock-background-mode and font-lock-display-type.
---

diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index a30f03a60e9..c40cf7beee9 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1364,17 +1364,16 @@ Uses `makefile-use-curly-braces-for-macros-p'."
 (defun makefile-define-space-face ()
   (make-face 'makefile-space-face)
   (or (face-differs-from-default-p 'makefile-space-face)
-      (let* ((light-bg (eq font-lock-background-mode 'light))
-	     (bg-color
-	      (cond ((memq font-lock-display-type '(mono monochrome))
-		     (if light-bg "black" "white"))
-		    ((memq font-lock-display-type '(grayscale greyscale
-						    grayshade greyshade))
-		     (if light-bg "black" "white"))
-		    (light-bg		; Light color background.
-		     "hotpink")
-		    (t			; Dark color background.
-		     "hotpink"))))
+      (let* ((params (frame-parameters))
+	     (light-bg (cdr (assq 'background-mode params)))
+	     (bg-color (cond ((eq (cdr (assq 'display-type params)) 'mono)
+			      (if light-bg "black" "white"))
+			     ((eq (cdr (assq 'display-type params)) 'grayscale)
+			      (if light-bg "black" "white"))
+			     (light-bg		; Light color background.
+			      "hotpink")
+			     (t			; Dark color background.
+			      "hotpink"))))
 	(set-face-background 'makefile-space-face bg-color))))
 
 ;;; makefile.el ends here