diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2003-01-29 08:59:43 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2003-01-29 08:59:43 +0000 |
| commit | 51d891f0d194c2afd3234d140a329b67dad497bb (patch) | |
| tree | 1ef3b5634f7a7068d69e796f418e518c24dfdbb8 | |
| parent | f086b1b603ce15825abf0f83d6f1bb09e2116dc7 (diff) | |
| download | emacs-51d891f0d194c2afd3234d140a329b67dad497bb.tar.gz | |
(decompose-composite-char): Fix docstring.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/composite.el | 13 |
2 files changed, 11 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4d7328280ae..08977d7ffb5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2003-01-29 Juanma Barranquero <lektu@terra.es> + + * composite.el (decompose-composite-char): Fix docstring. + 2003-01-27 Juanma Barranquero <lektu@terra.es> * progmodes/cc-vars.el (c-offsets-alist): Fix typo. diff --git a/lisp/composite.el b/lisp/composite.el index 610ec227a60..58963c25ea3 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -95,7 +95,7 @@ follows (the point `*' corresponds to both reference points): (or (integerp nref) (setq nref (cdr (assq nref reference-point-alist)))) (or (and (>= gref 0) (< gref 12) (>= nref 0) (< nref 12)) - (error "Invalid composition rule: %S" rule)) + (error "Invalid composition rule: %S" rule)) (+ (* gref 12) nref)))) ;; Decode encoded composition rule RULE-CODE. The value is a cons of @@ -327,7 +327,7 @@ This function is the default value of `compose-chars-after-function'." (when tail (save-match-data (save-excursion - (while (and tail (not func)) + (while (and tail (not func)) (setq pattern (car (car tail)) func (cdr (car tail))) (goto-char pos) @@ -364,16 +364,17 @@ after a sequence character events." ;;; The following codes are only for backward compatibility with Emacs -;;; 20.4 and the earlier. +;;; 20.4 and earlier. ;;;###autoload (defun decompose-composite-char (char &optional type with-composition-rule) "Convert CHAR to string. -This is only for backward compatibility with Emacs 20.4 and the earlier. +This is only for backward compatibility with Emacs 20.4 and earlier. If optional 2nd arg TYPE is non-nil, it is `string', `list', or -`vector'. In this case, CHAR is converted string, list of CHAR, or -vector of CHAR respectively." +`vector'. In this case, CHAR is converted to string, list of CHAR, or +vector of CHAR respectively. +Optional 3rd arg WITH-COMPOSITION-RULE is ignored." (cond ((or (null type) (eq type 'string)) (char-to-string char)) ((eq type 'list) (list char)) (t (vector char)))) |