(Fset_fontset_font): The arg CHARACTER may be a charset.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4c36ba9cd81e3757f840739996d25f0fe4a7b4a5..f5beae381b032dae9bd26a76a9b92ba8aae28c20 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-08  Kenichi Handa  <handa@etl.go.jp>
+
+       * fontset.c (Fset_fontset_font): The arg CHARACTER may be a
+       charset.
+
 2000-06-07  Gerd Moellmann  <gerd@gnu.org>
 
        * window.c (displayed_window_lines): Take empty lines at

diff --git a/src/fontset.c b/src/fontset.c
index fba4831c3fb3dffce3e2dedc4fd2a7c95d700048..4df99116f9a9af34d1e40427cb34051ba1cabb8b 100644 (file)
--- 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);