international/mule-diag.el (describe-character-set): Use princ with proper print-length and print-level instead of insert.

3 files changed, 18 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 518ebc3cab7..ce0236e34d7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-27  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule.el (define-coding-system): Docstring fixed.
+
+        * international/mule-diag.el (describe-character-set): Use princ
+        with proper print-length and print-level instead of insert.
+
 2010-09-26  Juanma Barranquero  <lekktu@gmail.com>
 
         * window.el (walk-windows): Doc fix (bug#7105).
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index a809b60da7f..ed2f7e33a4c 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -368,7 +368,8 @@ meanings of these arguments."
           (when val
             (if (cadr elt) (insert (cadr elt)))
             (if (nth 2 elt)
-                (insert (funcall (nth 2 elt) val)))
+                (let ((print-length 10) (print-level 2))
+                  (princ (funcall (nth 2 elt) val) (current-buffer))))
             (insert ?\n)))))))
 
 ;;; CODING-SYSTEM
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 105163a5d11..992c6bd16bb 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -642,18 +642,19 @@ VALUE must be a translation table to use on encoding.
 
 VALUE must be a function to call after some text is inserted and
 decoded by the coding system itself and before any functions in
-`after-insert-functions' are called.  The arguments to this function
-are the same as those of a function in `after-insert-file-functions',
-i.e. LENGTH of the text to be decoded with point at the head of it,
-and the function should leave point unchanged.
+`after-insert-functions' are called.  This function is passed one
+argument; the number of characters in the text to convert, with
+point at the start of the text.  The function should leave point
+the same, and return the new character count.
 
 `:pre-write-conversion'
 
 VALUE must be a function to call after all functions in
-`write-region-annotate-functions' and `buffer-file-format' are called,
-and before the text is encoded by the coding system itself.  The
-arguments to this function are the same as those of a function in
-`write-region-annotate-functions'.
+`write-region-annotate-functions' and `buffer-file-format' are
+called, and before the text is encoded by the coding system
+itself.  This function should convert the whole text in the
+current buffer.  For backward compatibility, this funciton is
+passed two arguments which can be ignored.
 
 `:default-char'