[Emacs-diffs] /srv/bzr/emacs/trunk r111327: Fix window-body-width on text terminals.

[Eli Zaretskii]

------------------------------------------------------------
revno: 111327
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2012-12-25 19:37:29 +0200
message:
  Fix window-body-width on text terminals.
  
   src/window.c (window_body_cols): Subtract display margins from the
   window body width on TTYs as well.  See
   http://lists.gnu.org/archive/html/help-gnu-emacs/2012-12/msg00317.html
   for the original report.
modified:
  src/ChangeLog
  src/window.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-25 15:07:59 +0000
+++ b/src/ChangeLog     2012-12-25 17:37:29 +0000
@@ -1,3 +1,10 @@
+2012-12-25  Eli Zaretskii  <address@hidden>
+
+       * window.c (window_body_cols): Subtract display margins from the
+       window body width on TTYs as well.  See
+       http://lists.gnu.org/archive/html/help-gnu-emacs/2012-12/msg00317.html
+       for the original report.
+
 2012-12-25  Dmitry Antipov  <address@hidden>
 
        * xdisp.c (redisplay_window): Remove inner local variable

=== modified file 'src/window.c'
--- a/src/window.c      2012-12-22 19:09:52 +0000
+++ b/src/window.c      2012-12-25 17:37:29 +0000
@@ -801,12 +801,12 @@
        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;
 }