(x_draw_fringe_bitmap) [MAC_OSX]: Fix last change.

2 files changed, 14 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2d939ed30c3..f63999174ed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.c (x_draw_fringe_bitmap) [MAC_OSX]: Extend fringe background
+        to scroll bar gap also when bitmap fills fringe.  Draw only foreground
+        if extended background has already been filled.
+
 2007-06-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macgui.h (USE_CG_DRAWING): Don't require USE_ATSUI.
diff --git a/src/macterm.c b/src/macterm.c
index 0d7aa68bbea..52709c757f2 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -2243,13 +2243,16 @@ x_draw_fringe_bitmap (w, row, p)
                   ny = row->visible_height;
                 }
 
-              if (left + width == bx)
+              if (bx >= 0)
                 {
-                  bx = left + sb_width;
-                  nx += width - sb_width;
+                  if (left + width == bx)
+                    {
+                      bx = left + sb_width;
+                      nx += width - sb_width;
+                    }
+                  else if (bx + nx == left)
+                    nx += width - sb_width;
                 }
-              else if (bx + nx == left)
-                nx += width - sb_width;
             }
         }