aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2003-01-29 08:56:40 +0000
committerJuanma Barranquero2003-01-29 08:56:40 +0000
commit1ea6238909cc63a4110b40c37b36c2cbb27070ae (patch)
treebf6954f4ffe6a3721b5f2972edb5070271ddf9be
parent50ca1c5579a4484c4af7e2ec224e50b812c151fe (diff)
downloademacs-1ea6238909cc63a4110b40c37b36c2cbb27070ae.tar.gz
emacs-1ea6238909cc63a4110b40c37b36c2cbb27070ae.zip
(decompose-composite-char): Fix docstring.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/composite.el5
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7f96be92d43..55063e3503c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,8 @@
12003-01-29 Taro Kawagishi <tarok@transpulse.org> 12003-01-29 Juanma Barranquero <lektu@terra.es>
2
3 * composite.el (decompose-composite-char): Fix docstring.
4
52003-01-29 Taro Kawagishi <tarok@transpulse.org>
2 6
3 * arc-mode.el (archive-lzh-summarize): Fix previous change. 7 * arc-mode.el (archive-lzh-summarize): Fix previous change.
4 8
diff --git a/lisp/composite.el b/lisp/composite.el
index 4307bfe5d65..49fe76de5ed 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -375,8 +375,9 @@ after a sequence character events."
375 "Convert CHAR to string. 375 "Convert CHAR to string.
376 376
377If optional 2nd arg TYPE is non-nil, it is `string', `list', or 377If optional 2nd arg TYPE is non-nil, it is `string', `list', or
378`vector'. In this case, CHAR is converted string, list of CHAR, or 378`vector'. In this case, CHAR is converted to string, list of CHAR, or
379vector of CHAR respectively." 379vector of CHAR respectively.
380Optional 3rd arg WITH-COMPOSITION-RULE is ignored."
380 (cond ((or (null type) (eq type 'string)) (char-to-string char)) 381 (cond ((or (null type) (eq type 'string)) (char-to-string char))
381 ((eq type 'list) (list char)) 382 ((eq type 'list) (list char))
382 (t (vector char)))) 383 (t (vector char))))