# HG changeset patch # User Richard M. Stallman # Date 815978677 0 # Node ID c21527e2f1259f733b0038bcd88e95c4f14f6f02 # Parent 7609e8a05862f8fb8fa5cbc1a50aa21fee01dad2 (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 -r 7609e8a05862 -r c21527e2f125 lisp/progmodes/make-mode.el --- a/lisp/progmodes/make-mode.el Fri Nov 10 04:29:21 1995 +0000 +++ b/lisp/progmodes/make-mode.el Fri Nov 10 04:44:37 1995 +0000 @@ -487,7 +487,8 @@ (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 @@ (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))))