Mercurial > emacs
changeset 15062:de7528327c39
(Fframe_parameters, both definitions):
Get sizes from FRAME_NEW_HEIGHT, FRAME_NEW_WIDTH if they are nonzero.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 23 Apr 1996 15:20:52 +0000 |
| parents | 85ee0c14c7dc |
| children | dc10bb3b05e2 |
| files | src/frame.c |
| diffstat | 1 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/frame.c Mon Apr 22 00:30:39 1996 +0000 +++ b/src/frame.c Tue Apr 23 15:20:52 1996 +0000 @@ -1699,6 +1699,7 @@ { Lisp_Object alist; FRAME_PTR f; + int height, width; if (EQ (frame, Qnil)) f = selected_frame; @@ -1713,8 +1714,10 @@ alist = Fcopy_alist (f->param_alist); store_in_alist (&alist, Qname, f->name); - store_in_alist (&alist, Qheight, make_number (FRAME_HEIGHT (f))); - store_in_alist (&alist, Qwidth, make_number (FRAME_WIDTH (f))); + height = (FRAME_NEW_HEIGHT (f) ? FRAME_NEW_HEIGHT (f) : FRAME_HEIGHT (f)); + store_in_alist (&alist, Qheight, make_number (height)); + width = (FRAME_NEW_WIDTH (f) ? FRAME_NEW_WIDTH (f) : FRAME_WIDTH (f)); + store_in_alist (&alist, Qwidth, make_number (width)); store_in_alist (&alist, Qmodeline, (FRAME_WANTS_MODELINE_P (f) ? Qt : Qnil)); store_in_alist (&alist, Qminibuffer, (! FRAME_HAS_MINIBUF_P (f) ? Qnil @@ -2339,6 +2342,7 @@ { Lisp_Object alist; FRAME_PTR f; + int height, width; if (EQ (frame, Qnil)) f = selected_frame; @@ -2369,8 +2373,10 @@ #endif store_in_alist (&alist, intern ("font"), build_string ("default")); store_in_alist (&alist, Qname, build_string ("emacs")); - store_in_alist (&alist, Qheight, make_number (FRAME_HEIGHT (f))); - store_in_alist (&alist, Qwidth, make_number (FRAME_WIDTH (f))); + height = (FRAME_NEW_HEIGHT (f) ? FRAME_NEW_HEIGHT (f) : FRAME_HEIGHT (f)); + store_in_alist (&alist, Qheight, make_number (height)); + width = (FRAME_NEW_WIDTH (f) ? FRAME_NEW_WIDTH (f) : FRAME_WIDTH (f)); + store_in_alist (&alist, Qwidth, make_number (width)); store_in_alist (&alist, Qmodeline, (FRAME_WANTS_MODELINE_P (f) ? Qt : Qnil)); store_in_alist (&alist, Qminibuffer, FRAME_MINIBUF_WINDOW (f)); store_in_alist (&alist, Qunsplittable, (FRAME_NO_SPLIT_P (f) ? Qt : Qnil));