bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#49782: 28.0.50; set-fontset-font crashes in init (server)


From: Eli Zaretskii
Subject: bug#49782: 28.0.50; set-fontset-font crashes in init (server)
Date: Sat, 31 Jul 2021 16:23:33 +0300

> From: Benjamin Riefenstahl <b.riefenstahl@turtle-trading.net>
> Cc: 49782-done@debbugs.gnu.org
> Date: Sat, 31 Jul 2021 15:05:44 +0200
> 
> > But before you embark on that adventure, please try another stab in
> > the dark:
> >
> > diff --git a/src/fontset.c b/src/fontset.c
> > index d2d428d..7d4bd65 100644
> > --- a/src/fontset.c
> > +++ b/src/fontset.c
> > @@ -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);
> 
> Yes, this works.  It works for running Emacs directly as well as through
> 'emacsclient -a ""' and 'emacsclient -a "emacs"'.  I think this is it.

Great, thanks.






reply via email to

[Prev in Thread] Current Thread [Next in Thread]