CVS update by stephent xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: stephent
  Date: 07/12/05 09:26:06

  Modified:    xemacs/src ChangeLog frame.c
Log:
Fix frame resize bug with multiple frames on one TTY. <878x4bxast.fsf at uwakimon.sk.tsukuba.ac.jp>

Revision  Changes    Path
1.1112    +6 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1111
retrieving revision 1.1112
diff -u -p -r1.1111 -r1.1112
--- ChangeLog	2007/12/04 20:18:33	1.1111
+++ ChangeLog	2007/12/05 08:26:00	1.1112
@@ -1,3 +1,9 @@
+2007-12-02  Ron Isaacson  <ron.isaacson at morganstanley.com>
+
+	* frame.c (change_frame_size):
+	(change_frame_size_1):
+	Must reset pending flag per-frame, so do it in the latter.
+
 2007-12-04  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* file-coding.c:



1.77      +1 -1      XEmacs/xemacs/src/frame.c

Index: frame.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- frame.c	2007/10/03 10:06:41	1.76
+++ frame.c	2007/12/05 08:26:03	1.77
@@ -3273,6 +3273,7 @@ change_frame_size_1 (struct frame *f, in
   default_face_height_and_width_1 (frame, &font_height, &font_width);
 
   /* This size-change overrides any pending one for this frame.  */
+  f->size_change_pending = 0;
   FRAME_NEW_HEIGHT (f) = 0;
   FRAME_NEW_WIDTH (f) = 0;
 
@@ -3450,7 +3451,6 @@ change_frame_size (struct frame *f, int 
       return;
     }
 
-  f->size_change_pending = 0;
   /* For TTY frames, it's like one, like all ...
      Can't have two TTY frames of different sizes on the same device. */
   if (FRAME_TTY_P (f))