[Emacs-diffs] /srv/bzr/emacs/trunk r103122: Merge: * xmenu.c: conform to C89 const rules

[Paul Eggert]

------------------------------------------------------------
revno: 103122 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-05 01:50:38 -0800
message:
  Merge: * xmenu.c: conform to C89 const rules
modified:
  src/ChangeLog
  src/xmenu.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-05 09:26:46 +0000
+++ b/src/ChangeLog     2011-02-05 09:49:52 +0000
@@ -1,5 +1,9 @@
 2011-02-05  Paul Eggert  <address@hidden>
 
+       * 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):

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2011-01-26 08:36:39 +0000
+++ b/src/xmenu.c       2011-02-05 09:49:52 +0000
@@ -1668,7 +1668,7 @@
        {
          /* 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 @@
      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)