aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1993-08-14 07:20:08 +0000
committerRichard M. Stallman1993-08-14 07:20:08 +0000
commit11378c410a4f99ac0ddf76704e5f862f35aeb135 (patch)
tree72201aab248118f7be02da95c7a5a2229495f310 /src
parent871d0ce7fb6f5a677d5ffa6fcc9a746c39b29ce6 (diff)
downloademacs-11378c410a4f99ac0ddf76704e5f862f35aeb135.tar.gz
emacs-11378c410a4f99ac0ddf76704e5f862f35aeb135.zip
(x_set_frame_parameters): Don't die if just one of
height and width was set. Likewise left and top.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/xfns.c b/src/xfns.c
index 32908d15d8d..a3a50845afd 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -396,6 +396,18 @@ x_set_frame_parameters (f, alist)
396 } 396 }
397 } 397 }
398 398
399 /* Don't die if just one of these was set. */
400 if (EQ (left, Qunbound))
401 XSET (left, Lisp_Int, f->display.x->left_pos);
402 if (EQ (top, Qunbound))
403 XSET (top, Lisp_Int, f->display.x->top_pos);
404
405 /* Don't die if just one of these was set. */
406 if (EQ (width, Qunbound))
407 XSET (width, Lisp_Int, FRAME_WIDTH (f));
408 if (EQ (height, Qunbound))
409 XSET (height, Lisp_Int, FRAME_HEIGHT (f));
410
399 /* Don't set these parameters these unless they've been explicitly 411 /* Don't set these parameters these unless they've been explicitly
400 specified. The window might be mapped or resized while we're in 412 specified. The window might be mapped or resized while we're in
401 this function, and we don't want to override that unless the lisp 413 this function, and we don't want to override that unless the lisp
@@ -408,6 +420,7 @@ x_set_frame_parameters (f, alist)
408 Lisp_Object frame; 420 Lisp_Object frame;
409 421
410 XSET (frame, Lisp_Frame, f); 422 XSET (frame, Lisp_Frame, f);
423
411 if ((NUMBERP (width) && XINT (width) != FRAME_WIDTH (f)) 424 if ((NUMBERP (width) && XINT (width) != FRAME_WIDTH (f))
412 || (NUMBERP (height) && XINT (height) != FRAME_HEIGHT (f))) 425 || (NUMBERP (height) && XINT (height) != FRAME_HEIGHT (f)))
413 Fset_frame_size (frame, width, height); 426 Fset_frame_size (frame, width, height);