1 files changed, 8 insertions, 2 deletions

diff --git a/src/fringe.c b/src/fringe.c
index 97d03a2bfae..6e6deeddb08 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -18,7 +18,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
-#include <setjmp.h>
 
 #include "lisp.h"
 #include "frame.h"
@@ -659,7 +658,14 @@ draw_fringe_bitmap_1 (struct window *w, struct glyph_row *row, int left_p, int o
         {
           /* 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;