[Emacs-diffs] trunk r115445: * xdisp.c (display_tool_bar_line): Don't extend on a previously

[Dmitry Antipov]

------------------------------------------------------------
revno: 115445
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Tue 2013-12-10 06:32:52 +0400
message:
  * xdisp.c (display_tool_bar_line): Don't extend on a previously
  drawn tool bar items (Bug#16058).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-09 20:46:07 +0000
+++ b/src/ChangeLog     2013-12-10 02:32:52 +0000
@@ -1,3 +1,8 @@
+2013-12-10  Dmitry Antipov  <address@hidden>
+
+       * xdisp.c (display_tool_bar_line): Don't extend on a previously
+       drawn tool bar items (Bug#16058).
+
 2013-12-09  Ken Brown  <address@hidden>
 
        * frame.c (get_frame_param): Make extern if HAVE_NTGUI.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-12-04 18:46:47 +0000
+++ b/src/xdisp.c       2013-12-10 02:32:52 +0000
@@ -11937,7 +11937,9 @@
   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,