mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-24 13:32:41 -08:00
Code Issues Projects Releases Wiki Activity

(Fframe_parameter): Fix a bug whereby some

Browse source 
``artificial'' frame parameters, like `minibuffer' were not
obtained by calling Fframe_parameters.
This commit is contained in:
Gerd Moellmann 2001-10-25 15:45:34 +00:00
parent cb31a9284d
commit c8a43d9002
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,5 +1,9 @@
2001-10-25 Gerd Moellmann <gerd@gnu.org>
* 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.

15
src/frame.c
View file

@ -2083,7 +2083,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))
@ -2118,13 +2119,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;