Merge from trunkpending

1 files changed, 9 insertions, 27 deletions

diff --git a/src/scroll.c b/src/scroll.c
index 6291936a541..77ea1007ade 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,6 +1,6 @@
 /* Calculate what line insertion or deletion to do, and do it
 
-Copyright (C) 1985-1986, 1990, 1993-1994, 2001-2011
+Copyright (C) 1985-1986, 1990, 1993-1994, 2001-2012
   Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -969,32 +969,14 @@ do_line_insertion_deletion_costs (FRAME_PTR frame,
                                   const char *cleanup_string,
                                   int coefficient)
 {
-  if (FRAME_INSERT_COST (frame) != 0)
-    {
-      FRAME_INSERT_COST (frame) =
-        (int *) xrealloc (FRAME_INSERT_COST (frame),
-                          FRAME_LINES (frame) * sizeof (int));
-      FRAME_DELETEN_COST (frame) =
-        (int *) xrealloc (FRAME_DELETEN_COST (frame),
-                          FRAME_LINES (frame) * sizeof (int));
-      FRAME_INSERTN_COST (frame) =
-        (int *) xrealloc (FRAME_INSERTN_COST (frame),
-                          FRAME_LINES (frame) * sizeof (int));
-      FRAME_DELETE_COST (frame) =
-        (int *) xrealloc (FRAME_DELETE_COST (frame),
-                          FRAME_LINES (frame) * sizeof (int));
-    }
-  else
-    {
-      FRAME_INSERT_COST (frame) =
-        (int *) xmalloc (FRAME_LINES (frame) * sizeof (int));
-      FRAME_DELETEN_COST (frame) =
-        (int *) xmalloc (FRAME_LINES (frame) * sizeof (int));
-      FRAME_INSERTN_COST (frame) =
-        (int *) xmalloc (FRAME_LINES (frame) * sizeof (int));
-      FRAME_DELETE_COST (frame) =
-        (int *) xmalloc (FRAME_LINES (frame) * sizeof (int));
-    }
+  FRAME_INSERT_COST (frame) =
+    xnrealloc (FRAME_INSERT_COST (frame), FRAME_LINES (frame), sizeof (int));
+  FRAME_DELETEN_COST (frame) =
+    xnrealloc (FRAME_DELETEN_COST (frame), FRAME_LINES (frame), sizeof (int));
+  FRAME_INSERTN_COST (frame) =
+    xnrealloc (FRAME_INSERTN_COST (frame), FRAME_LINES (frame), sizeof (int));
+  FRAME_DELETE_COST (frame) =
+    xnrealloc (FRAME_DELETE_COST (frame), FRAME_LINES (frame), sizeof (int));
 
   ins_del_costs (frame,
                  ins_line_string, multi_ins_string,