[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 8b62b20: Merge from origin/emacs-28
From: |
Eli Zaretskii |
Subject: |
master 8b62b20: Merge from origin/emacs-28 |
Date: |
Tue, 23 Nov 2021 08:12:51 -0500 (EST) |
branch: master
commit 8b62b20159f8ec3f5c7ea5227f814681741d61b1
Merge: 84d9d47 bdb489a
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Merge from origin/emacs-28
bdb489a ; * etc/DEBUG: Adjust instructions for libgccjit reproducer.
b4fb381 ; * src/xdisp.c (produce_stretch_glyph): Avoid compilation wa...
---
etc/DEBUG | 7 ++++---
src/xdisp.c | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/etc/DEBUG b/etc/DEBUG
index 5553705..ced6a92 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -591,9 +591,10 @@ If you cannot figure out the cause for the problem using
the above,
native-compile the problematic file after setting the variable
'comp-libgccjit-reproducer' to a non-nil value. That should produce a
file named ELNFILENAME_libgccjit_repro.c, where ELNFILENAME is the
-name of the problematic .eln file, in the same directory where the
-.eln file is produced. Then attach that reproducer C file to your bug
-report.
+name of the problematic .eln file in the same directory where the .eln
+file is produced, or a file repro.c under your ~/.emacs.d/eln-cache
+(which one depends on how the native-compilation is invoked). Then
+attach that reproducer C file to your bug report.
** Following longjmp call.
diff --git a/src/xdisp.c b/src/xdisp.c
index f6aa7fe..11ea836 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -30060,7 +30060,7 @@ produce_stretch_glyph (struct it *it)
#ifdef HAVE_WINDOW_SYSTEM
int ascent = 0;
bool zero_height_ok_p = false;
- struct face *face;
+ struct face *face = NULL; /* shut up GCC's -Wmaybe-uninitialized */
if (FRAME_WINDOW_P (it->f))
{