Mercurial > emacs
changeset 3071:68de05fb5751
* faces.el (set-face-font): Call x-resolve-font-name on the font
before including it in the face.
(x-resolve-font-name): New function.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Tue, 25 May 1993 13:19:28 +0000 |
| parents | 08003ba2ac71 |
| children | a655e32e6270 |
| files | lisp/faces.el |
| diffstat | 1 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/faces.el Tue May 25 13:17:52 1993 +0000 +++ b/lisp/faces.el Tue May 25 13:19:28 1993 +0000 @@ -85,7 +85,8 @@ If the optional FRAME argument is provided, change only in that frame; otherwise change each frame." (interactive (internal-face-interactive "font")) - (internal-set-face-1 face 'font font 3 frame)) + (internal-set-face-1 face 'font (x-resolve-font-name font face frame) + 3 frame)) (defsubst set-face-foreground (face color &optional frame) "Change the foreground color of face FACE to COLOR (a string). @@ -412,6 +413,19 @@ (setq x-font-regexp-weight (concat - weight -)) nil) +(defun x-resolve-font-name (pattern &optional face frame) + "Return a font name matching PATTERN. +All wildcards in PATTERN become substantiated. +Given optional arguments FACE and FRAME, try to return a font which is +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))) + (defun x-frob-font-weight (font which) (if (or (string-match x-font-regexp font) (string-match x-font-regexp-head font)