From 0890801bd5d173fb4efbbf12b27a7711161d6778 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 8 Jun 2000 01:23:19 +0000 Subject: [PATCH] (Fset_fontset_font): The arg CHARACTER may be a charset. --- src/ChangeLog | 5 +++++ src/fontset.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 4c36ba9cd81..f5beae381b0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2000-06-08 Kenichi Handa + + * fontset.c (Fset_fontset_font): The arg CHARACTER may be a + charset. + 2000-06-07 Gerd Moellmann * window.c (displayed_window_lines): Take empty lines at diff --git a/src/fontset.c b/src/fontset.c index fba4831c3fb..4df99116f9a 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -972,6 +972,8 @@ DEFUN ("set-fontset-font", Fset_fontset_font, Sset_fontset_font, 3, 4, 0, CHARACTER may be a cons; (FROM . TO), where FROM and TO are\n\ non-generic characters. In that case, use FONTNAME\n\ for all characters in the range FROM and TO (inclusive).\n\ +CHARACTER may be a charset. In that case, use FONTNAME\n\ +for all character in the charsets.\n\ \n\ FONTNAME may be a cons; (FAMILY . REGISTRY), where FAMILY is a family\n\ name of a font, REGSITRY is a registry name of a font.") @@ -1000,6 +1002,14 @@ name of a font, REGSITRY is a registry name of a font.") && (SINGLE_BYTE_CHAR_P (from) || SINGLE_BYTE_CHAR_P (to))) error ("Can't change font for a single byte character"); } + else if (SYMBOLP (character)) + { + elt = Fget (character, Qcharset); + if (!VECTORP (elt) || ASIZE (elt) < 1 || !NATNUMP (AREF (elt, 0))) + error ("Invalid charset: %s", (XSYMBOL (character)->name)->data); + from = MAKE_CHAR (XINT (AREF (elt, 0)), 0, 0); + to = from; + } else { CHECK_NUMBER (character, 1); -- 2.39.5