aboutsummaryrefslogtreecommitdiffstats
path: root/src/fringe.c
diff options
context:
space:
mode:
authorMiles Bader2006-03-28 23:08:20 +0000
committerMiles Bader2006-03-28 23:08:20 +0000
commit1ef7e5599f5aa981399221e657ff34e80cc2c1a3 (patch)
tree539ff4cf9ea84af29a4e8628d049f3a4253a51f4 /src/fringe.c
parent33bd75ec5fb277e58731c8cbbb942cba4d9a9f19 (diff)
parent29314e0fd78063d663bd272787d0ea81cc61e38e (diff)
downloademacs-1ef7e5599f5aa981399221e657ff34e80cc2c1a3.tar.gz
emacs-1ef7e5599f5aa981399221e657ff34e80cc2c1a3.zip
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-49
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 164-184) - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: man/mh-e.texi (Folders): Various edits. - Update from erc--emacs--0 * gnus--rel--5.10 (patch 62-70) - Merge from emacs--devo--0 - Update from CVS
Diffstat (limited to 'src/fringe.c')
-rw-r--r--src/fringe.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fringe.c b/src/fringe.c
index 2ce15d27d74..ab55775189f 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -866,10 +866,7 @@ draw_fringe_bitmap (w, row, left_p)
866 draw_fringe_bitmap_1 (w, row, left_p, overlay, NO_FRINGE_BITMAP); 866 draw_fringe_bitmap_1 (w, row, left_p, overlay, NO_FRINGE_BITMAP);
867 867
868 if (left_p && row->overlay_arrow_bitmap != NO_FRINGE_BITMAP) 868 if (left_p && row->overlay_arrow_bitmap != NO_FRINGE_BITMAP)
869 draw_fringe_bitmap_1 (w, row, 1, 1, 869 draw_fringe_bitmap_1 (w, row, 1, 1, row->overlay_arrow_bitmap);
870 (row->overlay_arrow_bitmap < 0
871 ? get_logical_fringe_bitmap (w, Qoverlay_arrow, 0, 0)
872 : row->overlay_arrow_bitmap));
873} 870}
874 871
875 872
@@ -1151,6 +1148,9 @@ update_window_fringes (w, keep_current_p)
1151 } 1148 }
1152 } 1149 }
1153 1150
1151 if (row->overlay_arrow_bitmap < 0)
1152 row->overlay_arrow_bitmap = get_logical_fringe_bitmap (w, Qoverlay_arrow, 0, 0);
1153
1154 if (row->overlay_arrow_bitmap != cur->overlay_arrow_bitmap) 1154 if (row->overlay_arrow_bitmap != cur->overlay_arrow_bitmap)
1155 { 1155 {
1156 redraw_p = row->redraw_fringe_bitmaps_p = cur->redraw_fringe_bitmaps_p = 1; 1156 redraw_p = row->redraw_fringe_bitmaps_p = cur->redraw_fringe_bitmaps_p = 1;