2 files changed, 29 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3779a9fe8f3..b8c2d7a90ed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,26 @@
+2007-07-27  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * w32term.c (w32_draw_fringe_bitmap): Extend fringe background to
+        scroll bar gap.
+        (x_scroll_bar_create): Set bar->fringe_extended_p.
+        (w32_set_vertical_scroll_bar): Put leftmost/rightmost scroll bars
+        on frame edge.  Check fringe background extension.  Don't clear
+        extended fringe background area.
+
+        * w32term.h (struct scroll_bar): New member fringe_extended_p.
+        (w32_fill_area): Enclose multiple statements with do ... while (0).
+
+        * xterm.c (x_draw_fringe_bitmap) [USE_TOOLKIT_SCROLL_BARS]:
+        Extend fringe background to scroll bar gap.
+        (x_scroll_bar_create) [USE_TOOLKIT_SCROLL_BARS]:
+        Set bar->fringe_extended_p.
+        (XTset_vertical_scroll_bar) [USE_TOOLKIT_SCROLL_BARS]:
+        Put leftmost/rightmost scroll bars on frame edge.  Check fringe
+        background extension.  Don't clear extended fringe background area.
+
+        * xterm.h (struct scroll_bar) [USE_TOOLKIT_SCROLL_BARS]:
+        New member fringe_extended_p.
+
 2007-07-25  Glenn Morris  <rgm@gnu.org>
 
         * Relicense all FSF files to GPLv3 or later.
diff --git a/src/xterm.h b/src/xterm.h
index 70e0522e9cc..65499d45b0f 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -807,6 +807,12 @@ struct scroll_bar
      place where the user grabbed it.  If the handle isn't currently
      being dragged, this is Qnil.  */
   Lisp_Object dragging;
+
+#ifdef USE_TOOLKIT_SCROLL_BARS
+  /* t if the background of the fringe that is adjacent to a scroll
+     bar is extended to the gap between the fringe and the bar.  */
+  Lisp_Object fringe_extended_p;
+#endif
 };
 
 /* The number of elements a vector holding a struct scroll_bar needs.  */