mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-22 07:09:54 +00:00
Code Issues Releases Activity

Consider all user-defined bitmaps in gui_init_fringe()

Browse Source 
* src/fringe.c (gui_init_fringe): Consider user-defined bitmaps
that override default ones (bug#47832).
This commit is contained in:
Gregory Heytings 2021-05-25 06:21:03 +02:00 committed by Lars Ingebrigtsen
parent 0b48e2d258
commit 740d424547
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fringe.c
View File

@ -1776,14 +1776,15 @@ gui_init_fringe (struct redisplay_interface *rif)
for (bt = NO_FRINGE_BITMAP + 1; bt < MAX_STANDARD_FRINGE_BITMAPS; bt++) for (bt = NO_FRINGE_BITMAP + 1; bt < MAX_STANDARD_FRINGE_BITMAPS; bt++)
{ {
struct fringe_bitmap *fb = &standard_bitmaps[bt]; struct fringe_bitmap *fb = &standard_bitmaps[bt];
rif->define_fringe_bitmap (bt, fb->bits, fb->height, fb->width); if (!fringe_bitmaps[bt])
rif->define_fringe_bitmap (bt, fb->bits, fb->height, fb->width);
} }
/* Set up user-defined fringe bitmaps that might have been defined /* Set up user-defined fringe bitmaps that might have been defined
before the frame of this kind was initialized. This can happen before the frame of this kind was initialized. This can happen
if Emacs is started as a daemon and the init files define fringe if Emacs is started as a daemon and the init files define fringe
bitmaps. */ bitmaps. */
for ( ; bt < max_used_fringe_bitmap; bt++) for (bt = NO_FRINGE_BITMAP + 1; bt < max_used_fringe_bitmap; bt++)
{ {
struct fringe_bitmap *fb = fringe_bitmaps[bt]; struct fringe_bitmap *fb = fringe_bitmaps[bt];
if (fb) if (fb)