Commit 6d1f7fee authored by Paul Eggert's avatar Paul Eggert
Browse files

* xmenu.c (xmenu_show, xdialog_show, xmenu_show): Make local pointers "const"

since they might point to immutable storage.
parent 8868a238
......@@ -3,6 +3,8 @@
* xmenu.c (menu_highlight_callback): Now static.
(set_frame_menubar): Remove unused local.
(xmenu_show): Rename parameter to avoid shadowing.
(xmenu_show, xdialog_show, xmenu_show): Make local pointers "const"
since they might point to immutable storage.
 
* xdisp.c (produce_glyphless_glyph): Initialize lower_xoff.
Add a FIXME comment, since the code still doesn't look right.
......@@ -1662,7 +1662,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
{
/* Create a new pane. */
Lisp_Object pane_name, prefix;
char *pane_string;
const char *pane_string;
pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME);
prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
......@@ -2010,7 +2010,7 @@ xdialog_show (FRAME_PTR f,
representing the text label and buttons. */
{
Lisp_Object pane_name, prefix;
char *pane_string;
const char *pane_string;
pane_name = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME];
prefix = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_PREFIX];
pane_string = (NILP (pane_name)
......@@ -2305,7 +2305,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
{
/* Create a new pane. */
Lisp_Object pane_name, prefix;
char *pane_string;
const char *pane_string;
maxlines = max (maxlines, lines);
lines = 0;
......
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