From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 10 Nov 1995 04:44:37 +0000 (+0000)
Subject: (makefile-mode): Call makefile-define-space-face only if it is defined.
X-Git-Tag: emacs-19.34~2417
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ebeafce6a57c6356d7732aacf222e157949b9343;p=emacs.git

(makefile-mode): Call makefile-define-space-face only if it is defined.
(makefile-define-space-face): Create the face unconditionally;
alter it only if have X.
---

diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 51e2651fc4b..eac011ea8e1 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -487,7 +487,8 @@ makefile-special-targets-list:
   (make-local-variable 'makefile-need-macro-pickup)
 
   ;; Font lock.
-  (makefile-define-space-face)
+  (if (fboundp 'makefile-define-space-face)
+      (makefile-define-space-face))
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults '(makefile-font-lock-keywords))
 
@@ -1362,18 +1363,18 @@ Uses `makefile-use-curly-braces-for-macros-p'."
     (nreverse alist)))
 
 (defun makefile-define-space-face ()
-  (if (eq window-system 'x)
-      (make-face 'makefile-space-face))
-  (or (face-differs-from-default-p 'makefile-space-face)
+  (make-face 'makefile-space-face)
+  (or (not (eq window-system 'x))
+      (face-differs-from-default-p 'makefile-space-face)
       (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.
+			     (light-bg	; Light color background.
 			      "hotpink")
-			     (t			; Dark color background.
+			     (t		; Dark color background.
 			      "hotpink"))))
 	(set-face-background 'makefile-space-face bg-color))))