Mercurial > emacs
changeset 17207:2d0b382efa26
(enriched-decode-foreground, enriched-decode-background):
Make COLOR arg optional. Fix error messages.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 22 Mar 1997 03:41:43 +0000 |
| parents | 30a9faea2a54 |
| children | 67515c200d09 |
| files | lisp/enriched.el |
| diffstat | 1 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/enriched.el Sat Mar 22 03:40:55 1997 +0000 +++ b/lisp/enriched.el Sat Mar 22 03:41:43 1997 +0000 @@ -424,24 +424,28 @@ (if (looking-at "^\n") (delete-char 1))) -(defun enriched-decode-foreground (from to color) +(defun enriched-decode-foreground (from to &optional color) (let ((face (intern (concat "fg:" color)))) - (cond ((internal-find-face face)) + (cond ((null color) + (message "Warning: no color specified for <x-color>")) + ((internal-find-face face)) ((and window-system (facemenu-get-face face))) (window-system - (message "Warning: color \"%s\" is not defined." color)) + (message "Warning: color `%s' is not defined" color)) ((make-face face) - (message "Warning: Color \"%s\" can't be displayed." color))) + (message "Warning: color `%s' can't be displayed" color))) (list from to 'face face))) -(defun enriched-decode-background (from to color) +(defun enriched-decode-background (from to &optional color) (let ((face (intern (concat "bg:" color)))) - (cond ((internal-find-face face)) + (cond ((null color) + (message "Warning: no color specified for <x-bg-color>")) + ((internal-find-face face)) ((and window-system (facemenu-get-face face))) (window-system - (message "Warning: color \"%s\" is not defined." color)) + (message "Warning: color `%s' is not defined" color)) ((make-face face) - (message "Warning: Color \"%s\" can't be displayed." color))) + (message "Warning: color `%s' can't be displayed" color))) (list from to 'face face))) ;;; enriched.el ends here