procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(x_set_font): Handle case of x_new_fontset returning the

Browse source 
same name as before, although there was a change in fontsets.
This commit is contained in:
Gerd Moellmann 2001-03-01 12:57:24 +00:00
parent 4560730a98
commit 57c5889c08
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -1,9 +1,14 @@
2001-03-01 Gerd Moellmann <gerd@gnu.org>
* xfns.c (x_set_font): Handle case of x_new_fontset returning the
same name as before, although there was a change in fontsets.
2001-02-28 Ken Raeburn <raeburn@gnu.org>
* lisp.h (Fframe_parameter): Declare.
* window.c (set_window_buffer): Field vscroll is an int, not a
lisp object.
Lisp_Object.
2001-02-28 Gerd Moellmann <gerd@gnu.org>

11
src/xfns.c
View file

@ -1814,6 +1814,7 @@ x_set_font (f, arg, oldval)
Lisp_Object result;
Lisp_Object fontset_name;
Lisp_Object frame;
int old_fontset = f->output_data.x->fontset;
CHECK_STRING (arg, 1);
@ -1831,8 +1832,16 @@ x_set_font (f, arg, oldval)
error ("The characters of the given font have varying widths");
else if (STRINGP (result))
{
if (!NILP (Fequal (result, oldval)))
if (STRINGP (fontset_name))
{
/* Fontset names are built from ASCII font names, so the
names may be equal despite there was a change. */
if (old_fontset == f->output_data.x->fontset)
return;
}
else if (!NILP (Fequal (result, oldval)))
return;
store_frame_param (f, Qfont, result);
recompute_basic_faces (f);
}