X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4ed774157d1687cc5236ecaf088dc48442e92431..8b55eeeb70be4b4ff3dd4694013bdb1a9f668bc6:/src/fringe.c

diff --git a/src/fringe.c b/src/fringe.c
index 3537027f1d..db4f92d6ce 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -659,6 +659,10 @@ 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)
+		  /* This could be wrong when we allow window local
+		     right dividers - but the window on the left is hard
+		     to get.  */
+		  && !FRAME_RIGHT_DIVIDER_WIDTH (f)
 		  && !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
@@ -1690,6 +1694,8 @@ If BITMAP already exists, the existing definition is replaced.  */)
 DEFUN ("set-fringe-bitmap-face", Fset_fringe_bitmap_face, Sset_fringe_bitmap_face,
        1, 2, 0,
        doc: /* Set face for fringe bitmap BITMAP to FACE.
+FACE is merged with the `fringe' face, so normally FACE should specify
+only the foreground color.
 If FACE is nil, reset face to default fringe face.  */)
   (Lisp_Object bitmap, Lisp_Object face)
 {