diff options
| author | Eli Zaretskii | 2007-10-13 12:11:14 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2007-10-13 12:11:14 +0000 |
| commit | 71d00ce4ae4b180c784879beaff9bafd81c29989 (patch) | |
| tree | cca3282c3498c059918f2b64ea4bcbe437a75692 /src | |
| parent | 6bf377e264d675fa1bc509b58c8f6a22f75b61d1 (diff) | |
| download | emacs-71d00ce4ae4b180c784879beaff9bafd81c29989.tar.gz emacs-71d00ce4ae4b180c784879beaff9bafd81c29989.zip | |
(grow_menu_items): Use larger_vector.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 11 | ||||
| -rw-r--r-- | src/macmenu.c | 9 | ||||
| -rw-r--r-- | src/w32menu.c | 8 | ||||
| -rw-r--r-- | src/xmenu.c | 9 |
4 files changed, 14 insertions, 23 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 528e793bf11..16b55e97a6d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,14 @@ | |||
| 1 | 2007-10-05 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * buffer.c (add_overlay_mod_hooklist): | ||
| 4 | * ccl.c (Fregister_ccl_program, Fregister_code_conversion_map): | ||
| 5 | * fontset.c (make_fontset): | ||
| 6 | * keyboard.c (GROW_RAW_KEYBUF, menu_bar_items, menu_bar_item) | ||
| 7 | (append_tool_bar_item): | ||
| 8 | * macmenu.c (grow_menu_items): | ||
| 9 | * w32menu.c (grow_menu_items): | ||
| 10 | * xmenu.c (grow_menu_items): Use larger_vector. | ||
| 11 | |||
| 1 | 2007-10-13 Eli Zaretskii <eliz@gnu.org> | 12 | 2007-10-13 Eli Zaretskii <eliz@gnu.org> |
| 2 | 13 | ||
| 3 | * msdos.c (dos_rawgetc): Undo last change (there's no ``leaving | 14 | * msdos.c (dos_rawgetc): Undo last change (there's no ``leaving |
diff --git a/src/macmenu.c b/src/macmenu.c index 8305c89ee68..aa0be0bdc2e 100644 --- a/src/macmenu.c +++ b/src/macmenu.c | |||
| @@ -347,15 +347,8 @@ save_menu_items () | |||
| 347 | static void | 347 | static void |
| 348 | grow_menu_items () | 348 | grow_menu_items () |
| 349 | { | 349 | { |
| 350 | Lisp_Object old; | ||
| 351 | int old_size = menu_items_allocated; | ||
| 352 | old = menu_items; | ||
| 353 | |||
| 354 | menu_items_allocated *= 2; | 350 | menu_items_allocated *= 2; |
| 355 | 351 | menu_items = larger_vector (menu_items, menu_items_allocated, Qnil); | |
| 356 | menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil); | ||
| 357 | bcopy (XVECTOR (old)->contents, XVECTOR (menu_items)->contents, | ||
| 358 | old_size * sizeof (Lisp_Object)); | ||
| 359 | } | 352 | } |
| 360 | 353 | ||
| 361 | /* Begin a submenu. */ | 354 | /* Begin a submenu. */ |
diff --git a/src/w32menu.c b/src/w32menu.c index e5638cc4bfd..a94be08902d 100644 --- a/src/w32menu.c +++ b/src/w32menu.c | |||
| @@ -318,14 +318,8 @@ discard_menu_items () | |||
| 318 | static void | 318 | static void |
| 319 | grow_menu_items () | 319 | grow_menu_items () |
| 320 | { | 320 | { |
| 321 | Lisp_Object old; | ||
| 322 | int old_size = menu_items_allocated; | ||
| 323 | old = menu_items; | ||
| 324 | |||
| 325 | menu_items_allocated *= 2; | 321 | menu_items_allocated *= 2; |
| 326 | menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil); | 322 | menu_items = larger_vector (menu_items, menu_items_allocated, Qnil); |
| 327 | bcopy (XVECTOR (old)->contents, XVECTOR (menu_items)->contents, | ||
| 328 | old_size * sizeof (Lisp_Object)); | ||
| 329 | } | 323 | } |
| 330 | 324 | ||
| 331 | /* Begin a submenu. */ | 325 | /* Begin a submenu. */ |
diff --git a/src/xmenu.c b/src/xmenu.c index 76b316d026f..14c72397110 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -354,15 +354,8 @@ save_menu_items () | |||
| 354 | static void | 354 | static void |
| 355 | grow_menu_items () | 355 | grow_menu_items () |
| 356 | { | 356 | { |
| 357 | Lisp_Object old; | ||
| 358 | int old_size = menu_items_allocated; | ||
| 359 | old = menu_items; | ||
| 360 | |||
| 361 | menu_items_allocated *= 2; | 357 | menu_items_allocated *= 2; |
| 362 | 358 | menu_items = larger_vector (menu_items, menu_items_allocated, Qnil); | |
| 363 | menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil); | ||
| 364 | bcopy (XVECTOR (old)->contents, XVECTOR (menu_items)->contents, | ||
| 365 | old_size * sizeof (Lisp_Object)); | ||
| 366 | } | 359 | } |
| 367 | 360 | ||
| 368 | /* Begin a submenu. */ | 361 | /* Begin a submenu. */ |