Mercurial > emacs
changeset 40313:b2ff79e90309
(Fframe_parameter): Fix a bug whereby some
``artificial'' frame parameters, like `minibuffer' were not
obtained by calling Fframe_parameters.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Thu, 25 Oct 2001 15:44:11 +0000 |
parents | 473610705e03 |
children | 58305bceda48 |
files | src/frame.c |
diffstat | 1 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/frame.c Thu Oct 25 15:31:10 2001 +0000 +++ b/src/frame.c Thu Oct 25 15:44:11 2001 +0000 @@ -2085,7 +2085,8 @@ 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 @@ } } } - 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;