From 75700ff269c43abe152919d6d611a0585967b802 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Thu, 25 Oct 2001 15:44:43 +0000 Subject: [PATCH] (Fframe_parameter): Fix a bug whereby some ``artificial'' frame parameters, like `minibuffer' were not obtained by calling Fframe_parameters. --- src/ChangeLog | 4 ++++ src/frame.c | 15 ++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 68d54b4814d..94c596df8ed 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2001-10-25 Gerd Moellmann + * frame.c (Fframe_parameter): Fix a bug whereby some + ``artificial'' frame parameters, like `minibuffer' were not + obtained by calling Fframe_parameters. + * xterm.c (show_mouse_face): Clean up. Recognize overwritten cursor differently. diff --git a/src/frame.c b/src/frame.c index 52424456a2c..8720d7a3ae9 100644 --- a/src/frame.c +++ b/src/frame.c @@ -2085,7 +2085,8 @@ If FRAME is nil, describe the currently selected frame. */) else if (EQ (parameter, Qdisplay) && FRAME_X_P (f)) value = XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element); #endif /* HAVE_X_WINDOWS */ - else + else if (EQ (parameter, Qbackground_color) + || EQ (parameter, Qforeground_color)) { value = Fassq (parameter, f->param_alist); if (CONSP (value)) @@ -2120,13 +2121,13 @@ If FRAME is nil, describe the currently selected frame. */) } } } - else if (EQ (parameter, Qdisplay_type) - || EQ (parameter, Qbackground_mode)) - /* Avoid consing in frequent cases. */ - value = Qnil; - 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))); } return value; -- 2.39.5