diff options
| author | Joakim Verona | 2013-03-26 16:20:17 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 16:20:17 +0100 |
| commit | 6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8 (patch) | |
| tree | 4a58903b4c3d010e90fc37fe10ea4d9895876d01 /src/menu.c | |
| parent | 62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb (diff) | |
| parent | 48c226c2c2592e31a47559bd1689fcc4354d9479 (diff) | |
| download | emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.tar.gz emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.zip | |
conflict resolve
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 fdef54dd657..ffb5c3bc936 100644 --- a/src/menu.c +++ b/src/menu.c | |||
| @@ -173,7 +173,7 @@ static void | |||
| 173 | ensure_menu_items (int items) | 173 | ensure_menu_items (int items) |
| 174 | { | 174 | { |
| 175 | int incr = items - (menu_items_allocated - menu_items_used); | 175 | int incr = items - (menu_items_allocated - menu_items_used); |
| 176 | if (0 < incr) | 176 | if (incr > 0) |
| 177 | { | 177 | { |
| 178 | menu_items = larger_vector (menu_items, incr, INT_MAX); | 178 | menu_items = larger_vector (menu_items, incr, INT_MAX); |
| 179 | menu_items_allocated = ASIZE (menu_items); | 179 | menu_items_allocated = ASIZE (menu_items); |