Commit 76c1cebc authored by Paul Eggert's avatar Paul Eggert

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

parent 0ff162fc
2011-02-27 Paul Eggert <eggert@cs.ucla.edu> 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. * frame.h: Avoid gcc -Wmissing-prototypes diagnostics.
(set_menu_bar_lines, x_get_resource_string): New decls. (set_menu_bar_lines, x_get_resource_string): New decls.
* msdos.c (set_menu_bar_lines): Omit decl. * msdos.c (set_menu_bar_lines): Omit decl.
...@@ -3275,12 +3275,12 @@ x_set_screen_gamma (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu ...@@ -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); bgcolor = Fassq (Qbackground_color, f->param_alist);
if (CONSP (bgcolor) && (bgcolor = XCDR (bgcolor), STRINGP (bgcolor))) if (CONSP (bgcolor) && (bgcolor = XCDR (bgcolor), STRINGP (bgcolor)))
{ {
Lisp_Object index = Fget (Qbackground_color, Qx_frame_parameter); Lisp_Object parm_index = Fget (Qbackground_color, Qx_frame_parameter);
if (NATNUMP (index) if (NATNUMP (parm_index)
&& (XFASTINT (index) && (XFASTINT (parm_index)
< sizeof (frame_parms)/sizeof (frame_parms[0])) < sizeof (frame_parms)/sizeof (frame_parms[0]))
&& FRAME_RIF (f)->frame_parm_handlers[XFASTINT (index)]) && FRAME_RIF (f)->frame_parm_handlers[XFASTINT (parm_index)])
(*FRAME_RIF (f)->frame_parm_handlers[XFASTINT (index)]) (*FRAME_RIF (f)->frame_parm_handlers[XFASTINT (parm_index)])
(f, bgcolor, Qnil); (f, bgcolor, Qnil);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment