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

diff --git a/src/ChangeLog b/src/ChangeLog
index d4fc44860f53cfe0f616982545ce1a91468fdd6c..5c5bd61d0618b02f7c9e4719841e13c796a74798 100644 (file)
--- 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 56e0e7ec91940af43b52e0f9d58aaca53d31de30..3a6900a572aaa5a08949a14dd7a550f0aa849c7d 100644 (file)
--- 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);
     }