From: 张云峰 <zhangyunfeng0101@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 65198@debbugs.gnu.org
Subject: bug#65198: 29.1; Emacs29.1 crash in function face_for_font
Date: Sat, 12 Aug 2023 00:14:01 +0800 [thread overview]
Message-ID: <CA+cG9GzQn298S2GARPK9xCVKicq7Zc9GJzJHTEVCDBG2ArcE4g@mail.gmail.com> (raw)
In-Reply-To: <83zg2xfvff.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1561 bytes --]
I made a little modification to this patch, and after verification, emacs
does not crash anymore, thanks!😊
diff --git a/src/xdisp.c b/src/xdisp.c
index 9cddcfe..830b622 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8312,9 +8312,14 @@ get_next_display_element (struct it *it)
&& success_p
&& FRAME_WINDOW_P (it->f))
{
- struct face *face = FACE_FROM_ID (it->f, it->face_id);
+ struct face *face = FACE_FROM_ID_OR_NULL (it->f, it->face_id);
- if (it->what == IT_COMPOSITION && it->cmp_it.ch >= 0)
+ if (!face)
+ {
+ it->what = IT_GLYPHLESS;
+ it->glyphless_method = GLYPHLESS_DISPLAY_EMPTY_BOX;
+ }
+ else if (it->what == IT_COMPOSITION && it->cmp_it.ch >= 0)
{
/* Automatic composition with glyph-string. */
Lisp_Object gstring = composition_gstring_from_id (it->cmp_it.id);
@@ -31782,8 +31787,8 @@ produce_glyphless_glyph (struct it *it, bool
for_no_font, Lisp_Object acronym)
/* Get the metrics of the base font. We always refer to the current
ASCII face. */
- face = FACE_FROM_ID (it->f, it->face_id)->ascii_face;
- font = face->font ? face->font : FRAME_FONT (it->f);
+ face = FACE_FROM_ID_OR_NULL (it->f, it->face_id);
+ if (face)
+ {
+ face = face->ascii_face;
+ }
+ font = (face && face->font) ? face->font : FRAME_FONT (it->f);
normal_char_ascent_descent (font, -1, &it->ascent, &it->descent);
it->ascent += font->baseline_offset;
it->descent -= font->baseline_offset;
[-- Attachment #2: Type: text/html, Size: 2165 bytes --]
next prev parent reply other threads:[~2023-08-11 16:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-10 9:57 bug#65198: 29.1; Emacs29.1 crash in function face_for_font 张云峰
2023-08-10 10:06 ` Eli Zaretskii
[not found] ` <CA+cG9GxATqwi7-aFEvma0zi3AZM5y6eshU510oPFohuKwhHF4w@mail.gmail.com>
2023-08-10 17:22 ` Eli Zaretskii
2023-08-10 17:58 ` 张云峰
2023-08-10 18:36 ` Eli Zaretskii
2023-08-11 0:15 ` 张云峰
2023-08-11 0:50 ` 张云峰
2023-08-11 6:12 ` Eli Zaretskii
2023-08-11 14:21 ` 张云峰
2023-08-11 14:55 ` 张云峰
2023-08-11 15:30 ` Eli Zaretskii
2023-08-11 16:14 ` 张云峰 [this message]
2023-08-12 6:39 ` Eli Zaretskii
2023-08-11 15:24 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CA+cG9GzQn298S2GARPK9xCVKicq7Zc9GJzJHTEVCDBG2ArcE4g@mail.gmail.com \
--to=zhangyunfeng0101@gmail.com \
--cc=65198@debbugs.gnu.org \
--cc=eliz@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).