* menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,

w32menu.c, and nsmenu.m.
Simplify the obsolete case where position is nil.
(cleanup_popup_menu): New function, moved from nsmenu.m.
(struct skp): Remove slot `notreal'.
(single_keymap_panes, keymap_panes): Remove arg `notreal' and adjust callers.
(single_menu_item): Adjust call to parse_menu_item.
(syms_of_menu): Defsubr x-popup-menu.
* menu.h (Vmenu_updating_frame): Consolidate declarations from *menu.c.
(keymap_panes): Don't export any more.
(mouse_position_for_popup, w32_menu_show, ns_menu_show, xmenu_show): Declare.
* keyboard.c (parse_menu_item): Remove arg `notreal'.
(menu_bar_item, read_char_minibuf_menu_prompt): Adjust callers.
* keyboard.h (parse_menu_item): Update declaration.
* xmenu.c (Fx_popup_menu): Remove.
(syms_of_xmenu): Don't defsubr x-popup-menu.
* w32menu.c (Fx_popup_menu): Remove.
(syms_of_w32menu): Don't defsubr x-popup-menu.
* nsmenu.m (cleanup_popup_menu): Remove.
(ns_menu_show): Rename from ns_popup_menu and remove all the code
moved to menu.c's Fx_popup_menu.
(Fx_popup_menu): Remove.
(syms_of_nsmenu): Don't defsubr x-popup-menu, and don't initialize
menu_items (it's done in menu.c already).

8 files changed, 424 insertions, 838 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3b9bef861d..4199b716a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,32 @@
+2009-11-09  Stefan Monnier  <[email protected]>
+
+	* menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
+	w32menu.c, and nsmenu.m.
+	Simplify the obsolete case where position is nil.
+	(cleanup_popup_menu): New function, moved from nsmenu.m.
+	(struct skp): Remove slot `notreal'.
+	(single_keymap_panes, keymap_panes): Remove arg `notreal' and
+	adjust callers.
+	(single_menu_item): Adjust call to parse_menu_item.
+	(syms_of_menu): Defsubr x-popup-menu.
+	* menu.h (Vmenu_updating_frame): Consolidate declarations from *menu.c.
+	(keymap_panes): Don't export any more.
+	(mouse_position_for_popup, w32_menu_show, ns_menu_show)
+	(xmenu_show): Declare.
+	* keyboard.c (parse_menu_item): Remove arg `notreal'.
+	(menu_bar_item, read_char_minibuf_menu_prompt): Adjust callers.
+	* keyboard.h (parse_menu_item): Update declaration.
+	* xmenu.c (Fx_popup_menu): Remove.
+	(syms_of_xmenu): Don't defsubr x-popup-menu.
+	* w32menu.c (Fx_popup_menu): Remove.
+	(syms_of_w32menu): Don't defsubr x-popup-menu.
+	* nsmenu.m (cleanup_popup_menu): Remove.
+	(ns_menu_show): Rename from ns_popup_menu and remove all the code
+	moved to menu.c's Fx_popup_menu.
+	(Fx_popup_menu): Remove.
+	(syms_of_nsmenu): Don't defsubr x-popup-menu, and don't initialize
+	menu_items (it's done in menu.c already).
+
 2009-11-08  Stefan Monnier  <[email protected]>
 
 	* keyboard.c (parse_menu_item): Handle `notreal' a bit earlier.
diff --git a/src/keyboard.c b/src/keyboard.c
index 9150d4b341..4157d1ebfb 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7797,7 +7797,7 @@ menu_bar_item (key, item, dummy1, dummy2)
      parse_menu_item, so that if it turns out it wasn't a menu item,
      it still correctly hides any further menu item.  */
   GCPRO1 (key);
-  i = parse_menu_item (item, 0, 1);
+  i = parse_menu_item (item, 1);
   UNGCPRO;
   if (!i)
     return;
@@ -7865,8 +7865,6 @@ menu_item_eval_property (sexpr)
 /* This function parses a menu item and leaves the result in the
    vector item_properties.
    ITEM is a key binding, a possible menu item.
-   If NOTREAL is nonzero, only check for equivalent key bindings, don't
-   evaluate dynamic expressions in the menu item.
    INMENUBAR is > 0 when this is considered for an entry in a menu bar
    top level.
    INMENUBAR is < 0 when this is considered for an entry in a keyboard menu.
@@ -7874,9 +7872,9 @@ menu_item_eval_property (sexpr)
    otherwise.  */
 
 int
-parse_menu_item (item, notreal, inmenubar)
+parse_menu_item (item, inmenubar)
      Lisp_Object item;
-     int notreal, inmenubar;
+     int inmenubar;
 {
   Lisp_Object def, tem, item_string, start;
   Lisp_Object filter;
@@ -7966,7 +7964,7 @@ parse_menu_item (item, notreal, inmenubar)
 		  else
 		    ASET (item_properties, ITEM_PROPERTY_ENABLE, XCAR (item));
 		}
-	      else if (EQ (tem, QCvisible) && !notreal)
+	      else if (EQ (tem, QCvisible))
 		{
 		  /* If got a visible property and that evaluates to nil
 		     then ignore this item.  */
@@ -8015,7 +8013,7 @@ parse_menu_item (item, notreal, inmenubar)
   /* If item string is not a string, evaluate it to get string.
      If we don't get a string, skip this item.  */
   item_string = AREF (item_properties, ITEM_PROPERTY_NAME);
-  if (!(STRINGP (item_string) || notreal))
+  if (!(STRINGP (item_string)))
     {
       item_string = menu_item_eval_property (item_string);
       if (!STRINGP (item_string))
@@ -8037,10 +8035,7 @@ parse_menu_item (item, notreal, inmenubar)
   tem = AREF (item_properties, ITEM_PROPERTY_ENABLE);
   if (!EQ (tem, Qt))
     {
-      if (notreal)
-	tem = Qt;
-      else
-	tem = menu_item_eval_property (tem);
+      tem = menu_item_eval_property (tem);
       if (inmenubar && NILP (tem))
 	return 0;		/* Ignore disabled items in menu bar.  */
       ASET (item_properties, ITEM_PROPERTY_ENABLE, tem);
@@ -8068,11 +8063,6 @@ parse_menu_item (item, notreal, inmenubar)
   if (inmenubar > 0)
     return 1;
 
-  /* If we only want to precompute equivalent key bindings (which we
-     don't even do any more anyway), stop here.  */
-  if (notreal)
-    return 1;
-
   { /* This is a command.  See if there is an equivalent key binding. */
     Lisp_Object keyeq = AREF (item_properties, ITEM_PROPERTY_KEYEQ);
 
@@ -8763,7 +8753,7 @@ read_char_minibuf_menu_prompt (commandflag, nmaps, maps)
 		}
 
 	      /* Ignore the element if it has no prompt string.  */
-	      if (INTEGERP (event) && parse_menu_item (elt, 0, -1))
+	      if (INTEGERP (event) && parse_menu_item (elt, -1))
 		{
 		  /* 1 if the char to type matches the string.  */
 		  int char_matches;
diff --git a/src/keyboard.h b/src/keyboard.h
index 2ebb362826..5b32595fa6 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -443,7 +443,7 @@ extern Lisp_Object Vfunction_key_map;
 /* Keymap of key translations that can override keymaps.  */
 extern Lisp_Object Vkey_translation_map;
 
-extern int parse_menu_item P_ ((Lisp_Object, int, int));
+extern int parse_menu_item (Lisp_Object, int);
 
 extern void echo_now P_ ((void));
 extern void init_kboard P_ ((KBOARD *));
diff --git a/src/menu.c b/src/menu.c
index 74d455a8c0..2af6e8573e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -25,6 +25,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "keyboard.h"
 #include "keymap.h"
 #include "frame.h"
+#include "window.h"
 #include "termhooks.h"
 #include "blockinput.h"
 #include "dispextern.h"
@@ -128,6 +129,13 @@ discard_menu_items ()
   xassert (NILP (menu_items_inuse));
 }
 
+static Lisp_Object
+cleanup_popup_menu (Lisp_Object arg)
+{
+  discard_menu_items ();
+  return Qnil;
+}
+
 /* This undoes save_menu_items, and it is called by the specpdl unwind
    mechanism.  */
 
@@ -253,7 +261,7 @@ push_menu_item (name, enable, key, def, equiv, type, selected, help)
 struct skp
   {
      Lisp_Object pending_maps;
-     int maxdepth, notreal;
+     int maxdepth;
      int notbuttons;
   };
 
@@ -264,25 +272,18 @@ static void single_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
    It handles one keymap, KEYMAP.
    The other arguments are passed along
    or point to local variables of the previous function.
-   If NOTREAL is nonzero, only check for equivalent key bindings, don't
-   evaluate expressions in menu items and don't make any menu.
 
    If we encounter submenus deeper than MAXDEPTH levels, ignore them.  */
 
 static void
-single_keymap_panes (keymap, pane_name, prefix, notreal, maxdepth)
-     Lisp_Object keymap;
-     Lisp_Object pane_name;
-     Lisp_Object prefix;
-     int notreal;
-     int maxdepth;
+single_keymap_panes (Lisp_Object keymap, Lisp_Object pane_name,
+		     Lisp_Object prefix, int maxdepth)
 {
   struct skp skp;
   struct gcpro gcpro1;
 
   skp.pending_maps = Qnil;
   skp.maxdepth = maxdepth;
-  skp.notreal = notreal;
   skp.notbuttons = 0;
 
   if (maxdepth <= 0)
@@ -311,8 +312,7 @@ single_keymap_panes (keymap, pane_name, prefix, notreal, maxdepth)
       string = XCAR (eltcdr);
       /* We no longer discard the @ from the beginning of the string here.
 	 Instead, we do this in *menu_show.  */
-      single_keymap_panes (Fcar (elt), string,
-			   XCDR (eltcdr), notreal, maxdepth - 1);
+      single_keymap_panes (Fcar (elt), string, XCDR (eltcdr), maxdepth - 1);
       skp.pending_maps = XCDR (skp.pending_maps);
     }
 }
@@ -322,8 +322,6 @@ single_keymap_panes (keymap, pane_name, prefix, notreal, maxdepth)
    KEY is a key in a keymap and ITEM is its binding.
    SKP->PENDING_MAPS_PTR is a list of keymaps waiting to be made into
    separate panes.
-   If SKP->NOTREAL is nonzero, only check for equivalent key bindings, don't
-   evaluate expressions in menu items and don't make any menu.
    If we encounter submenus deeper than SKP->MAXDEPTH levels, ignore them.  */
 
 static void
@@ -338,22 +336,13 @@ single_menu_item (key, item, dummy, skp_v)
 
   /* Parse the menu item and leave the result in item_properties.  */
   GCPRO2 (key, item);
-  res = parse_menu_item (item, skp->notreal, 0);
+  res = parse_menu_item (item, 0);
   UNGCPRO;
   if (!res)
     return;			/* Not a menu item.  */
 
   map = XVECTOR (item_properties)->contents[ITEM_PROPERTY_MAP];
 
-  if (skp->notreal)
-    {
-      /* We don't want to make a menu, just traverse the keymaps to
-	 precompute equivalent key bindings.  */
-      if (!NILP (map))
-	single_keymap_panes (map, Qnil, key, 1, skp->maxdepth - 1);
-      return;
-    }
-
   enabled = XVECTOR (item_properties)->contents[ITEM_PROPERTY_ENABLE];
   item_string = XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME];
 
@@ -450,22 +439,19 @@ single_menu_item (key, item, dummy, skp_v)
   if (! (NILP (map) || NILP (enabled)))
     {
       push_submenu_start ();
-      single_keymap_panes (map, Qnil, key, 0, skp->maxdepth - 1);
+      single_keymap_panes (map, Qnil, key, skp->maxdepth - 1);
       push_submenu_end ();
     }
 #endif
 }
 
 /* Look through KEYMAPS, a vector of keymaps that is NMAPS long,
-   and generate menu panes for them in menu_items.
-   If NOTREAL is nonzero,
-   don't bother really computing whether an item is enabled.  */
+   and generate menu panes for them in menu_items.  */
 
-void
-keymap_panes (keymaps, nmaps, notreal)
+static void
+keymap_panes (keymaps, nmaps)
      Lisp_Object *keymaps;
      int nmaps;
-     int notreal;
 {
   int mapno;
 
@@ -476,7 +462,7 @@ keymap_panes (keymaps, nmaps, notreal)
      P is the number of panes we have made so far.  */
   for (mapno = 0; mapno < nmaps; mapno++)
     single_keymap_panes (keymaps[mapno],
-			 Fkeymap_prompt (keymaps[mapno]), Qnil, notreal, 10);
+			 Fkeymap_prompt (keymaps[mapno]), Qnil, 10);
 
   finish_menu_items ();
 }
@@ -577,7 +563,7 @@ parse_single_submenu (item_key, item_name, maps)
 	  prompt = Fkeymap_prompt (mapvec[i]);
 	  single_keymap_panes (mapvec[i],
 			       !NILP (prompt) ? prompt : item_name,
-			       item_key, 0, 10);
+			       item_key, 10);
 	}
     }
 
@@ -1028,12 +1014,352 @@ find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data)
 }
 #endif  /* HAVE_NS */
 
+DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0,
+       doc: /* Pop up a deck-of-cards menu and return user's selection.
+POSITION is a position specification.  This is either a mouse button event
+or a list ((XOFFSET YOFFSET) WINDOW)
+where XOFFSET and YOFFSET are positions in pixels from the top left
+corner of WINDOW.  (WINDOW may be a window or a frame object.)
+This controls the position of the top left of the menu as a whole.
+If POSITION is t, it means to use the current mouse position.
+
+MENU is a specifier for a menu.  For the simplest case, MENU is a keymap.
+The menu items come from key bindings that have a menu string as well as
+a definition; actually, the "definition" in such a key binding looks like
+\(STRING . REAL-DEFINITION).  To give the menu a title, put a string into
+the keymap as a top-level element.
+
+If REAL-DEFINITION is nil, that puts a nonselectable string in the menu.
+Otherwise, REAL-DEFINITION should be a valid key binding definition.
+
+You can also use a list of keymaps as MENU.
+  Then each keymap makes a separate pane.
+
+When MENU is a keymap or a list of keymaps, the return value is the
+list of events corresponding to the user's choice. Note that
+`x-popup-menu' does not actually execute the command bound to that
+sequence of events.
+
+Alternatively, you can specify a menu of multiple panes
+  with a list of the form (TITLE PANE1 PANE2...),
+where each pane is a list of form (TITLE ITEM1 ITEM2...).
+Each ITEM is normally a cons cell (STRING . VALUE);
+but a string can appear as an item--that makes a nonselectable line
+in the menu.
+With this form of menu, the return value is VALUE from the chosen item.
+
+If POSITION is nil, don't display the menu at all, just precalculate the
+cached information about equivalent key sequences.
+
+If the user gets rid of the menu without making a valid choice, for
+instance by clicking the mouse away from a valid choice or by typing
+keyboard input, then this normally results in a quit and
+`x-popup-menu' does not return.  But if POSITION is a mouse button
+event (indicating that the user invoked the menu with the mouse) then
+no quit occurs and `x-popup-menu' returns nil.  */)
+  (position, menu)
+     Lisp_Object position, menu;
+{
+  Lisp_Object keymap, tem;
+  int xpos = 0, ypos = 0;
+  Lisp_Object title;
+  char *error_name = NULL;
+  Lisp_Object selection = Qnil;
+  FRAME_PTR f = NULL;
+  Lisp_Object x, y, window;
+  int keymaps = 0;
+  int for_click = 0;
+  int specpdl_count = SPECPDL_INDEX ();
+  Lisp_Object timestamp = Qnil;
+  struct gcpro gcpro1;
+#ifdef HAVE_NS
+  EmacsMenu *pmenu;
+  int specpdl_count2;
+  widget_value *wv, *first_wv = 0;
+#endif
+
+#ifdef HAVE_NS
+  NSTRACE (ns_popup_menu);
+#endif
+
+  if (NILP (position))
+    /* This is an obsolete call, which wants us to precompute the
+       keybinding equivalents, but we don't do that any more anyway.  */
+    return Qnil;
+
+#ifdef HAVE_MENUS
+  {
+    int get_current_pos_p = 0;
+    /* FIXME!!  check_w32 (); or check_x (); or check_ns (); */
+
+    /* Decode the first argument: find the window and the coordinates.  */
+    if (EQ (position, Qt)
+	|| (CONSP (position) && (EQ (XCAR (position), Qmenu_bar)
+				 || EQ (XCAR (position), Qtool_bar))))
+      {
+	get_current_pos_p = 1;
+      }
+    else
+      {
+	tem = Fcar (position);
+	if (CONSP (tem))
+	  {
+	    window = Fcar (Fcdr (position));
+	    x = XCAR (tem);
+	    y = Fcar (XCDR (tem));
+	  }
+	else
+	  {
+	    for_click = 1;
+	    tem = Fcar (Fcdr (position));  /* EVENT_START (position) */
+	    window = Fcar (tem);	     /* POSN_WINDOW (tem) */
+	    tem = Fcdr (Fcdr (tem));
+	    x = Fcar (Fcar (tem));
+	    y = Fcdr (Fcar (tem));
+	    timestamp = Fcar (Fcdr (tem));
+	  }
+
+	/* If a click happens in an external tool bar or a detached
+	   tool bar, x and y is NIL.  In that case, use the current
+	   mouse position.  This happens for the help button in the
+	   tool bar.  Ideally popup-menu should pass NIL to
+	   this function, but it doesn't.  */
+	if (NILP (x) && NILP (y))
+	  get_current_pos_p = 1;
+      }
+
+    if (get_current_pos_p)
+      {
+	/* Use the mouse's current position.  */
+	FRAME_PTR new_f = SELECTED_FRAME ();
+#ifdef HAVE_X_WINDOWS
+	/* Can't use mouse_position_hook for X since it returns
+	   coordinates relative to the window the mouse is in,
+	   we need coordinates relative to the edit widget always.  */
+	if (new_f != 0)
+	  {
+	    int cur_x, cur_y;
+
+	    mouse_position_for_popup (new_f, &cur_x, &cur_y);
+	    /* cur_x/y may be negative, so use make_number.  */
+	    x = make_number (cur_x);
+	    y = make_number (cur_y);
+	  }
+
+#else /* not HAVE_X_WINDOWS */
+	Lisp_Object bar_window;
+	enum scroll_bar_part part;
+	unsigned long time;
+	void (*mouse_position_hook) P_ ((struct frame **, int,
+					 Lisp_Object *,
+					 enum scroll_bar_part *,
+					 Lisp_Object *,
+					 Lisp_Object *,
+					 unsigned long *)) =
+	  FRAME_TERMINAL (new_f)->mouse_position_hook;
+
+	if (mouse_position_hook)
+	  (*mouse_position_hook) (&new_f, 1, &bar_window,
+				  &part, &x, &y, &time);
+#endif /* not HAVE_X_WINDOWS */
+
+	if (new_f != 0)
+	  XSETFRAME (window, new_f);
+	else
+	  {
+	    window = selected_window;
+	    XSETFASTINT (x, 0);
+	    XSETFASTINT (y, 0);
+	  }
+      }
+
+    CHECK_NUMBER (x);
+    CHECK_NUMBER (y);
+
+    /* Decode where to put the menu.  */
+
+    if (FRAMEP (window))
+      {
+	f = XFRAME (window);
+	xpos = 0;
+	ypos = 0;
+      }
+    else if (WINDOWP (window))
+      {
+	struct window *win = XWINDOW (window);
+	CHECK_LIVE_WINDOW (window);
+	f = XFRAME (WINDOW_FRAME (win));
+
+#ifdef HAVE_NS		     /* FIXME: Is this necessary??  --Stef  */
+	p.x = FRAME_COLUMN_WIDTH (f) * WINDOW_LEFT_EDGE_COL (win);
+	p.y = FRAME_LINE_HEIGHT (f) * WINDOW_TOP_EDGE_LINE (win);
+#else
+	xpos = WINDOW_LEFT_EDGE_X (win);
+	ypos = WINDOW_TOP_EDGE_Y (win);
+#endif
+      }
+    else
+      /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
+	 but I don't want to make one now.  */
+      CHECK_WINDOW (window);
+
+    xpos += XINT (x);
+    ypos += XINT (y);
+
+    /* FIXME: Find a more general check!  */
+    if (!(FRAME_X_P (f) || FRAME_MSDOS_P (f)
+	  || FRAME_W32_P (f) || FRAME_NS_P (f)))
+      error ("Can not put GUI menu on this terminal");
+
+    XSETFRAME (Vmenu_updating_frame, f);
+  }
+#endif /* HAVE_MENUS */
+
+  /* Now parse the lisp menus.  */
+  record_unwind_protect (unuse_menu_items, Qnil);
+
+  title = Qnil;
+  GCPRO1 (title);
+
+  /* Decode the menu items from what was specified.  */
+
+  keymap = get_keymap (menu, 0, 0);
+  if (CONSP (keymap))
+    {
+      /* We were given a keymap.  Extract menu info from the keymap.  */
+      Lisp_Object prompt;
+
+      /* Extract the detailed info to make one pane.  */
+      keymap_panes (&menu, 1);
+
+      /* Search for a string appearing directly as an element of the keymap.
+	 That string is the title of the menu.  */
+      prompt = Fkeymap_prompt (keymap);
+      if (!NILP (prompt))
+	title = prompt;
+#ifdef HAVE_NS		/* Is that needed and NS-specific?  --Stef  */
+      else
+	title = build_string ("Select");
+#endif
+
+      /* Make that be the pane title of the first pane.  */
+      if (!NILP (prompt) && menu_items_n_panes >= 0)
+	ASET (menu_items, MENU_ITEMS_PANE_NAME, prompt);
+
+      keymaps = 1;
+    }
+  else if (CONSP (menu) && KEYMAPP (XCAR (menu)))
+    {
+      /* We were given a list of keymaps.  */
+      int nmaps = XFASTINT (Flength (menu));
+      Lisp_Object *maps
+	= (Lisp_Object *) alloca (nmaps * sizeof (Lisp_Object));
+      int i;
+
+      title = Qnil;
+
+      /* The first keymap that has a prompt string
+	 supplies the menu title.  */
+      for (tem = menu, i = 0; CONSP (tem); tem = XCDR (tem))
+	{
+	  Lisp_Object prompt;
+
+	  maps[i++] = keymap = get_keymap (XCAR (tem), 1, 0);
+
+	  prompt = Fkeymap_prompt (keymap);
+	  if (NILP (title) && !NILP (prompt))
+	    title = prompt;
+	}
+
+      /* Extract the detailed info to make one pane.  */
+      keymap_panes (maps, nmaps);
+
+      /* Make the title be the pane title of the first pane.  */
+      if (!NILP (title) && menu_items_n_panes >= 0)
+	ASET (menu_items, MENU_ITEMS_PANE_NAME, title);
+
+      keymaps = 1;
+    }
+  else
+    {
+      /* We were given an old-fashioned menu.  */
+      title = Fcar (menu);
+      CHECK_STRING (title);
+
+      list_of_panes (Fcdr (menu));
+
+      keymaps = 0;
+    }
+
+  unbind_to (specpdl_count, Qnil);
+
+#ifdef HAVE_MENUS
+  /* Hide a previous tip, if any.  */
+  Fx_hide_tip ();
+
+#ifdef HAVE_NTGUI     /* FIXME: Is it really w32-specific?  --Stef  */
+  /* If resources from a previous popup menu still exist, does nothing
+     until the `menu_free_timer' has freed them (see w32fns.c). This
+     can occur if you press ESC or click outside a menu without selecting
+     a menu item.
+  */
+  if (current_popup_menu)
+    {
+      discard_menu_items ();
+      FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
+      UNGCPRO;
+      return Qnil;
+    }
+#endif
+
+#ifdef HAVE_NS			/* FIXME: ns-specific, why? --Stef  */
+  record_unwind_protect (cleanup_popup_menu, Qnil);
+#endif
+
+  /* Display them in a menu.  */
+  BLOCK_INPUT;
+
+  /* FIXME: Use a terminal hook!  */
+#if defined HAVE_NTGUI
+  selection = w32_menu_show (f, xpos, ypos, for_click,
+			     keymaps, title, &error_name);
+#elif defined HAVE_NS
+  selection = ns_menu_show (f, xpos, ypos, for_click,
+			    keymaps, title, &error_name);
+#else /* MSDOS and X11 */
+  selection = xmenu_show (f, xpos, ypos, for_click,
+			  keymaps, title, &error_name,
+			  INTEGERP (timestamp) ? XUINT (timestamp) : 0);
+#endif
+
+  UNBLOCK_INPUT;
+
+#ifdef HAVE_NS
+  unbind_to (specpdl_count, Qnil);
+#else
+  discard_menu_items ();
+#endif
+
+#ifdef HAVE_NTGUI     /* FIXME: Is it really w32-specific?  --Stef  */
+  FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
+#endif
+
+#endif /* HAVE_MENUS */
+
+  UNGCPRO;
+
+  if (error_name) error (error_name);
+  return selection;
+}
+
 void
 syms_of_menu ()
 {
   staticpro (&menu_items);
   menu_items = Qnil;
   menu_items_inuse = Qnil;
+
+  defsubr (&Sx_popup_menu);
 }
 
 /* arch-tag: 78bbc7cf-8025-4156-aa8a-6c7fd99bf51d
diff --git a/src/menu.h b/src/menu.h
index 6f0d8c50e4..08c70c8470 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -19,12 +19,13 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef MENU_H
 #define MENU_H
 
+extern Lisp_Object Vmenu_updating_frame;
+
 extern void init_menu_items P_ ((void));
 extern void finish_menu_items P_ ((void));
 extern void discard_menu_items P_ ((void));
 extern void save_menu_items P_ ((void));
 extern int parse_single_submenu P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
-extern void keymap_panes P_ ((Lisp_Object *, int, int));
 extern void list_of_panes P_ ((Lisp_Object));
 #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NTGUI)
 extern void free_menubar_widget_value_tree P_ ((widget_value *));
@@ -33,6 +34,16 @@ extern void find_and_call_menu_selection P_ ((FRAME_PTR, int,
 					      Lisp_Object, void *));
 #endif
 
+#ifdef HAVE_X_WINDOWS
+extern void mouse_position_for_popup (FRAME_PTR f, int *x, int *y);
+#endif
+
+extern Lisp_Object w32_menu_show (FRAME_PTR, int, int, int, int,
+				  Lisp_Object, char **);
+extern Lisp_Object ns_menu_show (FRAME_PTR, int, int, int, int,
+				 Lisp_Object, char **);
+extern Lisp_Object xmenu_show (FRAME_PTR, int, int, int, int,
+			       Lisp_Object, char **, EMACS_UINT);
 #endif /* MENU_H */
 
 /* arch-tag: c32b2778-724d-4e85-81d7-45f98530a988
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 07cc3f0fcc..8b8eb94b76 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -36,6 +36,7 @@ Carbon version by Yamamoto Mitsuharu. */
 #include "nsterm.h"
 #include "termhooks.h"
 #include "keyboard.h"
+#include "menu.h"
 
 #define NSMENUPROFILE 0
 
@@ -63,8 +64,6 @@ int menu_trace_num = 0;
 extern Lisp_Object Qundefined, Qmenu_enable, Qmenu_bar_update_hook;
 extern Lisp_Object QCtoggle, QCradio;
 
-extern Lisp_Object Vmenu_updating_frame;
-
 Lisp_Object Qdebug_on_next_call;
 extern Lisp_Object Voverriding_local_map, Voverriding_local_map_menu_flag,
 		   Qoverriding_local_map, Qoverriding_terminal_local_map;
@@ -771,188 +770,17 @@ name_is_separator (name)
 
    ========================================================================== */
 
-static Lisp_Object
-cleanup_popup_menu (Lisp_Object arg)
-{
-  discard_menu_items ();
-  return Qnil;
-}
-
-
-static Lisp_Object
-ns_popup_menu (Lisp_Object position, Lisp_Object menu)
+Lisp_Object
+ns_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
+	      Lisp_Object title, char **error)
 {
   EmacsMenu *pmenu;
-  struct frame *f = NULL;
   NSPoint p;
-  Lisp_Object window, x, y, tem, keymap, title;
-  struct gcpro gcpro1;
-  int specpdl_count = SPECPDL_INDEX (), specpdl_count2;
-  char *error_name = NULL;
-  int keymaps = 0;
+  Lisp_Object window, tem, keymap;
+  int specpdl_count = SPECPDL_INDEX ();
   widget_value *wv, *first_wv = 0;
 
-  NSTRACE (ns_popup_menu);
-
-  if (!NILP (position))
-    {
-      check_ns ();
-  
-      if (EQ (position, Qt)
-          || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar)
-                                   || EQ (XCAR (position), Qtool_bar))))
-        {
-          /* Use the mouse's current position.  */
-          struct frame *new_f = SELECTED_FRAME ();
-
-          if (FRAME_TERMINAL (new_f)->mouse_position_hook)
-            (*FRAME_TERMINAL (new_f)->mouse_position_hook)
-              (&new_f, 0, 0, 0, &x, &y, 0);
-          if (new_f != 0)
-            XSETFRAME (window, new_f);
-          else
-            {
-              window = selected_window;
-              x = make_number (0);
-              y = make_number (0);
-            }
-        }
-      else
-        {
-          CHECK_CONS (position);
-          tem = Fcar (position);
-          if (XTYPE (tem) == Lisp_Cons)
-            {
-              window = Fcar (Fcdr (position));
-              x = Fcar (tem);
-              y = Fcar (Fcdr (tem));
-            }
-          else
-            {
-              tem = Fcar (Fcdr (position));
-              window = Fcar (tem);
-              tem = Fcar (Fcdr (Fcdr (tem)));
-              x = Fcar (tem);
-              y = Fcdr (tem);
-            }
-        }
-  
-      CHECK_NUMBER (x);
-      CHECK_NUMBER (y);
-
-      if (FRAMEP (window))
-        {
-          f = XFRAME (window);
-      
-          p.x = 0;
-          p.y = 0;
-        }
-      else
-        {
-          struct window *win = XWINDOW (window);
-          CHECK_LIVE_WINDOW (window);
-          f = XFRAME (WINDOW_FRAME (win));
-          p.x = FRAME_COLUMN_WIDTH (f) * WINDOW_LEFT_EDGE_COL (win);
-          p.y = FRAME_LINE_HEIGHT (f) * WINDOW_TOP_EDGE_LINE (win);
-        }
-
-      p.x += XINT (x); p.y += XINT (y);
-
-      XSETFRAME (Vmenu_updating_frame, f);
-    }
-  else
-    {      /* no position given */
-      /* FIXME: if called during dump, we need to stop precomputation of
-         key equivalents (see below) because the keydefs in ns-win.el have
-         not been loaded yet. */
-      if (noninteractive)
-        return Qnil;
-      Vmenu_updating_frame = Qnil;
-    }
-
-  /* now parse the lisp menus */
-  record_unwind_protect (unuse_menu_items, Qnil);
-  title = Qnil;
-  GCPRO1 (title);
-
-  /* Decode the menu items from what was specified.  */
-
-  keymap = get_keymap (menu, 0, 0);
-  if (CONSP (keymap))
-    {
-      /* We were given a keymap.  Extract menu info from the keymap.  */
-      Lisp_Object prompt;
-
-      /* Extract the detailed info to make one pane.  */
-      keymap_panes (&menu, 1, NILP (position));
-
-      /* Search for a string appearing directly as an element of the keymap.
-	 That string is the title of the menu.  */
-      prompt = Fkeymap_prompt (keymap);
-      title = NILP (prompt) ? build_string ("Select") : prompt;
-
-      /* Make that be the pane title of the first pane.  */
-      if (!NILP (prompt) && menu_items_n_panes >= 0)
-	XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME] = prompt;
-
-      keymaps = 1;
-    }
-  else if (CONSP (menu) && KEYMAPP (XCAR (menu)))
-    {
-      /* We were given a list of keymaps.  */
-      int nmaps = XFASTINT (Flength (menu));
-      Lisp_Object *maps
-	= (Lisp_Object *) alloca (nmaps * sizeof (Lisp_Object));
-      int i;
-
-      title = Qnil;
-
-      /* The first keymap that has a prompt string
-	 supplies the menu title.  */
-      for (tem = menu, i = 0; CONSP (tem); tem = XCDR (tem))
-	{
-	  Lisp_Object prompt;
-
-	  maps[i++] = keymap = get_keymap (XCAR (tem), 1, 0);
-
-	  prompt = Fkeymap_prompt (keymap);
-	  if (NILP (title) && !NILP (prompt))
-	    title = prompt;
-	}
-
-      /* Extract the detailed info to make one pane.  */
-      keymap_panes (maps, nmaps, NILP (position));
-
-      /* Make the title be the pane title of the first pane.  */
-      if (!NILP (title) && menu_items_n_panes >= 0)
-	XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME] = title;
-
-      keymaps = 1;
-    }
-  else
-    {
-      /* We were given an old-fashioned menu.  */
-      title = Fcar (menu);
-      CHECK_STRING (title);
-
-      list_of_panes (Fcdr (menu));
-
-      keymaps = 0;
-    }
-
-  unbind_to (specpdl_count, Qnil);
-
-  /* If no position given, that was a signal to just precompute and cache
-     key equivalents, which was a side-effect of what we just did. */
-  if (NILP (position))
-    {
-      discard_menu_items ();
-      UNGCPRO;
-      return Qnil;
-    }
-
-  record_unwind_protect (cleanup_popup_menu, Qnil);
-  BLOCK_INPUT;
+  p.x = x; p.y = y;
 
   /* now parse stage 2 as in ns_update_menubar */
   wv = xmalloc_widget_value ();
@@ -963,8 +791,6 @@ ns_popup_menu (Lisp_Object position, Lisp_Object menu)
   wv->help = Qnil;
   first_wv = wv;
 
-  specpdl_count2 = SPECPDL_INDEX ();
-
 #if 0
   /* FIXME: a couple of one-line differences prevent reuse */
   wv = digest_single_submenu (0, menu_items_used, Qnil);
@@ -1150,25 +976,17 @@ ns_popup_menu (Lisp_Object position, Lisp_Object menu)
                                [NSString stringWithUTF8String: SDATA (title)]];
   [pmenu fillWithWidgetValue: first_wv->contents];
   free_menubar_widget_value_tree (first_wv);
-  unbind_to (specpdl_count2, Qnil);
+  unbind_to (specpdl_count, Qnil);
 
   popup_activated_flag = 1;
   tem = [pmenu runMenuAt: p forFrame: f keymaps: keymaps];
   popup_activated_flag = 0;
   [[FRAME_NS_VIEW (SELECTED_FRAME ()) window] makeKeyWindow];
 
-  UNBLOCK_INPUT;
-  discard_menu_items ();
-  unbind_to (specpdl_count, Qnil);
-  UNGCPRO;
-
-  if (error_name) error (error_name);
   return tem;
 }
 
 
-
-
 /* ==========================================================================
 
     Toolbar: externally-called functions
@@ -1931,46 +1749,6 @@ DEFUN ("ns-reset-menu", Fns_reset_menu, Sns_reset_menu, 0, 0, 0,
 }
 
 
-DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0,
-       doc: /* Pop up a deck-of-cards menu and return user's selection.
-POSITION is a position specification.  This is either a mouse button event
-or a list ((XOFFSET YOFFSET) WINDOW)
-where XOFFSET and YOFFSET are positions in pixels from the top left
-corner of WINDOW.  (WINDOW may be a window or a frame object.)
-This controls the position of the top left of the menu as a whole.
-If POSITION is t, it means to use the current mouse position.
-
-MENU is a specifier for a menu.  For the simplest case, MENU is a keymap.
-The menu items come from key bindings that have a menu string as well as
-a definition; actually, the \"definition\" in such a key binding looks like
-\(STRING . REAL-DEFINITION).  To give the menu a title, put a string into
-the keymap as a top-level element.
-
-If REAL-DEFINITION is nil, that puts a nonselectable string in the menu.
-Otherwise, REAL-DEFINITION should be a valid key binding definition.
-
-You can also use a list of keymaps as MENU.
-  Then each keymap makes a separate pane.
-
-When MENU is a keymap or a list of keymaps, the return value is the
-list of events corresponding to the user's choice. Note that
-`x-popup-menu' does not actually execute the command bound to that
-sequence of events.
-
-Alternatively, you can specify a menu of multiple panes
-  with a list of the form (TITLE PANE1 PANE2...),
-where each pane is a list of form (TITLE ITEM1 ITEM2...).
-Each ITEM is normally a cons cell (STRING . VALUE);
-but a string can appear as an item--that makes a nonselectable line
-in the menu.
-With this form of menu, the return value is VALUE from the chosen item.  */)
-     (position, menu)
-     Lisp_Object position, menu;
-{
-  return ns_popup_menu (position, menu);
-}
-
-
 DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,
        doc: /* Pop up a dialog box and return user's selection.
 POSITION specifies which frame to use.
@@ -2016,12 +1794,9 @@ DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_
 void
 syms_of_nsmenu ()
 {
-  defsubr (&Sx_popup_menu);
   defsubr (&Sx_popup_dialog);
   defsubr (&Sns_reset_menu);
   defsubr (&Smenu_or_popup_active_p);
-  staticpro (&menu_items);
-  menu_items = Qnil;
 
   Qdebug_on_next_call = intern ("debug-on-next-call");
   staticpro (&Qdebug_on_next_call);
diff --git a/src/w32menu.c b/src/w32menu.c
index c573e3713c..3e4359eea9 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -36,6 +36,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "charset.h"
 #include "character.h"
 #include "coding.h"
+#include "menu.h"
 
 /* This may include sys/types.h, and that somehow loses
    if this is not done before the other system files.  */
@@ -78,8 +79,6 @@ AppendMenuW_Proc unicode_append_menu = NULL;
 
 Lisp_Object Qdebug_on_next_call;
 
-extern Lisp_Object Vmenu_updating_frame;
-
 extern Lisp_Object Qmenu_bar;
 
 extern Lisp_Object QCtoggle, QCradio;
@@ -99,8 +98,6 @@ static Lisp_Object w32_dialog_show P_ ((FRAME_PTR, int, Lisp_Object, char**));
 static int is_simple_dialog P_ ((Lisp_Object));
 static Lisp_Object simple_dialog_show P_ ((FRAME_PTR, Lisp_Object, Lisp_Object));
 #endif
-static Lisp_Object w32_menu_show P_ ((FRAME_PTR, int, int, int, int,
-				      Lisp_Object, char **));
 
 void w32_free_menu_strings P_((HWND));
 
@@ -139,247 +136,6 @@ menubar_id_to_frame (id)
   return 0;
 }
 
-DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0,
-       doc: /* Pop up a deck-of-cards menu and return user's selection.
-POSITION is a position specification.  This is either a mouse button
-event or a list ((XOFFSET YOFFSET) WINDOW) where XOFFSET and YOFFSET
-are positions in pixels from the top left corner of WINDOW's frame
-\(WINDOW may be a frame object instead of a window).  This controls the
-position of the center of the first line in the first pane of the
-menu, not the top left of the menu as a whole.  If POSITION is t, it
-means to use the current mouse position.
-
-MENU is a specifier for a menu.  For the simplest case, MENU is a keymap.
-The menu items come from key bindings that have a menu string as well as
-a definition; actually, the \"definition\" in such a key binding looks like
-\(STRING . REAL-DEFINITION).  To give the menu a title, put a string into
-the keymap as a top-level element.
-
-If REAL-DEFINITION is nil, that puts a nonselectable string in the menu.
-Otherwise, REAL-DEFINITION should be a valid key binding definition.
-
-You can also use a list of keymaps as MENU.  Then each keymap makes a
-separate pane.  When MENU is a keymap or a list of keymaps, the return
-value is a list of events.
-
-Alternatively, you can specify a menu of multiple panes with a list of
-the form (TITLE PANE1 PANE2...), where each pane is a list of
-form (TITLE ITEM1 ITEM2...).
-Each ITEM is normally a cons cell (STRING . VALUE); but a string can
-appear as an item--that makes a nonselectable line in the menu.
-With this form of menu, the return value is VALUE from the chosen item.
-
-If POSITION is nil, don't display the menu at all, just precalculate the
-cached information about equivalent key sequences.  */)
-  (position, menu)
-     Lisp_Object position, menu;
-{
-  Lisp_Object keymap, tem;
-  int xpos = 0, ypos = 0;
-  Lisp_Object title;
-  char *error_name;
-  Lisp_Object selection;
-  FRAME_PTR f = NULL;
-  Lisp_Object x, y, window;
-  int keymaps = 0;
-  int for_click = 0;
-  int specpdl_count = SPECPDL_INDEX ();
-  struct gcpro gcpro1;
-
-#ifdef HAVE_MENUS
-  if (! NILP (position))
-    {
-      check_w32 ();
-
-      /* Decode the first argument: find the window and the coordinates.  */
-      if (EQ (position, Qt)
-	  || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar)
-                                   || EQ (XCAR (position), Qtool_bar))))
-	{
-	  /* Use the mouse's current position.  */
-	  FRAME_PTR new_f = SELECTED_FRAME ();
-	  Lisp_Object bar_window;
-	  enum scroll_bar_part part;
-	  unsigned long time;
-
-	  if (FRAME_TERMINAL (new_f)->mouse_position_hook)
-	    (*FRAME_TERMINAL (new_f)->mouse_position_hook) (&new_f, 1, &bar_window,
-				    &part, &x, &y, &time);
-	  if (new_f != 0)
-	    XSETFRAME (window, new_f);
-	  else
-	    {
-	      window = selected_window;
-	      XSETFASTINT (x, 0);
-	      XSETFASTINT (y, 0);
-	    }
-	}
-      else
-	{
-	  tem = Fcar (position);
-	  if (CONSP (tem))
-	    {
-	      window = Fcar (Fcdr (position));
-	      x = Fcar (tem);
-	      y = Fcar (Fcdr (tem));
-	    }
-	  else
-	    {
-	      for_click = 1;
-	      tem = Fcar (Fcdr (position));  /* EVENT_START (position) */
-	      window = Fcar (tem);	     /* POSN_WINDOW (tem) */
-	      tem = Fcar (Fcdr (Fcdr (tem))); /* POSN_WINDOW_POSN (tem) */
-	      x = Fcar (tem);
-	      y = Fcdr (tem);
-	    }
-	}
-
-      CHECK_NUMBER (x);
-      CHECK_NUMBER (y);
-
-      /* Decode where to put the menu.  */
-
-      if (FRAMEP (window))
-	{
-	  f = XFRAME (window);
-	  xpos = 0;
-	  ypos = 0;
-	}
-      else if (WINDOWP (window))
-	{
-	  CHECK_LIVE_WINDOW (window);
-	  f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
-
-	  xpos = WINDOW_LEFT_EDGE_X (XWINDOW (window));
-	  ypos = WINDOW_TOP_EDGE_Y (XWINDOW (window));
-	}
-      else
-	/* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
-	   but I don't want to make one now.  */
-	CHECK_WINDOW (window);
-
-      xpos += XINT (x);
-      ypos += XINT (y);
-
-      XSETFRAME (Vmenu_updating_frame, f);
-    }
-  else
-    Vmenu_updating_frame = Qnil;
-#endif /* HAVE_MENUS */
-
-  record_unwind_protect (unuse_menu_items, Qnil);
-
-  title = Qnil;
-  GCPRO1 (title);
-
-  /* Decode the menu items from what was specified.  */
-
-  keymap = get_keymap (menu, 0, 0);
-  if (CONSP (keymap))
-    {
-      /* We were given a keymap.  Extract menu info from the keymap.  */
-      Lisp_Object prompt;
-
-      /* Extract the detailed info to make one pane.  */
-      keymap_panes (&menu, 1, NILP (position));
-
-      /* Search for a string appearing directly as an element of the keymap.
-	 That string is the title of the menu.  */
-      prompt = Fkeymap_prompt (keymap);
-      if (NILP (title) && !NILP (prompt))
-	title = prompt;
-
-      /* Make that be the pane title of the first pane.  */
-      if (!NILP (prompt) && menu_items_n_panes >= 0)
-	ASET (menu_items, MENU_ITEMS_PANE_NAME, prompt);
-
-      keymaps = 1;
-    }
-  else if (CONSP (menu) && KEYMAPP (XCAR (menu)))
-    {
-      /* We were given a list of keymaps.  */
-      int nmaps = XFASTINT (Flength (menu));
-      Lisp_Object *maps
-	= (Lisp_Object *) alloca (nmaps * sizeof (Lisp_Object));
-      int i;
-
-      title = Qnil;
-
-      /* The first keymap that has a prompt string
-	 supplies the menu title.  */
-      for (tem = menu, i = 0; CONSP (tem); tem = Fcdr (tem))
-	{
-	  Lisp_Object prompt;
-
-	  maps[i++] = keymap = get_keymap (Fcar (tem), 1, 0);
-
-	  prompt = Fkeymap_prompt (keymap);
-	  if (NILP (title) && !NILP (prompt))
-	    title = prompt;
-	}
-
-      /* Extract the detailed info to make one pane.  */
-      keymap_panes (maps, nmaps, NILP (position));
-
-      /* Make the title be the pane title of the first pane.  */
-      if (!NILP (title) && menu_items_n_panes >= 0)
-	ASET (menu_items, MENU_ITEMS_PANE_NAME, title);
-
-      keymaps = 1;
-    }
-  else
-    {
-      /* We were given an old-fashioned menu.  */
-      title = Fcar (menu);
-      CHECK_STRING (title);
-
-      list_of_panes (Fcdr (menu));
-
-      keymaps = 0;
-    }
-
-  unbind_to (specpdl_count, Qnil);
-
-  if (NILP (position))
-    {
-      discard_menu_items ();
-      FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
-      UNGCPRO;
-      return Qnil;
-    }
-
-#ifdef HAVE_MENUS
-  /* If resources from a previous popup menu still exist, does nothing
-     until the `menu_free_timer' has freed them (see w32fns.c). This
-     can occur if you press ESC or click outside a menu without selecting
-     a menu item.
-  */
-  if (current_popup_menu)
-    {
-      discard_menu_items ();
-      FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
-      UNGCPRO;
-      return Qnil;
-    }
-
-  /* Display them in a menu.  */
-  BLOCK_INPUT;
-
-  selection = w32_menu_show (f, xpos, ypos, for_click,
-			     keymaps, title, &error_name);
-  UNBLOCK_INPUT;
-
-  discard_menu_items ();
-  FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
-
-#endif /* HAVE_MENUS */
-
-  UNGCPRO;
-
-  if (error_name) error (error_name);
-  return selection;
-}
-
 #ifdef HAVE_MENUS
 
 DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,
@@ -936,15 +692,9 @@ free_frame_menubar (f)
    ERROR is a place to store an error message string in case of failure.
    (We return nil on failure, but the value doesn't actually matter.)  */
 
-static Lisp_Object
-w32_menu_show (f, x, y, for_click, keymaps, title, error)
-     FRAME_PTR f;
-     int x;
-     int y;
-     int for_click;
-     int keymaps;
-     Lisp_Object title;
-     char **error;
+Lisp_Object
+w32_menu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
+	       Lisp_Object title, char **error)
 {
   int i;
   int menu_item_selection;
@@ -1970,7 +1720,6 @@ void syms_of_w32menu ()
 
   DEFSYM (Qdebug_on_next_call, "debug-on-next-call");
 
-  defsubr (&Sx_popup_menu);
   defsubr (&Smenu_or_popup_active_p);
 #ifdef HAVE_MENUS
   defsubr (&Sx_popup_dialog);
diff --git a/src/xmenu.c b/src/xmenu.c
index d849328344..601767d768 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -108,8 +108,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 Lisp_Object Qdebug_on_next_call;
 
-extern Lisp_Object Vmenu_updating_frame;
-
 extern Lisp_Object Qmenu_bar;
 
 extern Lisp_Object QCtoggle, QCradio;
@@ -138,8 +136,6 @@ static Lisp_Object xdialog_show P_ ((FRAME_PTR, int, Lisp_Object, Lisp_Object,
 #endif
 
 static int update_frame_menubar P_ ((struct frame *));
-static Lisp_Object xmenu_show P_ ((struct frame *, int, int, int, int,
-				   Lisp_Object, char **, EMACS_UINT));
 
 /* Flag which when set indicates a dialog or menu has been posted by
    Xt on behalf of one of the widget sets.  */
@@ -197,7 +193,7 @@ menubar_id_to_frame (id)
    for the window where the mouse is in.  This could be the menu bar,
    the scroll bar or the edit window.  Fx_popup_menu needs to be
    sure it is the edit window.  */
-static void
+void
 mouse_position_for_popup (f, x, y)
      FRAME_PTR f;
      int *x;
@@ -240,288 +236,6 @@ mouse_position_for_popup (f, x, y)
 
 #endif /* HAVE_X_WINDOWS */
 
-DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0,
-       doc: /* Pop up a deck-of-cards menu and return user's selection.
-POSITION is a position specification.  This is either a mouse button event
-or a list ((XOFFSET YOFFSET) WINDOW)
-where XOFFSET and YOFFSET are positions in pixels from the top left
-corner of WINDOW.  (WINDOW may be a window or a frame object.)
-This controls the position of the top left of the menu as a whole.
-If POSITION is t, it means to use the current mouse position.
-
-MENU is a specifier for a menu.  For the simplest case, MENU is a keymap.
-The menu items come from key bindings that have a menu string as well as
-a definition; actually, the "definition" in such a key binding looks like
-\(STRING . REAL-DEFINITION).  To give the menu a title, put a string into
-the keymap as a top-level element.
-
-If REAL-DEFINITION is nil, that puts a nonselectable string in the menu.
-Otherwise, REAL-DEFINITION should be a valid key binding definition.
-
-You can also use a list of keymaps as MENU.
-  Then each keymap makes a separate pane.
-
-When MENU is a keymap or a list of keymaps, the return value is the
-list of events corresponding to the user's choice. Note that
-`x-popup-menu' does not actually execute the command bound to that
-sequence of events.
-
-Alternatively, you can specify a menu of multiple panes
-  with a list of the form (TITLE PANE1 PANE2...),
-where each pane is a list of form (TITLE ITEM1 ITEM2...).
-Each ITEM is normally a cons cell (STRING . VALUE);
-but a string can appear as an item--that makes a nonselectable line
-in the menu.
-With this form of menu, the return value is VALUE from the chosen item.
-
-If POSITION is nil, don't display the menu at all, just precalculate the
-cached information about equivalent key sequences.
-
-If the user gets rid of the menu without making a valid choice, for
-instance by clicking the mouse away from a valid choice or by typing
-keyboard input, then this normally results in a quit and
-`x-popup-menu' does not return.  But if POSITION is a mouse button
-event (indicating that the user invoked the menu with the mouse) then
-no quit occurs and `x-popup-menu' returns nil.  */)
-     (position, menu)
-     Lisp_Object position, menu;
-{
-  Lisp_Object keymap, tem;
-  int xpos = 0, ypos = 0;
-  Lisp_Object title;
-  char *error_name = NULL;
-  Lisp_Object selection = Qnil;
-  FRAME_PTR f = NULL;
-  Lisp_Object x, y, window;
-  int keymaps = 0;
-  int for_click = 0;
-  int specpdl_count = SPECPDL_INDEX ();
-  Lisp_Object timestamp = Qnil;
-  struct gcpro gcpro1;
-
-#ifdef HAVE_MENUS
-  if (! NILP (position))
-    {
-      int get_current_pos_p = 0;
-      check_x ();
-
-      /* Decode the first argument: find the window and the coordinates.  */
-      if (EQ (position, Qt)
-	  || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar)
-				   || EQ (XCAR (position), Qtool_bar))))
-	{
-          get_current_pos_p = 1;
-        }
-      else
-	{
-	  tem = Fcar (position);
-	  if (CONSP (tem))
-	    {
-	      window = Fcar (Fcdr (position));
-	      x = XCAR (tem);
-	      y = Fcar (XCDR (tem));
-	    }
-	  else
-	    {
-	      for_click = 1;
-	      tem = Fcar (Fcdr (position));  /* EVENT_START (position) */
-	      window = Fcar (tem);	     /* POSN_WINDOW (tem) */
-	      tem = Fcdr (Fcdr (tem));
-	      x = Fcar (Fcar (tem));
-	      y = Fcdr (Fcar (tem));
-	      timestamp = Fcar (Fcdr (tem));
-	    }
-
-          /* If a click happens in an external tool bar or a detached
-             tool bar, x and y is NIL.  In that case, use the current
-             mouse position.  This happens for the help button in the
-             tool bar.  Ideally popup-menu should pass NIL to
-             this function, but it doesn't.  */
-          if (NILP (x) && NILP (y))
-            get_current_pos_p = 1;
-	}
-
-      if (get_current_pos_p)
-        {
-	  /* Use the mouse's current position.  */
-	  FRAME_PTR new_f = SELECTED_FRAME ();
-#ifdef HAVE_X_WINDOWS
-          /* Can't use mouse_position_hook for X since it returns
-             coordinates relative to the window the mouse is in,
-             we need coordinates relative to the edit widget always.  */
-          if (new_f != 0)
-            {
-              int cur_x, cur_y;
-
-              mouse_position_for_popup (new_f, &cur_x, &cur_y);
-              /* cur_x/y may be negative, so use make_number.  */
-              x = make_number (cur_x);
-              y = make_number (cur_y);
-            }
-
-#else /* not HAVE_X_WINDOWS */
-	  Lisp_Object bar_window;
-	  enum scroll_bar_part part;
-	  unsigned long time;
-	  void (*mouse_position_hook) P_ ((struct frame **, int,
-					   Lisp_Object *,
-					   enum scroll_bar_part *,
-					   Lisp_Object *,
-					   Lisp_Object *,
-					   unsigned long *)) =
-	    new_f->terminal->mouse_position_hook;
-
-	  if (mouse_position_hook)
-	    (*mouse_position_hook) (&new_f, 1, &bar_window,
-				    &part, &x, &y, &time);
-#endif /* not HAVE_X_WINDOWS */
-
-	  if (new_f != 0)
-	    XSETFRAME (window, new_f);
-	  else
-	    {
-	      window = selected_window;
-	      XSETFASTINT (x, 0);
-	      XSETFASTINT (y, 0);
-	    }
-	}
-
-      CHECK_NUMBER (x);
-      CHECK_NUMBER (y);
-
-      /* Decode where to put the menu.  */
-
-      if (FRAMEP (window))
-	{
-	  f = XFRAME (window);
-	  xpos = 0;
-	  ypos = 0;
-	}
-      else if (WINDOWP (window))
-	{
-	  CHECK_LIVE_WINDOW (window);
-	  f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
-
-	  xpos = WINDOW_LEFT_EDGE_X (XWINDOW (window));
-	  ypos = WINDOW_TOP_EDGE_Y (XWINDOW (window));
-	}
-      else
-	/* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
-	   but I don't want to make one now.  */
-	CHECK_WINDOW (window);
-
-      xpos += XINT (x);
-      ypos += XINT (y);
-
-      if (! FRAME_X_P (f) && ! FRAME_MSDOS_P (f))
-        error ("Can not put X menu on this terminal");
-
-      XSETFRAME (Vmenu_updating_frame, f);
-    }
-  else
-    Vmenu_updating_frame = Qnil;
-#endif /* HAVE_MENUS */
-
-  record_unwind_protect (unuse_menu_items, Qnil);
-  title = Qnil;
-  GCPRO1 (title);
-
-  /* Decode the menu items from what was specified.  */
-
-  keymap = get_keymap (menu, 0, 0);
-  if (CONSP (keymap))
-    {
-      /* We were given a keymap.  Extract menu info from the keymap.  */
-      Lisp_Object prompt;
-
-      /* Extract the detailed info to make one pane.  */
-      keymap_panes (&menu, 1, NILP (position));
-
-      /* Search for a string appearing directly as an element of the keymap.
-	 That string is the title of the menu.  */
-      prompt = Fkeymap_prompt (keymap);
-      if (NILP (title) && !NILP (prompt))
-	title = prompt;
-
-      /* Make that be the pane title of the first pane.  */
-      if (!NILP (prompt) && menu_items_n_panes >= 0)
-	XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME] = prompt;
-
-      keymaps = 1;
-    }
-  else if (CONSP (menu) && KEYMAPP (XCAR (menu)))
-    {
-      /* We were given a list of keymaps.  */
-      int nmaps = XFASTINT (Flength (menu));
-      Lisp_Object *maps
-	= (Lisp_Object *) alloca (nmaps * sizeof (Lisp_Object));
-      int i;
-
-      title = Qnil;
-
-      /* The first keymap that has a prompt string
-	 supplies the menu title.  */
-      for (tem = menu, i = 0; CONSP (tem); tem = XCDR (tem))
-	{
-	  Lisp_Object prompt;
-
-	  maps[i++] = keymap = get_keymap (XCAR (tem), 1, 0);
-
-	  prompt = Fkeymap_prompt (keymap);
-	  if (NILP (title) && !NILP (prompt))
-	    title = prompt;
-	}
-
-      /* Extract the detailed info to make one pane.  */
-      keymap_panes (maps, nmaps, NILP (position));
-
-      /* Make the title be the pane title of the first pane.  */
-      if (!NILP (title) && menu_items_n_panes >= 0)
-	XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME] = title;
-
-      keymaps = 1;
-    }
-  else
-    {
-      /* We were given an old-fashioned menu.  */
-      title = Fcar (menu);
-      CHECK_STRING (title);
-
-      list_of_panes (Fcdr (menu));
-
-      keymaps = 0;
-    }
-
-  unbind_to (specpdl_count, Qnil);
-
-  if (NILP (position))
-    {
-      discard_menu_items ();
-      UNGCPRO;
-      return Qnil;
-    }
-
-#ifdef HAVE_MENUS
-  /* Hide a previous tip, if any.  */
-  Fx_hide_tip ();
-
-  /* Display them in a menu.  */
-  BLOCK_INPUT;
-
-  selection = xmenu_show (f, xpos, ypos, for_click,
-			  keymaps, title, &error_name,
-			  INTEGERP (timestamp) ? XUINT (timestamp) : 0);
-  UNBLOCK_INPUT;
-
-  discard_menu_items ();
-
-  UNGCPRO;
-#endif /* HAVE_MENUS */
-
-  if (error_name) error (error_name);
-  return selection;
-}
-
 #ifdef HAVE_MENUS
 
 DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,
@@ -1947,16 +1661,9 @@ create_and_show_popup_menu (f, first_wv, x, y, for_click, timestamp)
 
 #endif /* not USE_GTK */
 
-static Lisp_Object
-xmenu_show (f, x, y, for_click, keymaps, title, error, timestamp)
-     FRAME_PTR f;
-     int x;
-     int y;
-     int for_click;
-     int keymaps;
-     Lisp_Object title;
-     char **error;
-     EMACS_UINT timestamp;
+Lisp_Object
+xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
+	    Lisp_Object title, char **error, EMACS_UINT timestamp)
 {
   int i;
   widget_value *wv, *save_wv = 0, *first_wv = 0, *prev_wv = 0;
@@ -2939,7 +2646,6 @@ syms_of_xmenu ()
   next_menubar_widget_id = 1;
 #endif
 
-  defsubr (&Sx_popup_menu);
   defsubr (&Smenu_or_popup_active_p);
 
 #if defined (USE_GTK) || defined (USE_X_TOOLKIT)