aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Blandy1993-05-30 17:28:33 +0000
committerJim Blandy1993-05-30 17:28:33 +0000
commit25c08a32eddb9daf6029dade09bb7a97515ff9c9 (patch)
treebe57d2ff575bc9ba223912705f3252bf5ba9a806
parentd9d5950f41ae01c5ce20ed22cf41a4e0d1e2f4d5 (diff)
downloademacs-25c08a32eddb9daf6029dade09bb7a97515ff9c9.tar.gz
emacs-25c08a32eddb9daf6029dade09bb7a97515ff9c9.zip
* faces.el (x-resolve-font-name): Give correct error message
depending on whether or not FACE was non-nil.
-rw-r--r--lisp/faces.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index 4b6d3812d2d..7788617ea27 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -428,9 +428,9 @@ also the same size as FACE on FRAME."
428 (let ((fonts (x-list-fonts pattern face frame))) 428 (let ((fonts (x-list-fonts pattern face frame)))
429 (or fonts 429 (or fonts
430 (if face 430 (if face
431 (error "no fonts match `%S'." pattern) 431 (error "no fonts matching pattern are the same size as `%s'."
432 (error "no fonts matching pattern are the same size as `%s'." 432 face)
433 face))) 433 (error "no fonts match `%S'." pattern)))
434 (car fonts)) 434 (car fonts))
435 (cdr (assq 'font (frame-parameters (selected-frame)))))) 435 (cdr (assq 'font (frame-parameters (selected-frame))))))
436 436