diff options
| author | Andreas Schwab | 2011-05-09 13:29:51 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2011-05-09 13:29:51 +0200 |
| commit | 57679c8695cd63c63dd33ba548fefdef68a5cca5 (patch) | |
| tree | 42c81670eea6a5455a5d098868210525a1c89fb2 /src | |
| parent | 5a7f0a3050ee49f4927c07ba96d02b7dae3a2751 (diff) | |
| download | emacs-57679c8695cd63c63dd33ba548fefdef68a5cca5.tar.gz emacs-57679c8695cd63c63dd33ba548fefdef68a5cca5.zip | |
* w32menu.c (set_frame_menubar): Fix submenu allocation.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/w32menu.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 10ca2e250dc..6f70908caae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-05-09 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * w32menu.c (set_frame_menubar): Fix submenu allocation. | ||
| 4 | |||
| 1 | 2011-05-07 Eli Zaretskii <eliz@gnu.org> | 5 | 2011-05-07 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * w32console.c (Fset_screen_color): Doc fix. | 7 | * w32console.c (Fset_screen_color): Doc fix. |
diff --git a/src/w32menu.c b/src/w32menu.c index c8c6a319b40..ca763b553cf 100644 --- a/src/w32menu.c +++ b/src/w32menu.c | |||
| @@ -427,11 +427,10 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) | |||
| 427 | 427 | ||
| 428 | menu_items = f->menu_bar_vector; | 428 | menu_items = f->menu_bar_vector; |
| 429 | menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0; | 429 | menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0; |
| 430 | submenu_start = (int *) alloca (ASIZE (items) * sizeof (int *)); | 430 | submenu_start = (int *) alloca (ASIZE (items) * sizeof (int)); |
| 431 | submenu_end = (int *) alloca (ASIZE (items) * sizeof (int *)); | 431 | submenu_end = (int *) alloca (ASIZE (items) * sizeof (int)); |
| 432 | submenu_n_panes = (int *) alloca (ASIZE (items) * sizeof (int)); | 432 | submenu_n_panes = (int *) alloca (ASIZE (items) * sizeof (int)); |
| 433 | submenu_top_level_items | 433 | submenu_top_level_items = (int *) alloca (ASIZE (items) * sizeof (int)); |
| 434 | = (int *) alloca (ASIZE (items) * sizeof (int *)); | ||
| 435 | init_menu_items (); | 434 | init_menu_items (); |
| 436 | for (i = 0; i < ASIZE (items); i += 4) | 435 | for (i = 0; i < ASIZE (items); i += 4) |
| 437 | { | 436 | { |