procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-28

Browse source 
bdb489a ; * etc/DEBUG: Adjust instructions for libgccjit reproducer.
b4fb381 ; * src/xdisp.c (produce_stretch_glyph): Avoid compilation wa...
This commit is contained in:
Eli Zaretskii 2021-11-23 15:11:14 +02:00
commit 8b62b20159
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
etc/DEBUG
View file

@ -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.

2
src/xdisp.c
View file

@ -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))
{