(describe-char): Fix for the case that a component character is TAB.

diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 9f6cbb4013e17608ff0d58189eaf1c3496bd9ee7..85edf3226449c9acdebdd1ff9c77fe2d7853768c 100644 (file)
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -585,7 +585,10 @@ as well as widgets, buttons, overlays, and text properties."
                        (cadr composition) "\"")))
          (insert " by the rule:\n\t("
                  (mapconcat (lambda (x)
-                              (format (if (consp x) "%S" "?%c") x))
+                              (if (consp x) (format "%S" x)
+                                (if (= x ?\t)
+                                    (single-key-description x)
+                                  (string ?? x))))
                             (nth 2 composition)
                             " ")
                  ")")
@@ -594,15 +597,16 @@ as well as widgets, buttons, overlays, and text properties."
              (progn
                (insert "these fonts (glyph codes):")
                (dolist (elt component-chars)
-                 (insert "\n " (car elt) ?:
-                         (propertize " " 'display '(space :align-to 5))
-                         (if (cdr elt)
-                             (format "%s (#x%02X)" (cadr elt) (cddr elt))
-                           "-- no font --"))))
+                 (if (/= (car elt) ?\t)
+                     (insert "\n " (car elt) ?:
+                             (propertize " " 'display '(space :align-to 5))
+                             (if (cdr elt)
+                                 (format "%s (#x%02X)" (cadr elt) (cddr elt))
+                               "-- no font --")))))
            (insert "these terminal codes:")
            (dolist (elt component-chars)
              (insert "\n  " (car elt) ":"
-                     (propertize " " 'display '(space :align-to 5))
+                     (propertize " " 'display '(space :align-to 4))
                      (or (cdr elt) "-- not encodable --"))))
          (insert "\nSee the variable `reference-point-alist' for "
                  "the meaning of the rule.\n"))