(x_draw_fringe_bitmap) [MAC_OSX]: Fix last change.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2d939ed30c34e548134b2a64009dd2233bfd3d59..f63999174ed271dd4877eef9f4e7814d97e2838e 100644 (file)
--- 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 0d7aa68bbea49a0e9c65131bfa2711795d8f83db..52709c757f299b2cd0a7e194f1c135e3b81bd0c1 100644 (file)
--- 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;
            }
        }