From 33fac69773cb682f32d9ae46f6a0ce4e2740d372 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 30 Nov 2006 15:50:08 +0000 Subject: [PATCH] (create-fontset-from-ascii-font, create-fontset-from-fontset-spec, x-compose-font-name): Doc fixes. (fontset-name-p): Fix typo in docstring. --- lisp/ChangeLog | 8 ++++++++ lisp/international/fontset.el | 18 +++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f04ecee8414..12ba2ee7449 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2006-11-30 Juanma Barranquero + + * international/fontset.el (create-fontset-from-ascii-font) + (create-fontset-from-fontset-spec, x-compose-font-name): Doc fixes. + (fontset-name-p): Fix typo in docstring. + + * progmodes/cc-cmds.el (c-indent-exp): Fix typo in docstring. + 2006-11-30 Vinicius Jose Latorre * ps-bdf.el : Fix maintainer email. diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index 643d9bad01c..c1193e094d8 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -382,10 +382,10 @@ PATTERN. If no full XLFD name is gotten, return nil." (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 @@ variable `x-font-name-charset-alist'), add that information to FONTLIST." (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 ` field." +with \"fontset\" in `' field." (and (string-match xlfd-tight-regexp fontset) (string= (match-string (1+ xlfd-regexp-registry-subnum) fontset) "fontset"))) @@ -523,7 +523,7 @@ Any number of SPACE, TAB, and NEWLINE can be put before and after commas. 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 @@ It returns a name of the created fontset." 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 `' fields of a new fontset name. If it is omitted, an appropriate name is generated automatically. -- 2.39.2