(decompose-composite-char): Add autoload cookie to obsolescence declaration;

also remove redundant info.

2 files changed, 12 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 15acd5f8537..50f31ed41d0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2002-07-18  Juanma Barranquero  <lektu@terra.es>
+
+        * international/mule-util.el (string-to-sequence, truncate-string): Add
+        autoload cookie to obsolescence declaration.
+
+        * rect.el (move-to-column-force): Likewise.
+
+        * composite.el (decompose-composite-char): Likewise; also remove
+        redundant info.
+
 2002-07-18  Kim F. Storm  <storm@cua.dk>
 
         * loadup.el: Load international/utf-8 before international/characters.
@@ -73,6 +83,7 @@
         * international/utf-8-subst.el: Populate utf-8-subst-rev-table.
         (utf-8-subst-table): Don't set.
 
+>>>>>>> 1.4125
 2002-07-17  Kenichi Handa  <handa@etl.go.jp>
 
         * international/mule.el (define-coding-system-alias):
diff --git a/lisp/composite.el b/lisp/composite.el
index c1174d3316f..abbcd391e3d 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -369,7 +369,6 @@ after a sequence character events."
 ;;;###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 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
@@ -378,6 +377,7 @@ vector of CHAR respectively."
         ((eq type 'list) (list char))
         (t (vector char))))
 
+;;;###autoload
 (make-obsolete 'decompose-composite-char 'char-to-string "21.1")