mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-01 09:51:22 -08:00
Code Issues Projects Releases Wiki Activity

* fontset.c (Fset_fontset_font): Rename local to avoid shadowing.

Browse source
This commit is contained in:
Paul Eggert 2011-03-09 17:43:19 -08:00
parent a5c0af8162
commit 7519b8cd68
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ChangeLog
View file

@ -1,6 +1,7 @@
2011-03-10 Paul Eggert <eggert@cs.ucla.edu>
* fontset.c (free_realized_fontset): Now static.
(Fset_fontset_font): Rename local to avoid shadowing.
* xrdb.c: Include "xterm.h", to check x_load_resources's interface.

8
src/fontset.c
View file

@ -1583,14 +1583,14 @@ appended. By default, FONT-SPEC overrides the previous settings. */)
if (ascii_changed)
{
Lisp_Object tail, frame, alist;
Lisp_Object tail, fr, alist;
int fontset_id = XINT (FONTSET_ID (fontset));
FONTSET_ASCII (fontset) = fontname;
name = FONTSET_NAME (fontset);
FOR_EACH_FRAME (tail, frame)
FOR_EACH_FRAME (tail, fr)
{
FRAME_PTR f = XFRAME (frame);
FRAME_PTR f = XFRAME (fr);
Lisp_Object font_object;
struct face *face;
@ -1607,7 +1607,7 @@ appended. By default, FONT-SPEC overrides the previous settings. */)
{
update_auto_fontset_alist (font_object, fontset);
alist = Fcons (Fcons (Qfont, Fcons (name, font_object)), Qnil);
Fmodify_frame_parameters (frame, alist);
Fmodify_frame_parameters (fr, alist);
}
}
}