Merge changes from emacs-23 branch.

[gnu-emacs] / src / menu.c

diff --git a/src/menu.c b/src/menu.c
index 460d9a5f493c339a26c0f2a339419dbb0e2abbbf..05a296e45fc507842160beb5989543fc1d4bb69a 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -662,7 +662,7 @@ digest_single_submenu (int start, int end, int top_level_items)
        {
          /* Create a new pane.  */
          Lisp_Object pane_name, prefix;
-         char *pane_string;
+         const char *pane_string;
 
          panes_seen++;
 
@@ -1065,7 +1065,7 @@ no quit occurs and `x-popup-menu' returns nil.  */)
   Lisp_Object keymap, tem;
   int xpos = 0, ypos = 0;
   Lisp_Object title;
-  char *error_name = NULL;
+  const char *error_name = NULL;
   Lisp_Object selection = Qnil;
   FRAME_PTR f = NULL;
   Lisp_Object x, y, window;