[Emacs-diffs] trunk r116307: In window_resize_apply adjust margin width, if necessary (Bug#16649).

[Martin Rudalics]

------------------------------------------------------------
revno: 116307
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Fri 2014-02-07 11:55:28 +0100
message:
  In window_resize_apply adjust margin width, if necessary (Bug#16649).
  
  * window.c (window_resize_apply): Adjust margin width, if necessary.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/window.c                   window.c-20091113204419-o5vbwnq5f7feedwu-231

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-02-07 10:03:10 +0000
+++ b/src/ChangeLog     2014-02-07 10:55:28 +0000
@@ -1,11 +1,12 @@
 2014-02-07  Martin Rudalics  <address@hidden>
 
-       Constrain window box and body sizes (Bug#16649).
+       Constrain window box/body sizes and margin widths (Bug#16649).
        * xdisp.c (window_box_width): Don't return less than zero.
        (window_box_left_offset, window_box_right_offset): Don't return
        more than the window's pixel width.
        * window.c (window_body_height, window_body_width): Don't return
        negative value.
+       (window_resize_apply): Adjust margin width, if necessary.
 
 2014-02-07  Glenn Morris  <address@hidden>
 

=== modified file 'src/window.c'
--- a/src/window.c      2014-02-07 10:03:10 +0000
+++ b/src/window.c      2014-02-07 10:55:28 +0000
@@ -3923,8 +3923,11 @@
        }
     }
   else
-    /* Bug#15957.  */
-    w->window_end_valid = 0;
+    {
+      adjust_window_margins (w);
+      /* Bug#15957.  */
+      w->window_end_valid = 0;
+    }
 }