(describe-coding-system): Avoid error

for iso-2022, emacs-mule.

diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index de99362737426c37c851613fb2f642bc14469b1c..35659934c0b860403ac1689c260ea838227a6a4f 100644 (file)
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -496,10 +496,11 @@ which font is being used for displaying the character."
 \f
 ;;; CODING-SYSTEM
 
+;; Fixme
+(defun print-designation (charset-list initial request)
 ;; Print information of designation of each graphic register in FLAGS
 ;; in human readable format.  See the documentation of
 ;; `make-coding-system' for the meaning of FLAGS.
-(defun print-designation (charset-list initial request)
   (let ((gr (make-vector 4 nil))
        charset)
     (dotimes (i 4)
@@ -579,17 +580,21 @@ which font is being used for displaying the character."
               (princ " (Shift-JIS, MS-KANJI)"))
              ((eq type 'iso-2022)
               (princ " (variant of ISO-2022)\n")
-              (princ "Initial designations:\n")
-              (print-designation (coding-system-charset-list coding-system)
-                                 (aref extra-spec 0) (aref extra-spec 1))
-              (print-iso-2022-flags (aref extra-spec 2))
-              (princ "."))
+;; Fixme:
+;;            (princ "Initial designations:\n")
+;;            (print-designation (coding-system-charset-list coding-system)
+;;                               (aref extra-spec 0) (aref extra-spec 1))
+;;            (print-iso-2022-flags (aref extra-spec 2))
+;;            (princ ".")
+              )
              ((eq type 'charset)
               (princ " (charset)"))
              ((eq type 'ccl)
               (princ " (do conversion by CCL program)"))
              ((eq type 'raw-text)
               (princ " (text with random binary characters)"))
+             ((eq type 'emacs-mule)
+              (princ " (Emacs 21 internal encoding)"))
              (t (princ ": invalid coding-system.")))
        (princ "\nEOL type: ")
        (let ((eol-type (coding-system-eol-type coding-system)))
@@ -616,21 +621,23 @@ which font is being used for displaying the character."
          (princ prewrite)
          (princ "\n")))
       (with-current-buffer standard-output
-       (let ((charsets (coding-system-get coding-system :charset-list)))
-         (when (and (not (memq (coding-system-base coding-system)
-                               '(raw-text emacs-mule)))
+       (let ((charsets (coding-system-charset-list coding-system)))
+         (when (and (not (eq (coding-system-base coding-system) 'raw-text))
                     charsets)
-           (if (eq charsets t)
-               (insert "This coding system can encode all charsets except for
-eight-bit-control and eight-bit-graphic.\n")
+           (cond
+            ((eq charsets 'iso-2022)
+             (insert "This coding system can encode all ISO 2022 charsets."))
+            ((eq charsets 'emacs-mule)
+             (insert "This coding system can encode all emacs-mule charsets\
+."""))
+            (t
              (insert "This coding system encodes the following charsets:\n ")
              (while charsets
                (insert " " (symbol-name (car charsets)))
                (search-backward (symbol-name (car charsets)))
                (help-xref-button 0 'help-character-set (car charsets))
                (goto-char (point-max))
-               (setq charsets (cdr charsets))))))))))
-
+               (setq charsets (cdr charsets)))))))))))
 
 ;;;###autoload
 (defun describe-current-coding-system-briefly ()