Merge from trunk

1 files changed, 3 insertions, 3 deletions

diff --git a/src/scroll.c b/src/scroll.c
index 78ebe65bdcc..71ce43b2e48 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -21,7 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
-#include <setjmp.h>
+
 #include "lisp.h"
 #include "termchar.h"
 #include "dispextern.h"
@@ -195,13 +195,13 @@ calculate_scrolling (FRAME_PTR frame,
           {
             cost = p1->writecost + first_insert_cost[i];
             if ((int) p1->insertcount > i)
-              abort ();
+              emacs_abort ();
             cost1 = p1->insertcost + next_insert_cost[i - p1->insertcount];
           }
         p->insertcost = min (cost, cost1) + draw_cost[i] + extra_cost;
         p->insertcount = (cost < cost1) ? 1 : p1->insertcount + 1;
         if ((int) p->insertcount > i)
-          abort ();
+          emacs_abort ();
 
         /* Calculate the cost if we do a delete line after
            outputting this line.