aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/composite.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c56ad372d73..5885cdd5321 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12002-06-27 Juanma Barranquero <lektu@terra.es> 12002-06-27 Juanma Barranquero <lektu@terra.es>
2 2
3 * composite.el (decompose-composite-char): Fix docstring.
4
3 * faces.el (describe-face): Capitalize "not documented" message. 5 * faces.el (describe-face): Capitalize "not documented" message.
4 6
5 * help-fns.el (describe-variable): Likewise. 7 * help-fns.el (describe-variable): Likewise.
diff --git a/lisp/composite.el b/lisp/composite.el
index 610ec227a60..c1174d3316f 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -364,12 +364,12 @@ after a sequence character events."
364 364
365 365
366;;; The following codes are only for backward compatibility with Emacs 366;;; The following codes are only for backward compatibility with Emacs
367;;; 20.4 and the earlier. 367;;; 20.4 and earlier.
368 368
369;;;###autoload 369;;;###autoload
370(defun decompose-composite-char (char &optional type with-composition-rule) 370(defun decompose-composite-char (char &optional type with-composition-rule)
371 "Convert CHAR to string. 371 "Convert CHAR to string.
372This is only for backward compatibility with Emacs 20.4 and the earlier. 372This is only for backward compatibility with Emacs 20.4 and earlier.
373 373
374If optional 2nd arg TYPE is non-nil, it is `string', `list', or 374If optional 2nd arg TYPE is non-nil, it is `string', `list', or
375`vector'. In this case, CHAR is converted string, list of CHAR, or 375`vector'. In this case, CHAR is converted string, list of CHAR, or