diff options
| author | Kenichi Handa | 1997-03-18 23:16:27 +0000 |
|---|---|---|
| committer | Kenichi Handa | 1997-03-18 23:16:27 +0000 |
| commit | 3aa3a18c9cfccc9bdff6527f3a8a81aeca738819 (patch) | |
| tree | 581b0de3e87e378181f4bfd44f69bb8d0ce980b0 | |
| parent | 9a0ce8ca2a1ebf0c7bf53ede6669ed8c24e5a7ab (diff) | |
| download | emacs-3aa3a18c9cfccc9bdff6527f3a8a81aeca738819.tar.gz emacs-3aa3a18c9cfccc9bdff6527f3a8a81aeca738819.zip | |
(set-face-font): Allow specifing fontset for the arg FONT.
| -rw-r--r-- | lisp/faces.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 26b2691e288..438f80adb07 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -116,7 +116,9 @@ If FRAME is omitted or nil, use the selected frame." | |||
| 116 | If the optional FRAME argument is provided, change only | 116 | If the optional FRAME argument is provided, change only |
| 117 | in that frame; otherwise change each frame." | 117 | in that frame; otherwise change each frame." |
| 118 | (interactive (internal-face-interactive "font")) | 118 | (interactive (internal-face-interactive "font")) |
| 119 | (if (stringp font) (setq font (x-resolve-font-name font 'default frame))) | 119 | (if (stringp font) |
| 120 | (setq font (or (query-fontset font) | ||
| 121 | (x-resolve-font-name font 'default frame)))) | ||
| 120 | (internal-set-face-1 face 'font font 3 frame)) | 122 | (internal-set-face-1 face 'font font 3 frame)) |
| 121 | 123 | ||
| 122 | (defun set-face-foreground (face color &optional frame) | 124 | (defun set-face-foreground (face color &optional frame) |