Mercurial > emacs
changeset 74330:5401c4ed263b
(create-fontset-from-ascii-font, create-fontset-from-fontset-spec,
x-compose-font-name): Doc fixes.
(fontset-name-p): Fix typo in docstring.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 30 Nov 2006 15:46:44 +0000 |
parents | d5980f6ee343 |
children | 55705fba7ce0 |
files | lisp/international/fontset.el |
diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/international/fontset.el Thu Nov 30 15:42:04 2006 +0000 +++ b/lisp/international/fontset.el Thu Nov 30 15:46:44 2006 +0000 @@ -382,10 +382,10 @@ (defun x-compose-font-name (fields &optional reduce) "Compose X's fontname from FIELDS. -FIELDS is a vector of XLFD fields, the length 14. +FIELDS is a vector of XLFD fields, of length 14. If a field is nil, wild-card letter `*' is embedded. -Optional argument REDUCE is always ignored. It exists just for -backward compatibility." +Optional argument REDUCE exists just for backward compatibility, +and is always ignored." (concat "-" (mapconcat (lambda (x) (or x "*")) fields "-"))) @@ -463,7 +463,7 @@ (defun fontset-name-p (fontset) "Return non-nil if FONTSET is valid as fontset name. A valid fontset name should conform to XLFD (X Logical Font Description) -with \"fontset\" in `<CHARSET_REGISTRY> field." +with \"fontset\" in `<CHARSET_REGISTRY>' field." (and (string-match xlfd-tight-regexp fontset) (string= (match-string (1+ xlfd-regexp-registry-subnum) fontset) "fontset"))) @@ -523,7 +523,7 @@ Optional 2nd arg exists just for backward compatibility, and is ignored. -If this function attempts to create already existing fontset, error is +If this function attempts to create already existing fontset, an error is signaled unless the optional 3rd argument NOERROR is non-nil. It returns a name of the created fontset." @@ -577,11 +577,11 @@ fontset-name) "Create a fontset from an ASCII font FONT. -Optional 1st arg RESOLVED-FONT is a resolved name of FONT. If -omitted, `x-resolve-font-name' is called to get the resolved name. At -this time, if FONT is not available, error is signaled. +Optional 2nd arg RESOLVED-FONT is a resolved name of FONT. +If omitted, `x-resolve-font-name' is called to get the resolved name. +At this time, if FONT is not available, an error is signaled. -Optional 2nd arg FONTSET-NAME is a string to be used in +Optional 3rd arg FONTSET-NAME is a string to be used in `<CHARSET_ENCODING>' fields of a new fontset name. If it is omitted, an appropriate name is generated automatically.