[Emacs-diffs] trunk r116271: In draw_fringe_bitmap_1 don't draw fringe if it's outside the window (Bug#16649).

[Martin Rudalics]

------------------------------------------------------------
revno: 116271
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Wed 2014-02-05 11:46:44 +0100
message:
  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).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/fringe.c                   fringe.c-20091113204419-o5vbwnq5f7feedwu-2965

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-02-05 10:31:09 +0000
+++ b/src/ChangeLog     2014-02-05 10:46:44 +0000
@@ -5,6 +5,9 @@
 
 2014-02-05  Martin Rudalics  <address@hidden>
 
+       * 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).
 

=== modified file 'src/fringe.c'
--- a/src/fringe.c      2014-01-01 07:43:34 +0000
+++ b/src/fringe.c      2014-02-05 10:46:44 +0000
@@ -695,7 +695,9 @@
        }
     }
 
-  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