[Emacs-diffs] Changes to emacs/lisp/descr-text.el,v

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/07/25 12:02:00

Index: descr-text.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/descr-text.el,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- descr-text.el       17 Jul 2008 01:25:22 -0000      1.67
+++ descr-text.el       25 Jul 2008 12:01:59 -0000      1.68
@@ -461,10 +461,10 @@
               (disp-vector
                (setq disp-vector (copy-sequence disp-vector))
                (dotimes (i (length disp-vector))
-                 (setq char (aref disp-vector i))
                  (aset disp-vector i
-                       (cons char (describe-char-display
-                                   pos (glyph-char char)))))
+                       (cons (aref disp-vector i)
+                             (describe-char-display
+                              pos (glyph-char (aref disp-vector i))))))
                (format "by display table entry [%s] (see below)"
                        (mapconcat
                         #'(lambda (x)
@@ -544,7 +544,7 @@
          (save-excursion
            (goto-char (point-min))
            (re-search-forward "character:[ \t\n]+")
-           (let* ((end (+ (point) (length char-description))))
+           (let ((end (+ (point) (length char-description))))
              (mapc #'(lambda (props)
                        (let ((o (make-overlay (point) end)))
                          (while props
@@ -561,9 +561,7 @@
                (dotimes (i (length disp-vector))
                  (insert (glyph-char (car (aref disp-vector i))) ?:
                          (propertize " " 'display '(space :align-to 5))
-                         (if (cdr (aref disp-vector i))
-                             (cdr (aref disp-vector i))
-                           "-- no font --")
+                         (or (cdr (aref disp-vector i)) "-- no font --")
                          "\n")
                  (let ((face (glyph-face (car (aref disp-vector i)))))
                    (when face
@@ -600,10 +598,11 @@
                        "\"")))
          (if (and (vectorp (nth 2 composition))
                   (vectorp (aref (nth 2 composition) 0)))
-             (progn
+             (let ((font (aref (aref (nth 2 composition) 0) 0)))
                (insert " using this font:\n  "
-                       (aref (query-font (aref (aref (nth 2 composition) 0) 0))
-                             0)
+                       (symbol-name (font-get font :type))
+                       ?:
+                       (aref (query-font font) 0)
                        "\nby these glyphs:\n")
                (mapc (lambda (x) (insert (format "  %S\n" x)))
                      (nth 2 composition)))