2 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cea6434be30..645d67ea928 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2007-03-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (x_scroll_bar_create, XTread_socket): Replace #if
+        USE_TOOLKIT_SCROLL_BARS with #ifdef USE_TOOLKIT_SCROLL_BARS.
+        (x_set_window_size): Call SET_FRAME_GARBAGED.  Clear window if
+        internal border width has changed.
+
+        * macterm.h (struct mac_output): New member `internal_border_width'.
+
 2007-03-04  Richard Stallman  <rms@gnu.org>
 
         * window.c (Fdisplay_buffer): Doc fix.
diff --git a/src/macterm.h b/src/macterm.h
index 3d0b41f6efe..b3826c5e7f7 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -327,6 +327,9 @@ struct mac_output
      They are changed only when a different background is involved.  */
   unsigned long relief_background;
 
+  /* Width of the internal border.  */
+  int internal_border_width;
+
   /* Hints for the size and the position of a window.  */
   XSizeHints *size_hints;