Re: master 0bd860cc2e 1/2: Merge from origin/emacs-28

Re: master 0bd860cc2e 1/2: Merge from origin/emacs-28

[Stefan Kangas]

Stefan Kangas <stefankangas@gmail.com> writes:

> --- a/lisp/international/characters.el
> +++ b/lisp/international/characters.el
> @@ -1661,12 +1661,14 @@ GROUP must be one of these symbols:
>                      like U+2069 (PDI) and U+202B (RLE).
>    `variation-selectors':
>                      Characters in the range U+FE00..U+FE0F and
> -                    U+E0100..U+E01EF, used for selecting alternate glyph
> -                    presentations, such as Emoji vs Text presentation, of
> -                    the preceding character(s).
> -  `no-font':        For GUI frames, characters for which no suitable
> -                    font is found; for text-mode frames, characters
> -                    that cannot be encoded by `terminal-coding-system'.
> +                    U+E0100..U+E01EF, used for choosing between
> +                    glyph variations, such as Emoji vs Text
> +                    presentation, of the preceding character(s).
> +  `no-font':        For GUI frames, characters for which no
> +                    suitable font is found; for text-mode frames,
> +                    characters that cannot be encoded by
> +                    `terminal-coding-system' or those for which
> +                    the terminal has no glyphs.

Could someone please double check the hunk above and the changes in
xdisp.c to see that the merge looks okay?  Feel free to commit any
fixes directly to master.  Thanks in advance.

Re: master 0bd860cc2e 1/2: Merge from origin/emacs-28

[Eli Zaretskii]

> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Thu, 1 Sep 2022 07:01:00 +0200
> 
> Could someone please double check the hunk above and the changes in
> xdisp.c to see that the merge looks okay?  Feel free to commit any
> fixes directly to master.  Thanks in advance.

I fixed xdisp.c; the rest looks OK.

Thanks.