Mercurial > emacs

comparison lisp/faces.el @ 22624:a1af8a65983a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(set-face-font): For now, don't call resolve-fontset-name on Windows. (set-face-font-auto): Likewise.
author Richard M. Stallman <rms@gnu.org>
date Sat, 27 Jun 1998 04:42:03 +0000
parents 2806e56a2aae
children 160c346d6192
comparison
equal deleted inserted replaced
22623:ccc1f8081ef1 22624:a1af8a65983a
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 (resolve-fontset-name font) 152 (setq font (or (and (not (eq window-system 'w32))
153 (resolve-fontset-name font))
153 (x-resolve-font-name font 'default frame)))) 154 (x-resolve-font-name font 'default frame))))
154 (internal-set-face-1 face 'font font 3 frame) 155 (internal-set-face-1 face 'font font 3 frame)
155 ;; Record that this face's font was set explicitly, not automatically, 156 ;; Record that this face's font was set explicitly, not automatically,
156 ;; unless we are setting it to nil. 157 ;; unless we are setting it to nil.
157 (internal-set-face-1 face nil (not (null font)) 9 frame)) 158 (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. 163 if the font was derived from the frame font before, it is now.
163 If the optional FRAME argument is provided, change only 164 If the optional FRAME argument is provided, change only
164 in that frame; otherwise change each frame." 165 in that frame; otherwise change each frame."
165 (interactive (internal-face-interactive "font")) 166 (interactive (internal-face-interactive "font"))
166 (if (stringp font) 167 (if (stringp font)
167 (setq font (or (resolve-fontset-name font) 168 (setq font (or (and (not (eq window-system 'w32))
169 (resolve-fontset-name font))
168 (x-resolve-font-name font 'default frame)))) 170 (x-resolve-font-name font 'default frame))))
169 (internal-set-face-1 face 'font font 3 frame)) 171 (internal-set-face-1 face 'font font 3 frame))
170 172
171 (defun set-face-font-explicit (face flag &optional frame) 173 (defun set-face-font-explicit (face flag &optional frame)
172 "Set the explicit-font flag of face FACE to FLAG. 174 "Set the explicit-font flag of face FACE to FLAG.