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).

2 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1db4d4ac375..0fc12fce809 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-18  Martin Rudalics  <rudalics@gmx.at>
+
+        * widget.c (update_various_frame_slots): Don't set
+        FRAME_PIXEL_HEIGHT and FRAME_PIXEL_WIDTH here (Bug#16736).
+
 2014-02-18  Michael Albinus  <michael.albinus@gmx.de>
 
         * dbusbind.c (xd_close_bus): Apply proper check on busobj.
diff --git a/src/widget.c b/src/widget.c
index ecd42b35719..838e775f918 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -599,8 +599,13 @@ update_various_frame_slots (EmacsFrame ew)
 {
   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;
 
 }