[Emacs-diffs] /srv/bzr/emacs/trunk r109958: Avoid leaving traces of cursor when entering linum-mode.

[Eli Zaretskii]

------------------------------------------------------------
revno: 109958
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-09 23:10:36 +0300
message:
  Avoid leaving traces of cursor when entering linum-mode.
  
   src/fringe.c (draw_fringe_bitmap_1): Don't reduce the width of the
   left fringe if the window has a left margin.  This avoids leaving
   traces of the cursor because its leftmost pixel is not drawn over.
modified:
  src/ChangeLog
  src/fringe.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-09 17:59:50 +0000
+++ b/src/ChangeLog     2012-09-09 20:10:36 +0000
@@ -1,5 +1,9 @@
 2012-09-09  Eli Zaretskii  <address@hidden>
 
+       * fringe.c (draw_fringe_bitmap_1): Don't reduce the width of the
+       left fringe if the window has a left margin.  This avoids leaving
+       traces of the cursor because its leftmost pixel is not drawn over.
+
        * dispnew.c (update_window_line): When the left margin area of a
        screen line is updated, set the redraw_fringe_bitmaps_p flag of
        that screen line.  (Bug#12277)

=== modified file 'src/fringe.c'
--- a/src/fringe.c      2012-08-07 07:33:18 +0000
+++ b/src/fringe.c      2012-09-09 20:10:36 +0000
@@ -659,7 +659,14 @@
        {
          /* If W has a vertical border to its left, don't draw over it.  */
          wd -= ((!WINDOW_LEFTMOST_P (w)
-                 && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w))
+                 && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w)
+                 /* But don't reduce the fringe width if the window
+                    has a left margin, because that means we are not
+                    in danger of drawing over the vertical border,
+                    and OTOH leaving out that one pixel leaves behind
+                    traces of the cursor, if it was in column zero
+                    before drawing non-empty margin area.  */
+                 && NILP (w->left_margin_cols))
                 ? 1 : 0);
          p.bx = x - wd;
          p.nx = wd;