[MULTI_FRAME] (Fframe_parameters): For non-X frames,

fill in menu-bar-lines value.

diff --git a/src/frame.c b/src/frame.c
index c658885bb9a9d8064e990656d68be01a0e7fda6b..4d2def984412b9da0c773d9e8608af9286c178a9 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -1403,18 +1403,15 @@ If FRAME is omitted, return information on the currently selected frame.")
                   : FRAME_MINIBUF_ONLY_P (f) ? Qonly
                   : FRAME_MINIBUF_WINDOW (f)));
   store_in_alist (&alist, Qunsplittable, (FRAME_NO_SPLIT_P (f) ? Qt : Qnil));
-#if 0 /* This ought to be correct in f->param_alist.  */
-  store_in_alist (&alist, Qmenu_bar_lines,
-                 (FRAME_MENU_BAR_LINES (f)
-                  ? FRAME_MENU_BAR_LINES (f)
-                  : FRAME_EXTERNAL_MENU_BAR (f)));
-#endif
 
   /* I think this should be done with a hook.  */
 #ifdef HAVE_X_WINDOWS
   if (FRAME_X_P (f))
     x_report_frame_params (f, &alist);
+  else
 #endif
+    /* This ought to be correct in f->param_alist for an X frame.  */
+    store_in_alist (&alist, Qmenu_bar_lines, FRAME_MENU_BAR_LINES (f));
   return alist;
 }