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

diff --git a/src/ChangeLog b/src/ChangeLog
index 0b7f7e798a5fcc6d5be6d39663901812ba737d6c..5dda04308490e1cc25ba798e4fab56b7337103b8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
 

diff --git a/src/fontset.c b/src/fontset.c
index 345d991d05defad03d6fe7cd4520ca5c843153db..d732820c28ac3e5f58ab3853cbc29df846f8b218 100644 (file)
--- 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);
            }
        }
     }