* frame.c (x_set_screen_gamma): Rename local to avoid shadowing.

2 files changed, 7 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d4fc44860f5..5c5bd61d061 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-02-27  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * frame.c (x_set_screen_gamma): Rename local to avoid shadowing.
+
         * frame.h: Avoid gcc -Wmissing-prototypes diagnostics.
         (set_menu_bar_lines, x_get_resource_string): New decls.
         * msdos.c (set_menu_bar_lines): Omit decl.
diff --git a/src/frame.c b/src/frame.c
index 56e0e7ec919..3a6900a572a 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3275,12 +3275,12 @@ x_set_screen_gamma (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu
   bgcolor = Fassq (Qbackground_color, f->param_alist);
   if (CONSP (bgcolor) && (bgcolor = XCDR (bgcolor), STRINGP (bgcolor)))
     {
-      Lisp_Object index = Fget (Qbackground_color, Qx_frame_parameter);
-      if (NATNUMP (index)
-          && (XFASTINT (index)
+      Lisp_Object parm_index = Fget (Qbackground_color, Qx_frame_parameter);
+      if (NATNUMP (parm_index)
+          && (XFASTINT (parm_index)
               < sizeof (frame_parms)/sizeof (frame_parms[0]))
-          && FRAME_RIF (f)->frame_parm_handlers[XFASTINT (index)])
-          (*FRAME_RIF (f)->frame_parm_handlers[XFASTINT (index)])
+          && FRAME_RIF (f)->frame_parm_handlers[XFASTINT (parm_index)])
+          (*FRAME_RIF (f)->frame_parm_handlers[XFASTINT (parm_index)])
             (f, bgcolor, Qnil);
     }