-also the same size as FACE on FRAME,"
- (let ((fonts (x-list-fonts pattern face frame)))
- (or fonts
- (if face
- (error "no fonts match `%S'." pattern)
- (error "no fonts matching pattern are the same size as `%s'."
- pattern face)))
- (car fonts)))
+also the same size as FACE on FRAME."
+ (or (symbolp face)
+ (setq face (face-name face)))
+ (and (eq frame t)
+ (setq frame nil))
+ (if pattern
+ (let ((fonts (x-list-fonts pattern face frame)))
+ (or fonts
+ (if face
+ (error "No fonts matching pattern are the same size as `%s'"
+ face)
+ (error "No fonts match `%s'" pattern)))
+ (car fonts))
+ (cdr (assq 'font (frame-parameters (selected-frame))))))