auto upstream

1 files changed, 5 insertions, 5 deletions

diff --git a/src/window.c b/src/window.c
index 61a8ae00e8c..1ca2b103b3f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -802,12 +802,12 @@ window_body_cols (struct window *w)
        occupies one column only.  */
     width -= 1;
 
+  /* Display margins cannot be used for normal text.  */
+  width -= WINDOW_LEFT_MARGIN_COLS (w) + WINDOW_RIGHT_MARGIN_COLS (w);
+
   if (FRAME_WINDOW_P (f))
-    /* On window-systems, fringes and display margins cannot be
-       used for normal text.  */
-    width -= (WINDOW_FRINGE_COLS (w)
-              + WINDOW_LEFT_MARGIN_COLS (w)
-              + WINDOW_RIGHT_MARGIN_COLS (w));
+    /* On window-systems, fringes cannot be used for normal text.  */
+    width -= WINDOW_FRINGE_COLS (w);
 
   return width;
 }