From e47fe93b1fd48294dd9e6c1080368216dc578e05 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 4 Feb 2009 02:02:27 +0000 Subject: [PATCH] (describe-char): Check font-object by fontp. --- lisp/ChangeLog | 9 +++++++++ lisp/descr-text.el | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ca787cfcd2d..944b55c47e7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2009-02-04 Kenichi Handa + + * descr-text.el (describe-char): Check font-object by fontp. + + * composite.el (compose-gstring-for-terminal): If a character is + not supported by the current terminal, don't make a multi-glyph + grapheme cluster. + (auto-compose-chars): Check font-object by fontp. + 2009-02-03 Glenn Morris * mail/unrmail.el (unrmail): In the absence of Mail-from, prefer Date diff --git a/lisp/descr-text.el b/lisp/descr-text.el index 96ef2458e42..89325cca22a 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@ -630,7 +630,7 @@ as well as widgets, buttons, overlays, and text properties." (nglyphs (lgstring-glyph-len gstring)) (i 0) glyph) - (if font + (if (fontp font) (progn (insert " using this font:\n " (symbol-name (font-get font :type)) -- 2.39.5