From: Kenichi Handa <handa@m17n.org>
Date: Wed, 20 Jun 2007 12:07:32 +0000 (+0000)
Subject: (describe-char): Fix for the case that a component character is TAB.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~401
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a850be2ef8dc9e38dd7768765c2000d1e6e85f86;p=emacs.git

(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 9f6cbb4013e..85edf322644 100644
--- 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"))