comparison lisp/faces.el @ 22447:2806e56a2aae

(set-face-font): Pay attention to fontset. (set-face-font-auto): Call resolve-fontset-name.
author Kenichi Handa <handa@m17n.org>
date Fri, 12 Jun 1998 07:10:59 +0000
parents d06567759809
children a1af8a65983a
comparison
equal deleted inserted replaced
22446:5988c3c973db 22447:2806e56a2aae
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 (query-fontset font) 152 (setq font (or (resolve-fontset-name font)
153 (x-resolve-font-name font 'default frame)))) 153 (x-resolve-font-name font 'default frame))))
154 (internal-set-face-1 face 'font font 3 frame) 154 (internal-set-face-1 face 'font font 3 frame)
155 ;; Record that this face's font was set explicitly, not automatically, 155 ;; Record that this face's font was set explicitly, not automatically,
156 ;; unless we are setting it to nil. 156 ;; unless we are setting it to nil.
157 (internal-set-face-1 face nil (not (null font)) 9 frame)) 157 (internal-set-face-1 face nil (not (null font)) 9 frame))
162 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.
163 If the optional FRAME argument is provided, change only 163 If the optional FRAME argument is provided, change only
164 in that frame; otherwise change each frame." 164 in that frame; otherwise change each frame."
165 (interactive (internal-face-interactive "font")) 165 (interactive (internal-face-interactive "font"))
166 (if (stringp font) 166 (if (stringp font)
167 (setq font (or (and (fontset-name-p font) 167 (setq font (or (resolve-fontset-name font)
168 (or (query-fontset font)
169 (instantiate-fontset 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.