2 files changed, 11 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 41d63138069..0df19b097d6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-12  Gerd Moellmann  <gerd@gnu.org>
+
+        * xdisp.c (display_tool_bar_line): Make sure that tool bar
+        lines start with a relief line.
+
 2000-12-12  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * msdos.c (fast_find_position): Don't overstep the last window
diff --git a/src/xdisp.c b/src/xdisp.c
index bda00f34fca..11859e8d85b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7274,6 +7274,10 @@ display_tool_bar_line (it)
   
   prepare_desired_row (row);
   row->y = it->current_y;
+
+  /* Note that this isn't made use of if the face hasn't a box,
+     so there's no need to check the face here.  */
+  it->start_of_box_run_p = 1;
   
   while (it->current_x < max_x)
     {
@@ -7321,6 +7325,8 @@ display_tool_bar_line (it)
   extend_face_to_end_of_line (it);
   last = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] - 1;
   last->right_box_line_p = 1;
+  if (last == row->glyphs[TEXT_AREA])
+    last->left_box_line_p = 1;
   compute_line_metrics (it);
   
   /* If line is empty, make it occupy the rest of the tool-bar.  */