Fix bug ref

[gnu-emacs] / src / cm.c

diff --git a/src/cm.c b/src/cm.c
index 6379955b48c3cabb4e9688582dea7863890255dd..eda6430bafa349b7bed2b4b03d0fbc26e3ca6bbe 100644 (file)
--- a/src/cm.c
+++ b/src/cm.c
@@ -1,5 +1,5 @@
 /* Cursor motion subroutines for GNU Emacs.
 /* Cursor motion subroutines for GNU Emacs.

-   Copyright (C) 1985, 1995, 2001-2011  Free Software Foundation, Inc.
+   Copyright (C) 1985, 1995, 2001-2012  Free Software Foundation, Inc.

     based primarily on public domain code written by Chris Torek
 
 This file is part of GNU Emacs.
     based primarily on public domain code written by Chris Torek
 
 This file is part of GNU Emacs.


@@ -20,7 +20,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 #include <stdio.h>
 
 #include <config.h>
 #include <stdio.h>

-#include <setjmp.h>

 
 #include "lisp.h"
 #include "frame.h"
 
 #include "lisp.h"
 #include "frame.h"


@@ -119,7 +118,7 @@ cmcheckmagic (struct tty_display_info *tty)
   if (curX (tty) == FrameCols (tty))
     {
       if (!MagicWrap (tty) || curY (tty) >= FrameRows (tty) - 1)
   if (curX (tty) == FrameCols (tty))
     {
       if (!MagicWrap (tty) || curY (tty) >= FrameRows (tty) - 1)

-       abort ();
+       emacs_abort ();

       if (tty->termscript)
        putc ('\r', tty->termscript);
       putc ('\r', tty->output);
       if (tty->termscript)
        putc ('\r', tty->termscript);
       putc ('\r', tty->output);


@@ -214,8 +213,9 @@ calccost (struct tty_display_info *tty,
     }
     totalcost = c * deltay;
     if (doit)
     }
     totalcost = c * deltay;
     if (doit)

-       while (--deltay >= 0)
+      do

           emacs_tputs (tty, p, 1, cmputc);
           emacs_tputs (tty, p, 1, cmputc);

+      while (0 < --deltay);

 x:
     if ((deltax = dstx - srcx) == 0)
        goto done;
 x:
     if ((deltax = dstx - srcx) == 0)
        goto done;


@@ -296,14 +296,16 @@ fail:
     }
     totalcost += c * deltax;
     if (doit)
     }
     totalcost += c * deltax;
     if (doit)

-       while (--deltax >= 0)
+      do

           emacs_tputs (tty, p, 1, cmputc);
           emacs_tputs (tty, p, 1, cmputc);

+      while (0 < --deltax);

 done:
     return totalcost;
 }
 
 #if 0
 done:
     return totalcost;
 }
 
 #if 0

-losecursor ()
+void
+losecursor (void)

 {
   curY = -1;
 }
 {
   curY = -1;
 }