Mercurial > emacs

changeset 5092:36508a7c0a3f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x-resolve-font-name): Undo previous change.
author Richard M. Stallman <rms@gnu.org>
date Sun, 21 Nov 1993 07:23:17 +0000
parents 624596e9c5d1
children 51d2f91b2ce1
files lisp/faces.el
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/faces.el	Sun Nov 21 06:11:34 1993 +0000
+++ b/lisp/faces.el	Sun Nov 21 07:23:17 1993 +0000
@@ -439,9 +439,8 @@
   (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'"