# HG changeset patch # User Gerd Moellmann # Date 975525677 0 # Node ID a442998dd5735eb6e6f658a14330eac5c8f973ff # Parent 8cf5499796cceff400bc8686428c75131a1f2ce5 (face-foreground, face-background, face-stipple): Return nil if attribute is unspecified, for backward compatibility. diff -r 8cf5499796cc -r a442998dd573 lisp/faces.el --- a/lisp/faces.el Wed Nov 29 19:14:47 2000 +0000 +++ b/lisp/faces.el Wed Nov 29 19:21:17 2000 +0000 @@ -357,7 +357,10 @@ If the optional argument FRAME is given, report on face FACE in that frame. If FRAME is t, report on the defaults for face FACE (for new frames). If FRAME is omitted or nil, use the selected frame." - (internal-get-lisp-face-attribute face :foreground frame)) + (let ((value (internal-get-lisp-face-attribute face :foreground frame))) + (if (eq value 'unspecified) + nil + value))) (defun face-background (face &optional frame) @@ -365,7 +368,10 @@ If the optional argument FRAME is given, report on face FACE in that frame. If FRAME is t, report on the defaults for face FACE (for new frames). If FRAME is omitted or nil, use the selected frame." - (internal-get-lisp-face-attribute face :background frame)) + (let ((value (internal-get-lisp-face-attribute face :background frame))) + (if (eq value 'unspecified) + nil + value))) (defun face-stipple (face &optional frame) @@ -373,7 +379,10 @@ If the optional argument FRAME is given, report on face FACE in that frame. If FRAME is t, report on the defaults for face FACE (for new frames). If FRAME is omitted or nil, use the selected frame." - (internal-get-lisp-face-attribute face :stipple frame)) + (let ((value (internal-get-lisp-face-attribute face :stipple frame))) + (if (eq value 'unspecified) + nil + value))) (defalias 'face-background-pixmap 'face-stipple)