(Fframe_parameter): Fix last change.

diff --git a/src/ChangeLog b/src/ChangeLog
index 58c1afa08ce66af4d122f24b29b89070d0fe3a9b..631b10dad9a3948352081e273820b1879b58bf6d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-25  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * frame.c (Fframe_parameter): Fix last change.
+
 2001-10-25  Gerd Moellmann  <gerd@gnu.org>
 
        * frame.c (Fframe_parameter): Fix a bug whereby some

diff --git a/src/frame.c b/src/frame.c
index cd4d52df67d7220e29454994c4a8bf57ef61d8c0..345ae868776c4cb39c7c38da265afd49423615ec 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -2077,6 +2077,7 @@ If FRAME is nil, describe the currently selected frame.")
   
   if (FRAME_LIVE_P (f))
     {
+      /* Avoid consing in frequent cases.  */
       if (EQ (parameter, Qname))
        value = f->name;
 #ifdef HAVE_X_WINDOWS
@@ -2119,10 +2120,11 @@ If FRAME is nil, describe the currently selected frame.")
                    }
                }
            }
+         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)));