(describe-character-set): Account for

more than two dimensions of possibly different size.

diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 45b09eb381f446b6e08617abcd57330312abec67..24782788256130e4a2775a812631d91c295ea796 100644 (file)
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -324,11 +324,12 @@ detailed meanings of these arguments."
        (if (not (eq name charset))
            (insert " (alias of " (symbol-name name) ?\))))
       (insert "\n\n" (charset-description charset) "\n\n")
-      (insert "Number of contained characters: "
-             (if (= (charset-dimension charset) 1)
-                 (format "%d\n" (charset-chars charset))
-               (format "%dx%d\n" (charset-chars charset)
-                       (charset-chars charset))))
+      (insert "Number of contained characters: ")
+      (dotimes (i (charset-dimension charset))
+       (unless (= i 0)
+         (insert ?x))
+       (insert (format "%d" (charset-chars charset) (1+ i))))
+      (insert ?\n)
       (let ((char (charset-iso-final-char charset)))
        (when (> char 0)
          (insert "Final char of ISO2022 designation sequence: ")