Mercurial > emacs

changeset 61634:e188b7249c28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(draw_fringe_bitmap): Use overlay_arrow_bitmap from row rather than from window. (update_window_fringes): Compare overlay_arrow_bitmap rather than overlay_arrow_p members. (Ffringe_bitmaps_at_pos): Return fringe overlay_arrow_bitmap name if not default.
author Kim F. Storm <storm@cua.dk>
date Mon, 18 Apr 2005 14:09:32 +0000
parents a76a30ee7c89
children a31ea8d7f03c
files src/fringe.c
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/fringe.c	Mon Apr 18 14:09:10 2005 +0000
+++ b/src/fringe.c	Mon Apr 18 14:09:32 2005 +0000
@@ -699,11 +699,11 @@
 
   draw_fringe_bitmap_1 (w, row, left_p, overlay, NO_FRINGE_BITMAP);
 
-  if (left_p && row->overlay_arrow_p)
+  if (left_p && row->overlay_arrow_bitmap != NO_FRINGE_BITMAP)
     draw_fringe_bitmap_1 (w, row, 1, 1,
-			  (w->overlay_arrow_bitmap
-			   ? w->overlay_arrow_bitmap
-			   : OVERLAY_ARROW_BITMAP));
+			  (row->overlay_arrow_bitmap < 0
+			   ? OVERLAY_ARROW_BITMAP
+			   : row->overlay_arrow_bitmap));
 }
 
 
@@ -959,10 +959,10 @@
 	  cur->right_fringe_face_id = right_face_id;
 	}
 
-      if (row->overlay_arrow_p != cur->overlay_arrow_p)
+      if (row->overlay_arrow_bitmap != cur->overlay_arrow_bitmap)
 	{
 	  redraw_p = row->redraw_fringe_bitmaps_p = cur->redraw_fringe_bitmaps_p = 1;
-	  cur->overlay_arrow_p = row->overlay_arrow_p;
+	  cur->overlay_arrow_bitmap = row->overlay_arrow_bitmap;
 	}
 
       row->left_fringe_bitmap = left;
@@ -1408,7 +1408,9 @@
   if (row)
     return list3 (get_fringe_bitmap_name (row->left_fringe_bitmap),
 		  get_fringe_bitmap_name (row->right_fringe_bitmap),
-		  (row->overlay_arrow_p ? Qt : Qnil));
+		  (row->overlay_arrow_bitmap == 0 ? Qnil
+		   : row->overlay_arrow_bitmap < 0 ? Qt
+		   : get_fringe_bitmap_name (row->overlay_arrow_bitmap)));
   else
     return Qnil;
 }