[Emacs-diffs] trunk r115808: Fix Bug#16284.

[Martin Rudalics]

------------------------------------------------------------
revno: 115808
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Mon 2013-12-30 10:14:29 +0100
message:
  Fix Bug#16284.
  
  * dispnew.c (change_frame_size_1): Take old width of root window
  from that window's pixel width.  Bug#16284.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/dispnew.c                  dispnew.c-20091113204419-o5vbwnq5f7feedwu-258

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-29 18:18:45 +0000
+++ b/src/ChangeLog     2013-12-30 09:14:29 +0000
@@ -1,3 +1,8 @@
+2013-12-30  Martin Rudalics  <address@hidden>
+
+       * dispnew.c (change_frame_size_1): Take old width of root window
+       from that window's pixel width.  Bug#16284.
+
 2013-12-29  Paul Eggert  <address@hidden>
 
        Plain copy-file no longer chmods an existing destination (Bug#16133).

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2013-12-20 10:48:36 +0000
+++ b/src/dispnew.c     2013-12-30 09:14:29 +0000
@@ -5463,8 +5463,7 @@
                     bool pretend, bool delay, bool safe, bool pixelwise)
 {
   int new_text_width, new_text_height, new_root_width;
-  int old_root_width = (FRAME_PIXEL_WIDTH (f)
-                       - 2 * FRAME_INTERNAL_BORDER_WIDTH (f));
+  int old_root_width = WINDOW_PIXEL_WIDTH (XWINDOW (FRAME_ROOT_WINDOW (f)));
   int new_cols, new_lines;
   ptrdiff_t count = SPECPDL_INDEX ();