HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add package-menu-mark-upgrades to the Package Menu menu bar map.
[bpt/emacs.git]
/
src
/
menu.c
diff --git
a/src/menu.c
b/src/menu.c
index
e4338f3
..
587f55e
100644
(file)
--- a/
src/menu.c
+++ b/
src/menu.c
@@
-67,6
+67,9
@@
Lisp_Object menu_items;
/* If non-nil, means that the global vars defined here are already in use.
Used to detect cases where we try to re-enter this non-reentrant code. */
/* If non-nil, means that the global vars defined here are already in use.
Used to detect cases where we try to re-enter this non-reentrant code. */
+#if ! (defined USE_GTK || defined USE_MOTIF)
+static
+#endif
Lisp_Object menu_items_inuse;
/* Number of slots currently allocated in menu_items. */
Lisp_Object menu_items_inuse;
/* Number of slots currently allocated in menu_items. */
@@
-178,7
+181,7
@@
static void
grow_menu_items (void)
{
if ((INT_MAX - MENU_ITEMS_PANE_LENGTH) / 2 < menu_items_allocated)
grow_menu_items (void)
{
if ((INT_MAX - MENU_ITEMS_PANE_LENGTH) / 2 < menu_items_allocated)
- memory_full ();
+ memory_full (
SIZE_MAX
);
menu_items_allocated *= 2;
menu_items = larger_vector (menu_items, menu_items_allocated, Qnil);
}
menu_items_allocated *= 2;
menu_items = larger_vector (menu_items, menu_items_allocated, Qnil);
}
@@
-361,7
+364,7
@@
single_menu_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy, void *sk
return;
}
return;
}
-#if defined
(HAVE_X_WINDOWS) || defined
(MSDOS)
+#if defined
(HAVE_X_WINDOWS) || defined
(MSDOS)
#ifndef HAVE_BOXES
/* Simulate radio buttons and toggle boxes by putting a prefix in
front of them. */
#ifndef HAVE_BOXES
/* Simulate radio buttons and toggle boxes by putting a prefix in
front of them. */
@@
-974,7
+977,7
@@
find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data)
prefix = entry = Qnil;
i = 0;
subprefix_stack =
prefix = entry = Qnil;
i = 0;
subprefix_stack =
- (Lisp_Object *)alloca(menu_items_used * sizeof (Lisp_Object));
+ (Lisp_Object *)alloca
(menu_items_used * sizeof (Lisp_Object));
while (i < menu_items_used)
{
while (i < menu_items_used)
{