diff options
| author | Richard M. Stallman <rms@gnu.org> | 1993-11-20 08:42:47 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1993-11-20 08:42:47 +0000 |
| commit | 4901eb1b09e42354e243fa6572068f63f3d65b52 (patch) | |
| tree | 9cd262e085831972e0222ff33554a4f5a17a5be4 /lisp | |
| parent | 7f291b64ee63ac25dcafaebdc2d5cebe81678fa5 (diff) | |
| download | emacs-4901eb1b09e42354e243fa6572068f63f3d65b52.tar.gz emacs-4901eb1b09e42354e243fa6572068f63f3d65b52.tar.bz2 emacs-4901eb1b09e42354e243fa6572068f63f3d65b52.zip | |
(x-resolve-font-name): Don't pass FACE to x-list-fonts
if FACE has nil as its font.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/faces.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 32a0c995ab0..5abcd0927c2 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -439,7 +439,9 @@ also the same size as FACE on FRAME." (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'" |