From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 25 Oct 2001 21:05:42 +0000 (+0000)
Subject: (Fframe_parameter): Fix last change.
X-Git-Tag: emacs-21.2~453
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7576bc3e17856da3343777ed44fb1ad80d060dc5;p=emacs.git

(Fframe_parameter): Fix last change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 58c1afa08ce..631b10dad9a 100644
--- 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 cd4d52df67d..345ae868776 100644
--- 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)));