(grow_menu_items): Use larger_vector.

diff --git a/src/ChangeLog b/src/ChangeLog
index 528e793bf11bd3e8d9046eff849792607e90f092..16b55e97a6d58f763da89f93fbb7ad1c1cac2458 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2007-10-05  Dmitry Antipov <dmantipov@yandex.ru>
+
+       * buffer.c (add_overlay_mod_hooklist):
+       * ccl.c (Fregister_ccl_program, Fregister_code_conversion_map):
+       * fontset.c (make_fontset):
+       * keyboard.c (GROW_RAW_KEYBUF, menu_bar_items, menu_bar_item)
+       (append_tool_bar_item):
+       * macmenu.c (grow_menu_items):
+       * w32menu.c (grow_menu_items):  
+       * xmenu.c (grow_menu_items): Use larger_vector.
+       
 2007-10-13  Eli Zaretskii  <eliz@gnu.org>
 
        * msdos.c (dos_rawgetc): Undo last change (there's no ``leaving

diff --git a/src/macmenu.c b/src/macmenu.c
index 8305c89ee68fbcfa1ba27fd0a00f17833068a031..aa0be0bdc2e956014c245f7c98ff8425d4851f8b 100644 (file)
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -347,15 +347,8 @@ save_menu_items ()
 static void
 grow_menu_items ()
 {
-  Lisp_Object old;
-  int old_size = menu_items_allocated;
-  old = menu_items;
-
   menu_items_allocated *= 2;
-
-  menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil);
-  bcopy (XVECTOR (old)->contents, XVECTOR (menu_items)->contents,
-        old_size * sizeof (Lisp_Object));
+  menu_items = larger_vector (menu_items, menu_items_allocated, Qnil);
 }
 
 /* Begin a submenu.  */

diff --git a/src/w32menu.c b/src/w32menu.c
index e5638cc4bfd0e23dad768dbdafc4fa550e536dd1..a94be08902d5cc3cae4a6d39de788903846017fc 100644 (file)
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -318,14 +318,8 @@ discard_menu_items ()
 static void
 grow_menu_items ()
 {
-  Lisp_Object old;
-  int old_size = menu_items_allocated;
-  old = menu_items;
-
   menu_items_allocated *= 2;
-  menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil);
-  bcopy (XVECTOR (old)->contents, XVECTOR (menu_items)->contents,
-        old_size * sizeof (Lisp_Object));
+  menu_items = larger_vector (menu_items, menu_items_allocated, Qnil);
 }
 
 /* Begin a submenu.  */

diff --git a/src/xmenu.c b/src/xmenu.c
index 76b316d026ff0a6c45f18578cbf1ab2089a7fc4e..14c723971108450a6726dac140c774c86f0fdcba 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -354,15 +354,8 @@ save_menu_items ()
 static void
 grow_menu_items ()
 {
-  Lisp_Object old;
-  int old_size = menu_items_allocated;
-  old = menu_items;
-
   menu_items_allocated *= 2;
-
-  menu_items = Fmake_vector (make_number (menu_items_allocated), Qnil);
-  bcopy (XVECTOR (old)->contents, XVECTOR (menu_items)->contents,
-        old_size * sizeof (Lisp_Object));
+  menu_items = larger_vector (menu_items, menu_items_allocated, Qnil);
 }
 
 /* Begin a submenu.  */