aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/descr-text.el18
1 files changed, 11 insertions, 7 deletions
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."
585 (cadr composition) "\""))) 585 (cadr composition) "\"")))
586 (insert " by the rule:\n\t(" 586 (insert " by the rule:\n\t("
587 (mapconcat (lambda (x) 587 (mapconcat (lambda (x)
588 (format (if (consp x) "%S" "?%c") x)) 588 (if (consp x) (format "%S" x)
589 (if (= x ?\t)
590 (single-key-description x)
591 (string ?? x))))
589 (nth 2 composition) 592 (nth 2 composition)
590 " ") 593 " ")
591 ")") 594 ")")
@@ -594,15 +597,16 @@ as well as widgets, buttons, overlays, and text properties."
594 (progn 597 (progn
595 (insert "these fonts (glyph codes):") 598 (insert "these fonts (glyph codes):")
596 (dolist (elt component-chars) 599 (dolist (elt component-chars)
597 (insert "\n " (car elt) ?: 600 (if (/= (car elt) ?\t)
598 (propertize " " 'display '(space :align-to 5)) 601 (insert "\n " (car elt) ?:
599 (if (cdr elt) 602 (propertize " " 'display '(space :align-to 5))
600 (format "%s (#x%02X)" (cadr elt) (cddr elt)) 603 (if (cdr elt)
601 "-- no font --")))) 604 (format "%s (#x%02X)" (cadr elt) (cddr elt))
605 "-- no font --")))))
602 (insert "these terminal codes:") 606 (insert "these terminal codes:")
603 (dolist (elt component-chars) 607 (dolist (elt component-chars)
604 (insert "\n " (car elt) ":" 608 (insert "\n " (car elt) ":"
605 (propertize " " 'display '(space :align-to 5)) 609 (propertize " " 'display '(space :align-to 4))
606 (or (cdr elt) "-- not encodable --")))) 610 (or (cdr elt) "-- not encodable --"))))
607 (insert "\nSee the variable `reference-point-alist' for " 611 (insert "\nSee the variable `reference-point-alist' for "
608 "the meaning of the rule.\n")) 612 "the meaning of the rule.\n"))