From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 7 Sep 2000 10:39:35 +0000 (+0000)
Subject: (Fframe_parameter): Handle `name' specially.
X-Git-Tag: emacs-pretest-21.0.90~1746
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=67d853e60908e7f41a056b7efa851f6800feda36;p=emacs.git

(Fframe_parameter): Handle `name' specially.
---

diff --git a/src/frame.c b/src/frame.c
index 8462a0c1d67..55435b11806 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2104,14 +2104,19 @@ If FRAME is nil, describe the currently selected frame.")
   
   if (FRAME_LIVE_P (f))
     {
-      value = Fassq (parameter, f->param_alist);
-      if (CONSP (value))
-	value = XCDR (value);
-      else if (EQ (parameter, Qdisplay_type))
-	/* Avoid consing in a frequent case.  */
-	value = Qnil;
+      if (EQ (parameter, Qname))
+	value = f->name;
       else
-	value = Fcdr (Fassq (parameter, Fframe_parameters (frame)));
+	{
+	  value = Fassq (parameter, f->param_alist);
+	  if (CONSP (value))
+	    value = XCDR (value);
+	  else if (EQ (parameter, Qdisplay_type))
+	    /* Avoid consing in a frequent case.  */
+	    value = Qnil;
+	  else
+	    value = Fcdr (Fassq (parameter, Fframe_parameters (frame)));
+	}
     }
   
   return value;