Merge from emacs--devo--0

[gnu-emacs] / src / fringe.c

diff --git a/src/fringe.c b/src/fringe.c
index 1a045d7034ee4df1edaf02222fde2c2aa4692411..ab55775189fe4318f7d3c401c4fb908d88ffe0a4 100644 (file)
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -866,10 +866,7 @@ draw_fringe_bitmap (w, row, left_p)
   draw_fringe_bitmap_1 (w, row, left_p, overlay, NO_FRINGE_BITMAP);
 
   if (left_p && row->overlay_arrow_bitmap != NO_FRINGE_BITMAP)
-    draw_fringe_bitmap_1 (w, row, 1, 1,
-                         (row->overlay_arrow_bitmap < 0
-                          ? get_logical_fringe_bitmap (w, Qoverlay_arrow, 0, 0)
-                          : row->overlay_arrow_bitmap));
+    draw_fringe_bitmap_1 (w, row, 1, 1, row->overlay_arrow_bitmap);
 }
 
 
@@ -1151,6 +1148,9 @@ update_window_fringes (w, keep_current_p)
            }
        }
 
+      if (row->overlay_arrow_bitmap < 0)
+       row->overlay_arrow_bitmap = get_logical_fringe_bitmap (w, Qoverlay_arrow, 0, 0);
+
       if (row->overlay_arrow_bitmap != cur->overlay_arrow_bitmap)
        {
          redraw_p = row->redraw_fringe_bitmaps_p = cur->redraw_fringe_bitmaps_p = 1;
@@ -1689,10 +1689,14 @@ init_fringe ()
     }
 }
 
-#ifdef HAVE_NTGUI
+#if defined (HAVE_NTGUI) || defined (MAC_OS)
 
 void
+#ifdef HAVE_NTGUI
 w32_init_fringe ()
+#else  /* MAC_OS */
+mac_init_fringe ()
+#endif
 {
   int bt;
 
@@ -1705,7 +1709,9 @@ w32_init_fringe ()
       rif->define_fringe_bitmap (bt, fb->bits, fb->height, fb->width);
     }
 }
+#endif
 
+#ifdef HAVE_NTGUI
 void
 w32_reset_fringes ()
 {