Mercurial > emacs
comparison lisp/faces.el @ 23621:82325b2dbb5e
(set-face-font): Call resolve-fontset-name on w32.
(set-face-font-auto): Ditto.
| author | Andrew Innes <andrewi@gnu.org> |
|---|---|
| date | Tue, 03 Nov 1998 22:26:56 +0000 |
| parents | 57e5c9aadd19 |
| children | 094765645c52 |
comparison
equal
deleted
inserted
replaced
| 23620:2b55b8f8cdc1 | 23621:82325b2dbb5e |
|---|---|
| 147 "Change the font of face FACE to FONT (a string). | 147 "Change the font of face FACE to FONT (a string). |
| 148 If the optional FRAME argument is provided, change only | 148 If the optional FRAME argument is provided, change only |
| 149 in that frame; otherwise change each frame." | 149 in that frame; otherwise change each frame." |
| 150 (interactive (internal-face-interactive "font")) | 150 (interactive (internal-face-interactive "font")) |
| 151 (if (stringp font) | 151 (if (stringp font) |
| 152 (setq font (or (and (not (eq window-system 'w32)) | 152 (setq font (or (resolve-fontset-name font) |
| 153 (resolve-fontset-name font)) | |
| 154 (x-resolve-font-name font 'default frame)))) | 153 (x-resolve-font-name font 'default frame)))) |
| 155 (internal-set-face-1 face 'font font 3 frame) | 154 (internal-set-face-1 face 'font font 3 frame) |
| 156 ;; Record that this face's font was set explicitly, not automatically, | 155 ;; Record that this face's font was set explicitly, not automatically, |
| 157 ;; unless we are setting it to nil. | 156 ;; unless we are setting it to nil. |
| 158 (internal-set-face-1 face nil (not (null font)) 9 frame)) | 157 (internal-set-face-1 face nil (not (null font)) 9 frame)) |
| 163 if the font was derived from the frame font before, it is now. | 162 if the font was derived from the frame font before, it is now. |
| 164 If the optional FRAME argument is provided, change only | 163 If the optional FRAME argument is provided, change only |
| 165 in that frame; otherwise change each frame." | 164 in that frame; otherwise change each frame." |
| 166 (interactive (internal-face-interactive "font")) | 165 (interactive (internal-face-interactive "font")) |
| 167 (if (stringp font) | 166 (if (stringp font) |
| 168 (setq font (or (and (not (eq window-system 'w32)) | 167 (setq font (or (resolve-fontset-name font) |
| 169 (resolve-fontset-name font)) | |
| 170 (x-resolve-font-name font 'default frame)))) | 168 (x-resolve-font-name font 'default frame)))) |
| 171 (internal-set-face-1 face 'font font 3 frame)) | 169 (internal-set-face-1 face 'font font 3 frame)) |
| 172 | 170 |
| 173 (defun set-face-font-explicit (face flag &optional frame) | 171 (defun set-face-font-explicit (face flag &optional frame) |
| 174 "Set the explicit-font flag of face FACE to FLAG. | 172 "Set the explicit-font flag of face FACE to FLAG. |