diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-04-19 13:33:31 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-04-19 13:33:31 +0000 |
| commit | 94c03d2b0bfd9c9c0acdb5fa4843aef6b6af8c88 (patch) | |
| tree | d625002d7d6451d5c22479ed3c14fa9a77a3c4a1 /src/fringe.c | |
| parent | 327a8eeeb6c4dee859e8a3ac12de07cd7fd93036 (diff) | |
| parent | 2b82864a8bf8558b63296fcac916940d61294e0e (diff) | |
| download | emacs-94c03d2b0bfd9c9c0acdb5fa4843aef6b6af8c88.tar.gz | |
Merged from miles@gnu.org--gnu-2005 (patch 66, 266-268)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-266
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-267
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-268
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-66
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-330
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 39479dfed21..19e6e60d114 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -700,11 +700,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)); } @@ -960,10 +960,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; @@ -1414,7 +1414,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; } |