* scroll.c (scroll_cost): Remove; unused.

* dispextern.h (scroll_cost): Remove decl.

diff --git a/src/ChangeLog b/src/ChangeLog
index 404b00afc238ca62c4497ab9905d18b0149c546b..0c811188e076d8f3b1d0b17ac3e81d67eb7b02cd 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-14  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * scroll.c (scroll_cost): Remove; unused.
+       * dispextern.h (scroll_cost): Remove decl.
+
        * region-cache.h (pp_cache): Mark as externally visible.
 
        * process.c: Make symbols static if they're not exported.

diff --git a/src/dispextern.h b/src/dispextern.h
index 438db97c6a58db4de6667d1696577c023a08bc02..a94e0620eae5f5f858dfb08b978f3b692b2ad304 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3303,7 +3303,6 @@ extern struct terminal *init_tty (const char *, const char *, int);
 /* Defined in scroll.c */
 
 extern int scrolling_max_lines_saved (int, int, int *, int *, int *);
-extern int scroll_cost (struct frame *, int, int, int);
 extern void do_line_insertion_deletion_costs (struct frame *, const char *,
                                               const char *, const char *,
                                              const char *, const char *,

diff --git a/src/scroll.c b/src/scroll.c
index fcec596daa3834f62bff4c1c516b4f9b01fd6481..ba012874460c756e2a7e3b40feb2c0331298652e 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -882,44 +882,6 @@ scrolling_max_lines_saved (int start, int end,
   return matchcount;
 }
 \f
-/* Return a measure of the cost of moving the lines starting with vpos
-   FROM, up to but not including vpos TO, down by AMOUNT lines (AMOUNT
-   may be negative).  */
-
-int
-scroll_cost (FRAME_PTR frame, int from, int to, int amount)
-{
-  /* Compute how many lines, at bottom of frame,
-     will not be involved in actual motion.  */
-  EMACS_INT limit = to;
-  EMACS_INT offset;
-  EMACS_INT height = FRAME_LINES (frame);
-
-  if (amount == 0)
-    return 0;
-
-  if (! FRAME_SCROLL_REGION_OK (frame))
-    limit = height;
-  else if (amount > 0)
-    limit += amount;
-
-  if (amount < 0)
-    {
-      int temp = to;
-      to = from + amount;
-      from = temp + amount;
-      amount = - amount;
-    }
-
-  offset = height - limit;
-
-  return
-    (FRAME_INSERT_COST (frame)[offset + from]
-     + (amount - 1) * FRAME_INSERTN_COST (frame)[offset + from]
-     + FRAME_DELETE_COST (frame)[offset + to]
-     + (amount - 1) * FRAME_DELETEN_COST (frame)[offset + to]);
-}
-\f
 /* Calculate the line insertion/deletion
    overhead and multiply factor values */