diff options
| author | Kenichi Handa | 2003-02-20 12:42:39 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2003-02-20 12:42:39 +0000 |
| commit | 0134e6da12cdeee8bc7e347afe3ef4a5488332b3 (patch) | |
| tree | 9fcdcc9da1c8603fce4b77c150c2c366a17d61e7 /src/fontset.c | |
| parent | 5927c7a48c7d142de44ff04a24865b1f86396066 (diff) | |
| download | emacs-0134e6da12cdeee8bc7e347afe3ef4a5488332b3.tar.gz emacs-0134e6da12cdeee8bc7e347afe3ef4a5488332b3.zip | |
(Fset_fontset_font): Document that NAME nil means the default
fontset.
(Ffontset_info): Likewise.
(Ffontset_font): Likewise.
Diffstat (limited to 'src/fontset.c')
| -rw-r--r-- | src/fontset.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fontset.c b/src/fontset.c index c7e5507f248..33e555eb518 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -973,9 +973,10 @@ check_fontset_name (name) | |||
| 973 | return FONTSET_FROM_ID (id); | 973 | return FONTSET_FROM_ID (id); |
| 974 | } | 974 | } |
| 975 | 975 | ||
| 976 | DEFUN ("set-fontset-font", Fset_fontset_font, Sset_fontset_font, 3, 4, 0, | 976 | DEFUN ("set-fontset-font", Fset_fontset_font Sset_fontset_font, 3, 4, 0, |
| 977 | doc: /* Modify fontset NAME to use FONTNAME for CHARACTER. | 977 | doc: /* Modify fontset NAME to use FONTNAME for CHARACTER. |
| 978 | 978 | ||
| 979 | If NAME is nil, modify the default fontset. | ||
| 979 | CHARACTER may be a cons; (FROM . TO), where FROM and TO are | 980 | CHARACTER may be a cons; (FROM . TO), where FROM and TO are |
| 980 | non-generic characters. In that case, use FONTNAME | 981 | non-generic characters. In that case, use FONTNAME |
| 981 | for all characters in the range FROM and TO (inclusive). | 982 | for all characters in the range FROM and TO (inclusive). |
| @@ -1251,6 +1252,7 @@ accumulate_font_info (arg, character, elt) | |||
| 1251 | 1252 | ||
| 1252 | DEFUN ("fontset-info", Ffontset_info, Sfontset_info, 1, 2, 0, | 1253 | DEFUN ("fontset-info", Ffontset_info, Sfontset_info, 1, 2, 0, |
| 1253 | doc: /* Return information about a fontset named NAME on frame FRAME. | 1254 | doc: /* Return information about a fontset named NAME on frame FRAME. |
| 1255 | If NAME is nil, return information about the default fontset. | ||
| 1254 | The value is a vector: | 1256 | The value is a vector: |
| 1255 | [ SIZE HEIGHT ((CHARSET-OR-RANGE FONT-SPEC OPENED ...) ...) ], | 1257 | [ SIZE HEIGHT ((CHARSET-OR-RANGE FONT-SPEC OPENED ...) ...) ], |
| 1256 | where, | 1258 | where, |
| @@ -1369,7 +1371,7 @@ If FRAME is omitted, it defaults to the currently selected frame. */) | |||
| 1369 | 1371 | ||
| 1370 | DEFUN ("fontset-font", Ffontset_font, Sfontset_font, 2, 2, 0, | 1372 | DEFUN ("fontset-font", Ffontset_font, Sfontset_font, 2, 2, 0, |
| 1371 | doc: /* Return a font name pattern for character CH in fontset NAME. | 1373 | doc: /* Return a font name pattern for character CH in fontset NAME. |
| 1372 | If NAME is t, find a font name pattern in the default fontset. */) | 1374 | If NAME is nil, find a font name pattern in the default fontset. */) |
| 1373 | (name, ch) | 1375 | (name, ch) |
| 1374 | Lisp_Object name, ch; | 1376 | Lisp_Object name, ch; |
| 1375 | { | 1377 | { |