summaryrefslogtreecommitdiff
path: root/src/fringe.c
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-06-04 11:29:18 -0700
committerGlenn Morris <rgm@gnu.org>2011-06-04 11:29:18 -0700
commit99a33b77e15b9a075024701d060d912b2fd87caf (patch)
tree945b4a4623e0acb762443c369bbabe7a0a6caa00 /src/fringe.c
parent1cfbb9666bc467170fbfdd612b2c7186908e0e45 (diff)
parent8b3115e7025b5091b2a7cd68f6ac3442964b59e5 (diff)
downloademacs-99a33b77e15b9a075024701d060d912b2fd87caf.tar.gz
Merge from emacs-23; up to 2010-06-12T17:12:15Z!cyd@stupidchicken.com.
Diffstat (limited to 'src/fringe.c')
-rw-r--r--src/fringe.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/fringe.c b/src/fringe.c
index 75c65bbcd87..d886ac48852 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1279,8 +1279,12 @@ update_window_fringes (struct window *w, int keep_current_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_bitmap = row->overlay_arrow_bitmap;
+ redraw_p = row->redraw_fringe_bitmaps_p = 1;
+ if (!keep_current_p)
+ {
+ cur->redraw_fringe_bitmaps_p = 1;
+ cur->overlay_arrow_bitmap = row->overlay_arrow_bitmap;
+ }
}
row->left_fringe_bitmap = left;