aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Rumney2001-01-01 22:25:57 +0000
committerJason Rumney2001-01-01 22:25:57 +0000
commit35b41202eda7fd41ce89c8091f1d22e64f85e33d (patch)
treef35178edae14620b12b900d00b1b780566e81149
parent3608c0f984ad2aca9fa1704724a9e2abe864c784 (diff)
downloademacs-35b41202eda7fd41ce89c8091f1d22e64f85e33d.tar.gz
emacs-35b41202eda7fd41ce89c8091f1d22e64f85e33d.zip
(x_figure_window_size): Do not allow new_height and
new_width of frame to override specified values.
-rw-r--r--src/w32fns.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/w32fns.c b/src/w32fns.c
index 7e22b084ff8..657d5dd6612 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3210,6 +3210,11 @@ x_figure_window_size (f, parms)
3210 f->output_data.w32->top_pos = 0; 3210 f->output_data.w32->top_pos = 0;
3211 f->output_data.w32->left_pos = 0; 3211 f->output_data.w32->left_pos = 0;
3212 3212
3213 /* Ensure that old new_width and new_height will not override the
3214 values set here. */
3215 FRAME_NEW_WIDTH (f) = 0;
3216 FRAME_NEW_HEIGHT (f) = 0;
3217
3213 tem0 = w32_get_arg (parms, Qheight, 0, 0, RES_TYPE_NUMBER); 3218 tem0 = w32_get_arg (parms, Qheight, 0, 0, RES_TYPE_NUMBER);
3214 tem1 = w32_get_arg (parms, Qwidth, 0, 0, RES_TYPE_NUMBER); 3219 tem1 = w32_get_arg (parms, Qwidth, 0, 0, RES_TYPE_NUMBER);
3215 tem2 = w32_get_arg (parms, Quser_size, 0, 0, RES_TYPE_NUMBER); 3220 tem2 = w32_get_arg (parms, Quser_size, 0, 0, RES_TYPE_NUMBER);