diff options
| author | Richard M. Stallman <rms@gnu.org> | 1993-11-21 07:23:17 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1993-11-21 07:23:17 +0000 |
| commit | 8db93e456a54b713b7f8a199382f72d27a0ff506 (patch) | |
| tree | 320fe42f8a3bf7b4ebd0a88a31efe2921e2b595a /lisp | |
| parent | 9b7412a7e78a89d909f3f2a047b43bd235dd4806 (diff) | |
| download | emacs-8db93e456a54b713b7f8a199382f72d27a0ff506.tar.gz | |
(x-resolve-font-name): Undo previous change.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/faces.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 5abcd0927c2..765ed3f609c 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -439,9 +439,8 @@ also the same size as FACE on FRAME." (and (eq frame t) (setq frame nil)) (if pattern - (let ((fonts (x-list-fonts pattern - (if (face-font face) face nil) - frame))) + ;; Note that x-list-fonts has code to handle a face with nil as its font. + (let ((fonts (x-list-fonts pattern face frame))) (or fonts (if face (error "No fonts matching pattern are the same size as `%s'" |