From: Paul Eggert Date: Sat, 5 Feb 2011 09:49:52 +0000 (-0800) Subject: * xmenu.c: conform to C89 const rules X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~1032 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cc618f4e69e92541a6595e6b15f35bea5a132640;p=emacs.git * xmenu.c: conform to C89 const rules (xmenu_show, xdialog_show): Declare local var as char *, not const char *, to stay compatible with C89 const rules. --- diff --git a/src/ChangeLog b/src/ChangeLog index 9765bdc18d8..8d02825f8ce 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2011-02-05 Paul Eggert + * xmenu.c: conform to C89 const rules + (xmenu_show, xdialog_show): Declare local var as char *, not + const char *, to stay compatible with C89 const rules. + * xdisp.c: conform to C89 pointer rules (store_mode_line_noprop, display_string, reseat_to_string): (c_string_pos, number_of_chars, message_dolog): diff --git a/src/xmenu.c b/src/xmenu.c index 8ab10be8fac..ad1a764eab8 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1668,7 +1668,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, { /* Create a new pane. */ Lisp_Object pane_name, prefix; - const char *pane_string; + char *pane_string; pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME); prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX); @@ -2016,7 +2016,7 @@ xdialog_show (FRAME_PTR f, representing the text label and buttons. */ { Lisp_Object pane_name, prefix; - const char *pane_string; + 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)