emacs-diffs
[Top][All Lists]
Advanced

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

scratch/igc 6b204cab9ae: Fix some crashes in redisplay


From: Eli Zaretskii
Subject: scratch/igc 6b204cab9ae: Fix some crashes in redisplay
Date: Fri, 26 Apr 2024 03:36:42 -0400 (EDT)

branch: scratch/igc
commit 6b204cab9ae6ab35197e28f98458c438b3191e38
Author: Helmut Eller <eller.helmut@gmail.com>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix some crashes in redisplay
    
    * src/igc.c (fix_frame): Scan frame fonts.
---
 src/igc.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/igc.c b/src/igc.c
index 89a2ac3d9a7..21079556721 100644
--- a/src/igc.c
+++ b/src/igc.c
@@ -45,6 +45,9 @@ along with GNU Emacs.  If not, see 
<https://www.gnu.org/licenses/>. */
 #include "thread.h"
 #include "treesit.h"
 #include "puresize.h"
+#ifdef HAVE_WINDOW_SYSTEM
+#include TERM_HEADER
+#endif /* HAVE_WINDOW_SYSTEM */
 
 #ifndef USE_LSB_TAG
 # error "USE_LSB_TAG required"
@@ -1318,6 +1321,15 @@ fix_frame (mps_ss_t ss, struct frame *f)
     IGC_FIX12_RAW (ss, &f->face_cache);
     if (f->terminal)
       IGC_FIX12_RAW (ss, &f->terminal);
+#ifdef HAVE_WINDOW_SYSTEM
+    if (FRAME_WINDOW_P (f) && FRAME_OUTPUT_DATA (f))
+      {
+       struct font *font = FRAME_FONT (f);
+       if (font)
+         IGC_FIX12_RAW(ss, &FRAME_FONT (f));
+      }
+#endif
+
   }
   MPS_SCAN_END (ss);
   return MPS_RES_OK;



reply via email to

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