Commit 8db93e45 authored by Richard M. Stallman's avatar Richard M. Stallman

(x-resolve-font-name): Undo previous change.

parent 9b7412a7
......@@ -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)
;; 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'"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment