Mercurial > emacs
changeset 5081:12a5a3e33209
(x-resolve-font-name): Don't pass FACE to x-list-fonts
if FACE has nil as its font.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 20 Nov 1993 08:42:47 +0000 |
| parents | 09f37e86d7da |
| children | 47a76678bf4d |
| files | lisp/faces.el |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/faces.el Sat Nov 20 06:04:07 1993 +0000 +++ b/lisp/faces.el Sat Nov 20 08:42:47 1993 +0000 @@ -439,7 +439,9 @@ (and (eq frame t) (setq frame nil)) (if pattern - (let ((fonts (x-list-fonts pattern face frame))) + (let ((fonts (x-list-fonts pattern + (if (face-font face) face nil) + frame))) (or fonts (if face (error "No fonts matching pattern are the same size as `%s'"