* xmenu.c (xmenu_show): Rename parm to avoid shadowing.

diff --git a/src/ChangeLog b/src/ChangeLog
index 88611381119047191aa41ef172505f836807f83d..ded04afa9ab566854175e9535211d9e151c96984 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * xmenu.c (xmenu_show): Rename parm to avoid shadowing.
+
        * xterm.c (x_create_toolkit_scroll_bar): Use const * for pointers
        to read-only memory.
 

diff --git a/src/xmenu.c b/src/xmenu.c
index 6e84b845a46bb28b2da8d302f00de178174a8356..d1f0594337d799554e9785adaf2502f0a941377c 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -2245,7 +2245,7 @@ pop_down_menu (Lisp_Object arg)
 
 Lisp_Object
 xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
-           Lisp_Object title, const char **error, EMACS_UINT timestamp)
+           Lisp_Object title, const char **error_name, EMACS_UINT timestamp)
 {
   Window root;
   XMenu *menu;
@@ -2263,13 +2263,13 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
   if (! FRAME_X_P (f) && ! FRAME_MSDOS_P (f))
     abort ();
 
-  *error = 0;
+  *error_name = 0;
   if (menu_items_n_panes == 0)
     return Qnil;
 
   if (menu_items_used <= MENU_ITEMS_PANE_LENGTH)
     {
-      *error = "Empty menu";
+      *error_name = "Empty menu";
       return Qnil;
     }
 
@@ -2282,7 +2282,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
   menu = XMenuCreate (FRAME_X_DISPLAY (f), root, "emacs");
   if (menu == NULL)
     {
-      *error = "Can't create menu";
+      *error_name = "Can't create menu";
       return Qnil;
     }
 
@@ -2324,7 +2324,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
          if (lpane == XM_FAILURE)
            {
              XMenuDestroy (FRAME_X_DISPLAY (f), menu);
-             *error = "Can't create pane";
+             *error_name = "Can't create pane";
              return Qnil;
            }
          i += MENU_ITEMS_PANE_LENGTH;
@@ -2391,7 +2391,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
              == XM_FAILURE)
            {
              XMenuDestroy (FRAME_X_DISPLAY (f), menu);
-             *error = "Can't add selection to menu";
+             *error_name = "Can't add selection to menu";
              return Qnil;
            }
          i += MENU_ITEMS_ITEM_LENGTH;
@@ -2512,7 +2512,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
       break;
 
     case XM_FAILURE:
-      *error = "Can't activate menu";
+      *error_name = "Can't activate menu";
     case XM_IA_SELECT:
       entry = Qnil;
       break;