merge from trunk

1 files changed, 2 insertions, 11 deletions

diff --git a/src/xterm.c b/src/xterm.c
index f845deabd82..7b42e858304 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5164,7 +5164,7 @@ XTset_vertical_scroll_bar (struct window *w, int portion, int whole, int positio
   int top, height, left, sb_left, width, sb_width;
   int window_y, window_height;
 #ifdef USE_TOOLKIT_SCROLL_BARS
-  int fringe_extended_p;
+  bool fringe_extended_p;
 #endif
 
   /* Get window dimensions.  */
@@ -5197,16 +5197,7 @@ XTset_vertical_scroll_bar (struct window *w, int portion, int whole, int positio
 #endif
 
 #ifdef USE_TOOLKIT_SCROLL_BARS
-  if (WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w))
-    fringe_extended_p = (WINDOW_LEFTMOST_P (w)
-                         && WINDOW_LEFT_FRINGE_WIDTH (w)
-                         && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
-                             || WINDOW_LEFT_MARGIN_COLS (w) == 0));
-  else
-    fringe_extended_p = (WINDOW_RIGHTMOST_P (w)
-                         && WINDOW_RIGHT_FRINGE_WIDTH (w)
-                         && (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
-                             || WINDOW_RIGHT_MARGIN_COLS (w) == 0));
+  fringe_extended_p = WINDOW_FRINGE_EXTENDED_P (w);
 #endif
 
   /* Does the scroll bar exist yet?  */