From 7519b8cd68973132dba3fa8dd4ecde8daa8cff71 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 9 Mar 2011 17:43:19 -0800 Subject: [PATCH] * fontset.c (Fset_fontset_font): Rename local to avoid shadowing. --- src/ChangeLog | 1 + src/fontset.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0b7f7e798a5..5dda0430849 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,7 @@ 2011-03-10 Paul Eggert * 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. diff --git a/src/fontset.c b/src/fontset.c index 345d991d05d..d732820c28a 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -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); } } } -- 2.39.2