mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-17 17:58:46 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Kenichi Handa 2000-06-08 01:23:19 +00:00
parent a86ef1933f
commit 0890801bd5
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -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

10
src/fontset.c
View File

@ -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);