From a71cfa02f3bba0caaf49c4fc49d46fa6eb077692 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Tue, 10 Dec 2013 06:32:52 +0400 Subject: [PATCH] * xdisp.c (display_tool_bar_line): Don't extend on a previously drawn tool bar items (Bug#16058). --- src/ChangeLog | 5 +++++ src/xdisp.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 520261857df..0d61ef48154 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-12-10 Dmitry Antipov + + * xdisp.c (display_tool_bar_line): Don't extend on a previously + drawn tool bar items (Bug#16058). + 2013-12-09 Ken Brown * frame.c (get_frame_param): Make extern if HAVE_NTGUI. diff --git a/src/xdisp.c b/src/xdisp.c index 530eae3cb9e..6daa9131154 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -11937,7 +11937,9 @@ display_tool_bar_line (struct it *it, int height) int max_x = it->last_visible_x; struct glyph *last; - prepare_desired_row (row); + /* Don't extend on a previously drawn tool bar items (Bug#16058). */ + clear_glyph_row (row); + row->enabled_p = 1; row->y = it->current_y; /* Note that this isn't made use of if the face hasn't a box,