# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1132472624 0
# Node ID 0f0c4f1205cd9464679fe232bd281170080bd888
# Parent  c6e50090a202d0144cd79e099100b633835204cb
(describe-char): Use Lisp-readable syntax for octal and hex.
Reorder decimal, octal and hex values.
Remove excess whitespace in the output.

diff -r c6e50090a202 -r 0f0c4f1205cd lisp/descr-text.el
--- a/lisp/descr-text.el	Sun Nov 20 07:43:01 2005 +0000
+++ b/lisp/descr-text.el	Sun Nov 20 07:43:44 2005 +0000
@@ -467,7 +467,7 @@
 			  (encode-char char 'ucs))))
     (setq item-list
 	  `(("character"
-	    ,(format "%s (0%o, %d, 0x%x%s)"
+	    ,(format "%s (%d, #o%o, #x%x%s)"
 		     (apply 'propertize (if (not multibyte-p)
 					    (single-key-description char)
 					  (if (< char 128)
@@ -510,7 +510,7 @@
 	     ,@(let ((category-set (char-category-set char)))
 		 (if (not category-set)
 		     '("-- none --")
-		   (mapcar #'(lambda (x) (format "%c:%s  "
+		   (mapcar #'(lambda (x) (format "%c:%s"
 						 x (category-docstring x)))
 			   (category-set-mnemonics category-set)))))
 	    ,@(let ((props (aref char-code-property-table char))
@@ -583,7 +583,7 @@
 		      (if display
 			  (concat
 			   "by this font (glyph code)\n"
-			   (format "     %s (0x%02X)"
+			   (format "     %s (#x%02X)"
 				   (car display) (cdr display)))
 			"no font available")
 		    (if display
@@ -657,7 +657,7 @@
 		  (insert (logand (car (aref disp-vector i)) #x7ffff) ?:
 			  (propertize " " 'display '(space :align-to 5))
 			  (if (cdr (aref disp-vector i))
-			      (format "%s (0x%02X)" (cadr (aref disp-vector i))
+			      (format "%s (#x%02X)" (cadr (aref disp-vector i))
 				      (cddr (aref disp-vector i)))
 			    "-- no font --")
 			  "\n")
@@ -708,7 +708,7 @@
 		  (insert "\n " (car elt) ?:
 			  (propertize " " 'display '(space :align-to 5))
 			  (if (cdr elt)
-			      (format "%s (0x%02X)" (cadr elt) (cddr elt))
+			      (format "%s (#x%02X)" (cadr elt) (cddr elt))
 			    "-- no font --"))))
 	    (insert "these terminal codes:")
 	    (dolist (elt component-chars)