diff options
| author | Paul Eggert | 2011-06-02 10:16:09 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-02 10:16:09 -0700 |
| commit | 037e65b496485cf3bd570a805bac787abac39cf3 (patch) | |
| tree | 343a49d60bc28ba9871c09442d7971d85a2901d7 /src/menu.c | |
| parent | b3e945d3a47c5c64d84cb56594ff8c884acb1c37 (diff) | |
| parent | 57f53182c004f51e47818d70968a07579440eaff (diff) | |
| download | emacs-037e65b496485cf3bd570a805bac787abac39cf3.tar.gz emacs-037e65b496485cf3bd570a805bac787abac39cf3.zip | |
Merge: memory_full, gnutls improvements
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/menu.c b/src/menu.c index e4338f349f6..7eda4c6ebb5 100644 --- a/src/menu.c +++ b/src/menu.c | |||
| @@ -178,7 +178,7 @@ static void | |||
| 178 | grow_menu_items (void) | 178 | grow_menu_items (void) |
| 179 | { | 179 | { |
| 180 | if ((INT_MAX - MENU_ITEMS_PANE_LENGTH) / 2 < menu_items_allocated) | 180 | if ((INT_MAX - MENU_ITEMS_PANE_LENGTH) / 2 < menu_items_allocated) |
| 181 | memory_full (); | 181 | memory_full (SIZE_MAX); |
| 182 | menu_items_allocated *= 2; | 182 | menu_items_allocated *= 2; |
| 183 | menu_items = larger_vector (menu_items, menu_items_allocated, Qnil); | 183 | menu_items = larger_vector (menu_items, menu_items_allocated, Qnil); |
| 184 | } | 184 | } |