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 a30f03a60e90f8c8098c9755980ce572b0e5ae4a..c40cf7beee9773144fc51d88b5301d8e11328ef6 100644 (file)
--- 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