diff options
Diffstat (limited to 'src/frame.c')
-rw-r--r-- | src/frame.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/frame.c b/src/frame.c index 8462a0c1d6..55435b1180 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; |