From: Gerd Moellmann Date: Wed, 29 Nov 2000 19:21:17 +0000 (+0000) Subject: (face-foreground, face-background, face-stipple): X-Git-Tag: emacs-pretest-21.0.93~366 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e3fa42c299bab0cb846c2b8b264390ae6983ed89;p=emacs.git (face-foreground, face-background, face-stipple): Return nil if attribute is unspecified, for backward compatibility. --- 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." 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 FRAME is omitted or nil, use the selected frame." 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 FRAME is omitted or nil, use the selected frame." 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)