1 files changed, 1 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1ca428fa685..add827a9dc4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
        * xmenu.c (menu_highlight_callback): Now static.
        (set_frame_menubar): Remove unused local.
+        (xmenu_show): Rename parameter to avoid shadowing.
        * xdisp.c (produce_glyphless_glyph): Initialize lower_xoff.
        Add a FIXME comment, since the code still doesn't look right.

diff --git a/src/ChangeLog b/src/ChangeLog index 1ca428fa685..add827a9dc4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog
@@ -2,6 +2,7 @@
2		2
3	* xmenu.c (menu_highlight_callback): Now static.	3	* xmenu.c (menu_highlight_callback): Now static.
4	(set_frame_menubar): Remove unused local.	4	(set_frame_menubar): Remove unused local.
		5	(xmenu_show): Rename parameter to avoid shadowing.
5		6
6	* xdisp.c (produce_glyphless_glyph): Initialize lower_xoff.	7	* xdisp.c (produce_glyphless_glyph): Initialize lower_xoff.
7	Add a FIXME comment, since the code still doesn't look right.	8	Add a FIXME comment, since the code still doesn't look right.