Mercurial > emacs
comparison src/frame.c @ 1870:d90e9fecad48
* frame.c (Fframe_parameters): Report the `minibuffer' parameter of
minibufferless frames as nil, not `none'.
(Qnone): Remove declaration and initialization for this. It's not
needed anymore.
* xfns.c (Qnone): Add them here; we still accept "none" as a valid
value for the `minibuffer' parameter.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Sun, 14 Feb 1993 14:38:19 +0000 |
parents | 04fb1d3d6992 |
children | ac5e559a819a |
comparison
equal
deleted
inserted
replaced
1869:30eb06b22ae4 | 1870:d90e9fecad48 |
---|---|
78 Lisp_Object Qheight; | 78 Lisp_Object Qheight; |
79 Lisp_Object Qicon; | 79 Lisp_Object Qicon; |
80 Lisp_Object Qminibuffer; | 80 Lisp_Object Qminibuffer; |
81 Lisp_Object Qmodeline; | 81 Lisp_Object Qmodeline; |
82 Lisp_Object Qname; | 82 Lisp_Object Qname; |
83 Lisp_Object Qnone; | |
84 Lisp_Object Qonly; | 83 Lisp_Object Qonly; |
85 Lisp_Object Qunsplittable; | 84 Lisp_Object Qunsplittable; |
86 Lisp_Object Qwidth; | 85 Lisp_Object Qwidth; |
87 Lisp_Object Qx; | 86 Lisp_Object Qx; |
88 | 87 |
1108 store_in_alist (&alist, Qname, f->name); | 1107 store_in_alist (&alist, Qname, f->name); |
1109 store_in_alist (&alist, Qheight, make_number (f->height)); | 1108 store_in_alist (&alist, Qheight, make_number (f->height)); |
1110 store_in_alist (&alist, Qwidth, make_number (f->width)); | 1109 store_in_alist (&alist, Qwidth, make_number (f->width)); |
1111 store_in_alist (&alist, Qmodeline, (f->wants_modeline ? Qt : Qnil)); | 1110 store_in_alist (&alist, Qmodeline, (f->wants_modeline ? Qt : Qnil)); |
1112 store_in_alist (&alist, Qminibuffer, | 1111 store_in_alist (&alist, Qminibuffer, |
1113 (! FRAME_HAS_MINIBUF_P (f) ? Qnone | 1112 (! FRAME_HAS_MINIBUF_P (f) ? Qnil |
1114 : (FRAME_MINIBUF_ONLY_P (f) ? Qonly | 1113 : (FRAME_MINIBUF_ONLY_P (f) ? Qonly |
1115 : FRAME_MINIBUF_WINDOW (f)))); | 1114 : FRAME_MINIBUF_WINDOW (f)))); |
1116 store_in_alist (&alist, Qunsplittable, (f->no_split ? Qt : Qnil)); | 1115 store_in_alist (&alist, Qunsplittable, (f->no_split ? Qt : Qnil)); |
1117 | 1116 |
1118 /* I think this should be done with a hook. */ | 1117 /* I think this should be done with a hook. */ |
1394 staticpro (&Qminibuffer); | 1393 staticpro (&Qminibuffer); |
1395 Qmodeline = intern ("modeline"); | 1394 Qmodeline = intern ("modeline"); |
1396 staticpro (&Qmodeline); | 1395 staticpro (&Qmodeline); |
1397 Qname = intern ("name"); | 1396 Qname = intern ("name"); |
1398 staticpro (&Qname); | 1397 staticpro (&Qname); |
1399 Qnone = intern ("none"); | |
1400 staticpro (&Qnone); | |
1401 Qonly = intern ("only"); | 1398 Qonly = intern ("only"); |
1402 staticpro (&Qonly); | 1399 staticpro (&Qonly); |
1403 Qunsplittable = intern ("unsplittable"); | 1400 Qunsplittable = intern ("unsplittable"); |
1404 staticpro (&Qunsplittable); | 1401 staticpro (&Qunsplittable); |
1405 Qwidth = intern ("width"); | 1402 Qwidth = intern ("width"); |