diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-08-13 17:49:51 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-08-13 17:49:51 +0300 |
| commit | c90975f92fd71be7282293e0ed1098c0fa5d62a0 (patch) | |
| tree | aa873f81d0436527a3b80e6f26bd41c5cd889934 /src/xterm.c | |
| parent | 2b329ed420eb15f6738edd402697ac2876b2aa61 (diff) | |
| download | emacs-c90975f92fd71be7282293e0ed1098c0fa5d62a0.tar.gz | |
Fix initialization of user-defined fringe bitmaps in daemon mode
* src/fringe.c (gui_init_fringe): Rename from w32_init_fringe
or x_cr_init_fringe, and make unconditionally compiled; all
callers changed. Do nothing if the frame's
redisplay_interface doesn't implement the define_fringe_bitmap
method. Set up any user-defined fringe bitmaps in addition to
the standard bitmaps.
Suggested by Liam Quinlan <liamkquinlan@gmail.com> in
https://lists.gnu.org/archive/html/emacs-devel/2019-08/msg00259.html.
(w32_reset_fringes) [HAVE_NTGUI]: Do nothing if the frame's
redisplay_interface doesn't implement the
destroy_fringe_bitmap method.
* src/w32fns.c (Fx_create_frame): Call gui_init_fringe when
the first GUI frame is created for this session.
* src/dispextern.h (w32_init_fringe): Rename to
gui_init_fringe and make unconditional.
(x_cr_init_fringe): Remove prototype.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xterm.c b/src/xterm.c index bbe68ef6221..0d224063d76 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -13531,7 +13531,7 @@ x_initialize (void) #endif #ifdef USE_CAIRO - x_cr_init_fringe (&x_redisplay_interface); + gui_init_fringe (&x_redisplay_interface); #endif /* Note that there is no real way portable across R3/R4 to get the |