diff options
| author | Kim F. Storm <storm@cua.dk> | 2005-04-18 14:09:32 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2005-04-18 14:09:32 +0000 |
| commit | a8b34fae0031b8280203f39e49691984b510258b (patch) | |
| tree | 439d7b9c12e4a0d80f120a41de78ff60b08bba39 /src/fringe.c | |
| parent | 3d4a365f6184f70e95cefc599711ef8226328639 (diff) | |
| download | emacs-a8b34fae0031b8280203f39e49691984b510258b.tar.gz | |
(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.
Diffstat (limited to 'src/fringe.c')
| -rw-r--r-- | src/fringe.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/fringe.c b/src/fringe.c index f375159c8bc..08c034bbe82 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -699,11 +699,11 @@ 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_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 @@ update_window_fringes (w, force_p) 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 @@ Return nil if POS is not visible in WINDOW. */) 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; } |