(Fframe_parameter): Handle `name' specially.

diff --git a/src/frame.c b/src/frame.c
index 8462a0c1d67ad418e985035ca1c53e15823350f8..55435b118069647fd6c88fffeeb33344bf9a14b0 100644 (file)
--- 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;