diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-05-29 18:00:13 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-05-29 18:00:13 +0900 |
| commit | 67ae4b6271233559271f7a7158ba0e059b643ba5 (patch) | |
| tree | 9ceee3c99afb42b252ac11116cc31163acaaeb40 /src/fringe.c | |
| parent | 67a4c8b5ad9ebfb3fa2c7fae433aa6b6b5e92154 (diff) | |
| parent | e3fc16fd71a46990503a71b11a2ad592e99d9edb (diff) | |
| download | emacs-67ae4b6271233559271f7a7158ba0e059b643ba5.tar.gz | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
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 0224268c2e6..e67ea9d88fd 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -1797,14 +1797,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) |