(Fframe_parameter): Fix a bug whereby some

``artificial'' frame parameters, like `minibuffer' were not
obtained by calling Fframe_parameters.

1 files changed, 8 insertions, 7 deletions

diff --git a/src/frame.c b/src/frame.c
index 52424456a2c..8720d7a3ae9 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2085,7 +2085,8 @@ If FRAME is nil, describe the currently selected frame.  */)
       else if (EQ (parameter, Qdisplay) && FRAME_X_P (f))
 	value = XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element);
 #endif /* HAVE_X_WINDOWS */
-      else
+      else if (EQ (parameter, Qbackground_color)
+	       || EQ (parameter, Qforeground_color))
 	{
 	  value = Fassq (parameter, f->param_alist);
 	  if (CONSP (value))
@@ -2120,13 +2121,13 @@ If FRAME is nil, describe the currently selected frame.  */)
 		    }
 		}
 	    }
-	  else if (EQ (parameter, Qdisplay_type)
-		   || EQ (parameter, Qbackground_mode))
-	    /* Avoid consing in frequent cases.  */
-	    value = Qnil;
-	  else
-	    value = Fcdr (Fassq (parameter, Fframe_parameters (frame)));
 	}
+      else if (EQ (parameter, Qdisplay_type)
+	       || EQ (parameter, Qbackground_mode))
+	/* Avoid consing in frequent cases.  */
+	value = Fcdr (Fassq (parameter, f->param_alist));
+      else
+	value = Fcdr (Fassq (parameter, Fframe_parameters (frame)));
     }
   
   return value;