diff options
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 32e9773b54e..32b359098aa 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -12876,7 +12876,7 @@ update_menu_bar (struct frame *f, bool save_match_data, bool hooks_run) the selected frame should be allowed to set it. */ if (f == SELECTED_FRAME ()) #endif - set_frame_menubar (f, false, false); + set_frame_menubar (f, false); } else /* On a terminal screen, the menu bar is an ordinary screen @@ -29813,7 +29813,8 @@ produce_stretch_glyph (struct it *it) #endif /* HAVE_WINDOW_SYSTEM */ height = 1; - if (width > 0 && it->line_wrap != TRUNCATE + if (width > 0 + && it->area == TEXT_AREA && it->line_wrap != TRUNCATE && it->current_x + width > it->last_visible_x) { width = it->last_visible_x - it->current_x; @@ -31927,9 +31928,8 @@ draw_row_with_mouse_face (struct window *w, int start_x, struct glyph_row *row, return; } #endif -#if defined (HAVE_GPM) || defined (MSDOS) || defined (WINDOWSNT) + tty_draw_row_with_mouse_face (w, row, start_hpos, end_hpos, draw); -#endif } /* Display the active region described by mouse_face_* according to DRAW. */ |