* charset.c (load_charset_map_from_file)

[gnu-emacs] / src / menu.c

diff --git a/src/menu.c b/src/menu.c
index 44eebe8dbe7a2198cbeeb9913cc50eedb50e9d9e..ad6054d7192953894816a7d3bbabb155a5437816 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,6 +1,6 @@
 /* Platform-independent code for terminal communications.
    Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -248,14 +248,16 @@ push_menu_item (name, enable, key, def, equiv, type, selected, help)
   if (menu_items_used + MENU_ITEMS_ITEM_LENGTH > menu_items_allocated)
     grow_menu_items ();
 
-  XVECTOR (menu_items)->contents[menu_items_used++] = name;
-  XVECTOR (menu_items)->contents[menu_items_used++] = enable;
-  XVECTOR (menu_items)->contents[menu_items_used++] = key;
-  XVECTOR (menu_items)->contents[menu_items_used++] = equiv;
-  XVECTOR (menu_items)->contents[menu_items_used++] = def;
-  XVECTOR (menu_items)->contents[menu_items_used++] = type;
-  XVECTOR (menu_items)->contents[menu_items_used++] = selected;
-  XVECTOR (menu_items)->contents[menu_items_used++] = help;
+  ASET (menu_items, menu_items_used + MENU_ITEMS_ITEM_NAME,    name);
+  ASET (menu_items, menu_items_used + MENU_ITEMS_ITEM_ENABLE,  enable);
+  ASET (menu_items, menu_items_used + MENU_ITEMS_ITEM_VALUE,   key);
+  ASET (menu_items, menu_items_used + MENU_ITEMS_ITEM_EQUIV_KEY, equiv);
+  ASET (menu_items, menu_items_used + MENU_ITEMS_ITEM_DEFINITION, def);
+  ASET (menu_items, menu_items_used + MENU_ITEMS_ITEM_TYPE,    type);
+  ASET (menu_items, menu_items_used + MENU_ITEMS_ITEM_SELECTED,        selected);
+  ASET (menu_items, menu_items_used + MENU_ITEMS_ITEM_HELP,    help);
+
+  menu_items_used += MENU_ITEMS_ITEM_LENGTH;
 }
 
 /* Args passed between single_keymap_panes and single_menu_item.  */
@@ -1074,10 +1076,6 @@ no quit occurs and `x-popup-menu' returns nil.  */)
   Lisp_Object timestamp = Qnil;
   struct gcpro gcpro1;
 
-#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.  */
@@ -1186,13 +1184,8 @@ no quit occurs and `x-popup-menu' returns nil.  */)
        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,
@@ -1290,8 +1283,10 @@ no quit occurs and `x-popup-menu' returns nil.  */)
   unbind_to (specpdl_count, Qnil);
 
 #ifdef HAVE_MENUS
+#ifdef HAVE_WINDOW_SYSTEM
   /* Hide a previous tip, if any.  */
   Fx_hide_tip ();
+#endif
 
 #ifdef HAVE_NTGUI     /* FIXME: Is it really w32-specific?  --Stef  */
   /* If resources from a previous popup menu still exist, does nothing