aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-11-29 19:21:17 +0000
committerGerd Moellmann2000-11-29 19:21:17 +0000
commite3fa42c299bab0cb846c2b8b264390ae6983ed89 (patch)
tree82ca3a98a4e0de88839430a5302b1ba3af094ca1
parent1c14ba451b6f9ac9ba93d98513932913fab73b7a (diff)
downloademacs-e3fa42c299bab0cb846c2b8b264390ae6983ed89.tar.gz
emacs-e3fa42c299bab0cb846c2b8b264390ae6983ed89.zip
(face-foreground, face-background, face-stipple):
Return nil if attribute is unspecified, for backward compatibility.
-rw-r--r--lisp/faces.el15
1 files changed, 12 insertions, 3 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index bcf2b8ffdaf..e8999594006 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -357,7 +357,10 @@ If FRAME is omitted or nil, use the selected frame."
357If the optional argument FRAME is given, report on face FACE in that frame. 357If the optional argument FRAME is given, report on face FACE in that frame.
358If FRAME is t, report on the defaults for face FACE (for new frames). 358If FRAME is t, report on the defaults for face FACE (for new frames).
359If FRAME is omitted or nil, use the selected frame." 359If FRAME is omitted or nil, use the selected frame."
360 (internal-get-lisp-face-attribute face :foreground frame)) 360 (let ((value (internal-get-lisp-face-attribute face :foreground frame)))
361 (if (eq value 'unspecified)
362 nil
363 value)))
361 364
362 365
363(defun face-background (face &optional frame) 366(defun face-background (face &optional frame)
@@ -365,7 +368,10 @@ If FRAME is omitted or nil, use the selected frame."
365If the optional argument FRAME is given, report on face FACE in that frame. 368If the optional argument FRAME is given, report on face FACE in that frame.
366If FRAME is t, report on the defaults for face FACE (for new frames). 369If FRAME is t, report on the defaults for face FACE (for new frames).
367If FRAME is omitted or nil, use the selected frame." 370If FRAME is omitted or nil, use the selected frame."
368 (internal-get-lisp-face-attribute face :background frame)) 371 (let ((value (internal-get-lisp-face-attribute face :background frame)))
372 (if (eq value 'unspecified)
373 nil
374 value)))
369 375
370 376
371(defun face-stipple (face &optional frame) 377(defun face-stipple (face &optional frame)
@@ -373,7 +379,10 @@ If FRAME is omitted or nil, use the selected frame."
373If the optional argument FRAME is given, report on face FACE in that frame. 379If the optional argument FRAME is given, report on face FACE in that frame.
374If FRAME is t, report on the defaults for face FACE (for new frames). 380If FRAME is t, report on the defaults for face FACE (for new frames).
375If FRAME is omitted or nil, use the selected frame." 381If FRAME is omitted or nil, use the selected frame."
376 (internal-get-lisp-face-attribute face :stipple frame)) 382 (let ((value (internal-get-lisp-face-attribute face :stipple frame)))
383 (if (eq value 'unspecified)
384 nil
385 value)))
377 386
378 387
379(defalias 'face-background-pixmap 'face-stipple) 388(defalias 'face-background-pixmap 'face-stipple)