[Emacs-diffs] /srv/bzr/emacs/trunk r99275: * dispnew.c (change_frame_size_1): newwidth == FRAME_COLS (f) must

[Jan D.]

------------------------------------------------------------
revno: 99275 [merge]
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Fri 2010-01-08 12:43:09 +0100
message:
  * dispnew.c (change_frame_size_1): newwidth == FRAME_COLS  (f) must
  also be true before we can return early (bug #5339).
modified:
  src/ChangeLog
  src/dispnew.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-01-06 19:42:27 +0000
+++ b/src/ChangeLog     2010-01-08 11:41:57 +0000
@@ -1,3 +1,8 @@
+2010-01-08  Jan Djärv  <address@hidden>
+
+       * dispnew.c (change_frame_size_1): newwidth == FRAME_COLS  (f) must
+       also be true before we can return early (bug #5339).
+
 2010-01-06  David Reitter  <address@hidden>
 
        * nsfns.m (ns_get_screen): Rewrite, returning NULL for non-NS.

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2010-01-04 05:35:18 +0000
+++ b/src/dispnew.c     2010-01-08 11:41:57 +0000
@@ -6340,8 +6340,11 @@
   check_frame_size (f, &newheight, &newwidth);
 
   /* If we're not changing the frame size, quit now.  */
+  /* Frame width may be unchanged but the text portion may change, for example,
+     fullscreen and remove/add scroll bar.  */
   if (newheight == FRAME_LINES (f)
-      && new_frame_total_cols == FRAME_TOTAL_COLS (f))
+      && newwidth == FRAME_COLS  (f) // text portion unchanged
+      && new_frame_total_cols == FRAME_TOTAL_COLS (f)) // frame width unchanged
     return;
 
   BLOCK_INPUT;