From: Martin Rudalics Date: Wed, 5 Feb 2014 10:46:44 +0000 (+0100) Subject: In draw_fringe_bitmap_1 don't draw fringe if it's outside the window (Bug#16649). X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~165 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=415e38104975bc21cae54a5913d9a88bb837c26c;p=emacs.git In draw_fringe_bitmap_1 don't draw fringe if it's outside the window (Bug#16649). * fringe.c (draw_fringe_bitmap_1): Don't draw a fringe if it's outside the window (Bug#16649). --- diff --git a/src/ChangeLog b/src/ChangeLog index be4907bf239..487fb4092d2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -5,6 +5,9 @@ 2014-02-05 Martin Rudalics + * fringe.c (draw_fringe_bitmap_1): Don't draw a fringe if it's + outside the window (Bug#16649). + * xdisp.c (note_mouse_highlight): When entering a margin area show a non-text cursor (Bug#16647). diff --git a/src/fringe.c b/src/fringe.c index eb2faa448f7..6325de4128e 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -695,7 +695,9 @@ draw_fringe_bitmap_1 (struct window *w, struct glyph_row *row, int left_p, int o } } - FRAME_RIF (f)->draw_fringe_bitmap (w, row, &p); + if (p.x >= WINDOW_BOX_LEFT_EDGE_X (w) + && (p.x + p.wd) <= WINDOW_BOX_LEFT_EDGE_X (w) + WINDOW_PIXEL_WIDTH (w)) + FRAME_RIF (f)->draw_fringe_bitmap (w, row, &p); } static int