Merge from emacs--devo--0

[gnu-emacs] / src / fringe.c

diff --git a/src/fringe.c b/src/fringe.c
index 9c92a18231654070681d661499f9599b1afb17ba..ab55775189fe4318f7d3c401c4fb908d88ffe0a4 100644 (file)
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -585,7 +585,7 @@ draw_fringe_bitmap_1 (w, row, left_p, overlay, which)
       Lisp_Object face;
 
       if ((face = fringe_faces[which], NILP (face))
-         || (face_id = lookup_derived_face (f, face, 'A', FRINGE_FACE_ID, 0),
+         || (face_id = lookup_derived_face (f, face, FRINGE_FACE_ID, 0),
              face_id < 0))
        face_id = FRINGE_FACE_ID;
     }
@@ -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;
@@ -1554,7 +1554,7 @@ If FACE is nil, reset face to default fringe face.  */)
   if (!NILP (face))
     {
       face_id = lookup_derived_face (SELECTED_FRAME (), face,
-                                    'A', FRINGE_FACE_ID, 1);
+                                    FRINGE_FACE_ID, 1);
       if (face_id < 0)
        error ("No such face");
     }
@@ -1689,10 +1689,10 @@ init_fringe ()
     }
 }
 
-#if defined (WINDOWS_NT) || defined (MAC_OS)
+#if defined (HAVE_NTGUI) || defined (MAC_OS)
 
 void
-#ifdef WINDOWS_NT
+#ifdef HAVE_NTGUI
 w32_init_fringe ()
 #else  /* MAC_OS */
 mac_init_fringe ()
@@ -1711,7 +1711,7 @@ mac_init_fringe ()
 }
 #endif
 
-#ifdef WINDOWS_NT
+#ifdef HAVE_NTGUI
 void
 w32_reset_fringes ()
 {