[Emacs-diffs] master dd2aa93: Fix a thinko in frame-parameter (Bug#19802)

[Eli Zaretskii]

branch: master
commit dd2aa937d68390755d0b042a81560211aa138406
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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.
---
 src/ChangeLog |    6 ++++++
 src/frame.c   |    7 ++++++-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index f544f19..66e7bfb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-08  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * data.c (Findirect_function): Like `symbol-function', don't signal an
diff --git a/src/frame.c b/src/frame.c
index 96fe377..9060f56 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)));