Commit dd2aa937 authored by Eli Zaretskii's avatar Eli Zaretskii

Fix a thinko in frame-parameter (Bug#19802)

 src/frame.c (Fframe_parameter): Don't replace a non-nil value of
 foreground-color or background-color parameters with a nil value.
parent 1a489c1a
2015-02-08 Eli Zaretskii <eliz@gnu.org>
* frame.c (Fframe_parameter): Don't replace a non-nil value of
foreground-color or background-color parameters with a nil value.
(Bug#19802)
2015-02-08 Stefan Monnier <monnier@iro.umontreal.ca>
* data.c (Findirect_function): Like `symbol-function', don't signal an
......
......@@ -2615,7 +2615,12 @@ If FRAME is nil, describe the currently selected frame. */)
important when param_alist's notion of colors is
"unspecified". We need to do the same here. */
if (STRINGP (value) && !FRAME_WINDOW_P (f))
value = frame_unspecified_color (f, value);
{
Lisp_Object tem = frame_unspecified_color (f, value);
if (!NILP (tem))
value = tem;
}
}
else
value = Fcdr (Fassq (parameter, Fframe_parameters (frame)));
......
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