mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-01 18:00:40 -08:00
(x_set_font_backend): Don't call Fclear_font_cache. If
none of the new drivers are available, call font_update_drviers with the old drivers.
This commit is contained in:
parent
ca4da08aaa
commit
dfdf55c0a9
1 changed files with 8 additions and 6 deletions
14
src/frame.c
14
src/frame.c
|
|
@ -3492,14 +3492,16 @@ x_set_font_backend (f, new_value, old_value)
|
|||
return;
|
||||
|
||||
if (FRAME_FONT_OBJECT (f))
|
||||
{
|
||||
free_all_realized_faces (Qnil);
|
||||
Fclear_font_cache ();
|
||||
}
|
||||
free_all_realized_faces (Qnil);
|
||||
|
||||
new_value = font_update_drivers (f, new_value);
|
||||
new_value = font_update_drivers (f, NILP (new_value) ? Qt : new_value);
|
||||
if (NILP (new_value))
|
||||
error ("No font backend available");
|
||||
{
|
||||
if (NILP (old_value))
|
||||
error ("No font backend available");
|
||||
font_update_drivers (f, old_value);
|
||||
error ("None of specified font backends are available");
|
||||
}
|
||||
store_frame_param (f, Qfont_backend, new_value);
|
||||
|
||||
if (FRAME_FONT_OBJECT (f))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue