* 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.

1 files changed, 1 insertions, 4 deletions

diff --git a/src/frame.c b/src/frame.c
index ca48c73105f..4515e0d8c91 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -80,7 +80,6 @@ Lisp_Object Qicon;
 Lisp_Object Qminibuffer;
 Lisp_Object Qmodeline;
 Lisp_Object Qname;
-Lisp_Object Qnone;
 Lisp_Object Qonly;
 Lisp_Object Qunsplittable;
 Lisp_Object Qwidth;
@@ -1110,7 +1109,7 @@ If FRAME is omitted, return information on the currently selected frame.")
   store_in_alist (&alist, Qwidth, make_number (f->width));
   store_in_alist (&alist, Qmodeline, (f->wants_modeline ? Qt : Qnil));
   store_in_alist (&alist, Qminibuffer,
-                  (! FRAME_HAS_MINIBUF_P (f) ? Qnone
+                  (! FRAME_HAS_MINIBUF_P (f) ? Qnil
                    : (FRAME_MINIBUF_ONLY_P (f) ? Qonly
                    : FRAME_MINIBUF_WINDOW (f))));
   store_in_alist (&alist, Qunsplittable, (f->no_split ? Qt : Qnil));
@@ -1396,8 +1395,6 @@ syms_of_frame ()
   staticpro (&Qmodeline);
   Qname = intern ("name");
   staticpro (&Qname);
-  Qnone = intern ("none");
-  staticpro (&Qnone);
   Qonly = intern ("only");
   staticpro (&Qonly);
   Qunsplittable = intern ("unsplittable");