From 9f40939dcdefd5b3eb26e442b1da6cfad60fc48d Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Sun, 20 Nov 2005 07:43:44 +0000 Subject: [PATCH] (describe-char): Use Lisp-readable syntax for octal and hex. Reorder decimal, octal and hex values. Remove excess whitespace in the output. --- lisp/descr-text.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/descr-text.el b/lisp/descr-text.el index 5f410da17a7..307fd465472 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@ -467,7 +467,7 @@ as well as widgets, buttons, overlays, and text properties." (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 @@ as well as widgets, buttons, overlays, and text properties." ,@(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 @@ as well as widgets, buttons, overlays, and text properties." (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 @@ as well as widgets, buttons, overlays, and text properties." (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 @@ as well as widgets, buttons, overlays, and text properties." (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) -- 2.11.4.GIT