diff options
| author | Gregory Heytings <gregory@heytings.org> | 2021-05-25 06:21:03 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2021-05-25 06:21:03 +0200 |
| commit | 740d424547d3fabefc40e5aabba9bc2d5ba837fc (patch) | |
| tree | 8b87864a2b0664c5d5bbaa7434c17af6b2f6e3b5 /src/fringe.c | |
| parent | 0b48e2d258cb3c0ad5d12c5b4aaf9b4b69101763 (diff) | |
| download | emacs-740d424547d3fabefc40e5aabba9bc2d5ba837fc.tar.gz | |
Consider all user-defined bitmaps in gui_init_fringe()
* src/fringe.c (gui_init_fringe): Consider user-defined bitmaps
that override default ones (bug#47832).
Diffstat (limited to 'src/fringe.c')
| -rw-r--r-- | src/fringe.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fringe.c b/src/fringe.c index 65c9a84ac99..47615f51f97 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -1776,14 +1776,15 @@ gui_init_fringe (struct redisplay_interface *rif) for (bt = NO_FRINGE_BITMAP + 1; bt < MAX_STANDARD_FRINGE_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 before the frame of this kind was initialized. This can happen if Emacs is started as a daemon and the init files define fringe 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]; if (fb) |