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.

2 files changed, 12 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f544f197a9b..66e7bfb9d0f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+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
diff --git a/src/frame.c b/src/frame.c
index 96fe3778dbc..9060f569154 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -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)));