procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/fontset.c (check_fontset_name): A better fix for bug#49782.

Browse source
This commit is contained in:
Eli Zaretskii 2021-07-31 09:28:36 +03:00
parent 44fe0043d3
commit 0992335d12
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/fontset.c
View file

@ -1356,15 +1356,16 @@ check_fontset_name (Lisp_Object name, Lisp_Object *frame)
int id;
struct frame *f = decode_live_frame (*frame);
if (!FRAME_WINDOW_P (f) && !FRAME_INITIAL_P (f))
error ("Can't use fontsets in non-GUI frames");
XSETFRAME (*frame, f);
if (EQ (name, Qt))
return Vdefault_fontset;
if (NILP (name))
id = FRAME_FONTSET (f);
{
if (!FRAME_WINDOW_P (f))
error ("Can't use fontsets in non-GUI frames");
id = FRAME_FONTSET (f);
}
else
{
CHECK_STRING (name);