aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1993-06-03 06:18:18 +0000
committerRichard M. Stallman1993-06-03 06:18:18 +0000
commit08f7aa3edbf2e835111ca52f30b9063a40f306d9 (patch)
treec18db99fec9a3bcfb8d45577e11b1c85f86c8830
parent2ec778d095ec85df692170153802bd6912be0aef (diff)
downloademacs-08f7aa3edbf2e835111ca52f30b9063a40f306d9.tar.gz
emacs-08f7aa3edbf2e835111ca52f30b9063a40f306d9.zip
(do_pending_window_change): No need to clear
FRAME_NEW_HEIGHT/WIDTH. Do test width != 0.
-rw-r--r--src/dispnew.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/dispnew.c b/src/dispnew.c
index a5f35362f1c..9f57065c2e4 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1657,11 +1657,8 @@ do_pending_window_change ()
1657 1657
1658 int height = FRAME_NEW_HEIGHT (f); 1658 int height = FRAME_NEW_HEIGHT (f);
1659 int width = FRAME_NEW_WIDTH (f); 1659 int width = FRAME_NEW_WIDTH (f);
1660
1661 FRAME_NEW_HEIGHT (f) = 0;
1662 FRAME_NEW_WIDTH (f) = 0;
1663 1660
1664 if (height != 0) 1661 if (height != 0 || width != 0)
1665 change_frame_size (f, height, width, 0, 0); 1662 change_frame_size (f, height, width, 0, 0);
1666 } 1663 }
1667 } 1664 }
@@ -1693,7 +1690,7 @@ change_frame_size (frame, newheight, newwidth, pretend, delay)
1693 FRAME_NEW_HEIGHT (frame) = 0; 1690 FRAME_NEW_HEIGHT (frame) = 0;
1694 FRAME_NEW_WIDTH (frame) = 0; 1691 FRAME_NEW_WIDTH (frame) = 0;
1695 1692
1696 /* If an arguments is zero, set it to the current value. */ 1693 /* If an argument is zero, set it to the current value. */
1697 newheight || (newheight = FRAME_HEIGHT (frame)); 1694 newheight || (newheight = FRAME_HEIGHT (frame));
1698 newwidth || (newwidth = FRAME_WIDTH (frame)); 1695 newwidth || (newwidth = FRAME_WIDTH (frame));
1699 1696