Commit 75700ff2 authored by Gerd Moellmann's avatar Gerd Moellmann

(Fframe_parameter): Fix a bug whereby some

``artificial'' frame parameters, like `minibuffer' were not
obtained by calling Fframe_parameters.
parent 2726b68b
2001-10-25 Gerd Moellmann <gerd@gnu.org> 2001-10-25 Gerd Moellmann <gerd@gnu.org>
* frame.c (Fframe_parameter): Fix a bug whereby some
``artificial'' frame parameters, like `minibuffer' were not
obtained by calling Fframe_parameters.
* xterm.c (show_mouse_face): Clean up. Recognize overwritten * xterm.c (show_mouse_face): Clean up. Recognize overwritten
cursor differently. cursor differently.
......
...@@ -2085,7 +2085,8 @@ If FRAME is nil, describe the currently selected frame. */) ...@@ -2085,7 +2085,8 @@ If FRAME is nil, describe the currently selected frame. */)
else if (EQ (parameter, Qdisplay) && FRAME_X_P (f)) else if (EQ (parameter, Qdisplay) && FRAME_X_P (f))
value = XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element); value = XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element);
#endif /* HAVE_X_WINDOWS */ #endif /* HAVE_X_WINDOWS */
else else if (EQ (parameter, Qbackground_color)
|| EQ (parameter, Qforeground_color))
{ {
value = Fassq (parameter, f->param_alist); value = Fassq (parameter, f->param_alist);
if (CONSP (value)) if (CONSP (value))
...@@ -2120,13 +2121,13 @@ If FRAME is nil, describe the currently selected frame. */) ...@@ -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; return value;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment