[Emacs-diffs] trunk r116472: Don't set FRAME_PIXEL_HEIGHT and FRAME_PIXEL_WIDTH in update_various_frame_slots (Bug#16736).

[Martin Rudalics]

------------------------------------------------------------
revno: 116472
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2014-02-18 11:52:00 +0100
message:
  Don't set FRAME_PIXEL_HEIGHT and FRAME_PIXEL_WIDTH in 
update_various_frame_slots (Bug#16736).
  
  * widget.c (update_various_frame_slots): Don't set
  FRAME_PIXEL_HEIGHT and FRAME_PIXEL_WIDTH here (Bug#16736).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/widget.c                   widget.c-20091113204419-o5vbwnq5f7feedwu-676

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-02-18 07:46:38 +0000
+++ b/src/ChangeLog     2014-02-18 10:52:00 +0000
@@ -1,3 +1,8 @@
+2014-02-18  Martin Rudalics  <address@hidden>
+
+       * widget.c (update_various_frame_slots): Don't set
+       FRAME_PIXEL_HEIGHT and FRAME_PIXEL_WIDTH here (Bug#16736).
+
 2014-02-18  Michael Albinus  <address@hidden>
 
        * dbusbind.c (xd_close_bus): Apply proper check on busobj.

=== modified file 'src/widget.c'
--- a/src/widget.c      2014-01-01 07:43:34 +0000
+++ b/src/widget.c      2014-02-18 10:52:00 +0000
@@ -599,8 +599,13 @@
 {
   struct frame *f = ew->emacs_frame.frame;
   struct x_output *x = f->output_data.x;
+  /* Don't do that: It confuses the check in change_frame_size_1 whether
+     the pixel size of the frame changed due to a change of the internal
+     border width.  Bug#16736.  */
+#if 0
   FRAME_PIXEL_HEIGHT (f) = ew->core.height + x->menubar_height;
   FRAME_PIXEL_WIDTH (f) = ew->core.width;
+#endif
   f->internal_border_width = ew->emacs_frame.internal_border_width;
 
 }