From: Paul Eggert Date: Sat, 16 Apr 2011 21:27:29 +0000 (-0700) Subject: * termhooks.h (struct terminal): Likewise. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~268^2~11 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e264f2620be29b32f02b529847dfd6621ca4a7f9;p=emacs.git * termhooks.h (struct terminal): Likewise. --- diff --git a/src/ChangeLog b/src/ChangeLog index de7d62e1005..a11562b4d7a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -5,6 +5,7 @@ * dispextern.h (struct redisplay_interface): Rename param to avoid shadowing. + * termhooks.h (struct terminal): Likewise. * insdel.c (make_gap_smaller): Define only if USE_MMAP_FOR_BUFFERS || REL_ALLOC || DOUG_LEA_MALLOC. diff --git a/src/termhooks.h b/src/termhooks.h index 2f509009bd9..468381b69aa 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -465,7 +465,7 @@ struct terminal enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y, - unsigned long *time); + unsigned long *); /* The window system handling code should set this if the mouse has moved since the last call to the mouse_position_hook. Calling that @@ -484,10 +484,10 @@ struct terminal support overlapping frames, so there's no need to raise or lower anything. - If RAISE is non-zero, F is brought to the front, before all other - windows. If RAISE is zero, F is sent to the back, behind all other + If RAISE_FLAG is non-zero, F is brought to the front, before all other + windows. If RAISE_FLAG is zero, F is sent to the back, behind all other windows. */ - void (*frame_raise_lower_hook) (struct frame *f, int raise); + void (*frame_raise_lower_hook) (struct frame *f, int raise_flag); /* If the value of the frame parameter changed, whis hook is called. For example, if going from fullscreen to not fullscreen this hook