(describe-char): Fix terminal case (where font is nil).

diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index e585f644cdf3cb4d4283dcb6d242372cf32f4bad..689e4d3df6a18b943653db0fffcbda65c1c00199 100644 (file)
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -606,15 +606,23 @@ as well as widgets, buttons, overlays, and text properties."
                     (nglyphs (lgstring-glyph-len gstring))
                     (i 0)
                     glyph)
-               (insert " using this font:\n  "
-                       (symbol-name (font-get font :type))
-                       ?:
-                       (aref (query-font font) 0)
-                       "\nby these glyphs:\n")
-               (while (and (< i nglyphs)
-                           (setq glyph (lgstring-glyph gstring i)))
-                 (insert (format "  %S\n" glyph))
-                 (setq i (1+ i))))
+               (if font
+                   (progn
+                     (insert " using this font:\n  "
+                             (symbol-name (font-get font :type))
+                             ?:
+                             (aref (query-font font) 0)
+                             "\nby these glyphs:\n")
+                     (while (and (< i nglyphs)
+                                 (setq glyph (lgstring-glyph gstring i)))
+                       (insert (format "  %S\n" glyph))
+                       (setq i (1+ i))))
+                 (insert " by these characters:\n")
+                 (while (and (< i nglyphs)
+                             (setq glyph (lgstring-glyph gstring i)))
+                   (insert (format " %c (#x%d)\n"
+                                   (lglyph-char glyph) (lglyph-char glyph)))
+                   (setq i (1+ i)))))
            (insert " by the rule:\n\t(")
            (let ((first t))
              (mapc (lambda (x)