diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2024-04-01 17:58:04 +0800 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2024-04-01 17:58:04 +0800 |
| commit | 3af419ed0f0bf23320f8a7ac3479e2c50c353cde (patch) | |
| tree | fa45f6aee9812f8684ca888823c89cdcc89e6ddb /src/w32term.c | |
| parent | 101801ca13632ae17b486f690701b9cb36868676 (diff) | |
| parent | 87be53846bfbf5a6387cb5a40105bd0fc5b48b38 (diff) | |
| download | emacs-3af419ed0f0bf23320f8a7ac3479e2c50c353cde.tar.gz | |
Merge upstream Git snapshot into athena/unstable
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/w32term.c b/src/w32term.c index 816584a13be..7afd1303b4d 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -776,12 +776,13 @@ w32_buffer_flipping_unblocked_hook (struct frame *f) /* Flip buffers on F if drawing has happened. This function is not called to flush the display connection of a frame (which doesn't - exist on MS Windows), but also called in some situations in + exist on MS Windows), but is called in some situations in minibuf.c to make the contents of the back buffer visible. */ void w32_flip_buffers_if_dirty (struct frame *f) { - if (FRAME_OUTPUT_DATA (f)->paint_buffer + if (FRAME_W32_P (f) /* do nothing in TTY frames */ + && FRAME_OUTPUT_DATA (f)->paint_buffer && FRAME_OUTPUT_DATA (f)->paint_buffer_dirty && !f->garbaged && !buffer_flipping_blocked_p ()) w32_show_back_buffer (f); @@ -949,7 +950,7 @@ w32_define_fringe_bitmap (int which, unsigned short *bits, int h, int wd) { int i = max_fringe_bmp; max_fringe_bmp = which + 20; - fringe_bmp = (HBITMAP *) xrealloc (fringe_bmp, max_fringe_bmp * sizeof (HBITMAP)); + fringe_bmp = xrealloc (fringe_bmp, max_fringe_bmp * sizeof (HBITMAP)); while (i < max_fringe_bmp) fringe_bmp[i++] = 0; } |