From 7576bc3e17856da3343777ed44fb1ad80d060dc5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 25 Oct 2001 21:05:42 +0000 Subject: [PATCH] (Fframe_parameter): Fix last change. --- src/ChangeLog | 4 ++++ src/frame.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + * frame.c (Fframe_parameter): Fix last change. + 2001-10-25 Gerd Moellmann * 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))); -- 2.39.2