* xterm.c (x_connection_closed): Remove all calls that calls XSync.

[bpt/emacs.git] / src / cm.c

diff --git a/src/cm.c b/src/cm.c
index 73d3791..d4aedad 100644 (file)
--- a/src/cm.c
+++ b/src/cm.c
@@ -1,6 +1,5 @@
 /* Cursor motion subroutines for GNU Emacs.
 /* Cursor motion subroutines for GNU Emacs.

-   Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1985, 1995, 2001-2011  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.


@@ -33,8 +32,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* For now, don't try to include termcap.h.  On some systems,
    configure finds a non-standard termcap.h that the main build
    won't find.  */
 /* For now, don't try to include termcap.h.  On some systems,
    configure finds a non-standard termcap.h that the main build
    won't find.  */

-extern void tputs P_ ((const char *, int, int (*)(int)));
-extern char *tgoto P_ ((const char *, int, int));
+extern void tputs (const char *, int, int (*)(int));
+extern char *tgoto (const char *, int, int);

 
 #define        BIG     9999            /* 9999 good on VAXen.  For 16 bit machines
                                   use about 2000.... */
 
 #define        BIG     9999            /* 9999 good on VAXen.  For 16 bit machines
                                   use about 2000.... */


@@ -45,8 +44,7 @@ int cost;             /* sums up costs */
 
 /* ARGSUSED */
 int
 
 /* ARGSUSED */
 int

-evalcost (c)
-     char c;
+evalcost (int c)

 {
   cost++;
   return c;
 {
   cost++;
   return c;


@@ -56,8 +54,7 @@ evalcost (c)
 struct tty_display_info *current_tty;
 
 int
 struct tty_display_info *current_tty;
 
 int

-cmputc (c)
-     char c;
+cmputc (int c)

 {
   if (current_tty->termscript)
     putc (c & 0177, current_tty->termscript);
 {
   if (current_tty->termscript)
     putc (c & 0177, current_tty->termscript);


@@ -326,9 +323,7 @@ losecursor ()
 #define        USECR   3
 
 void
 #define        USECR   3
 
 void

-cmgoto (tty, row, col)
-     struct tty_display_info *tty;
-     int row, col;
+cmgoto (struct tty_display_info *tty, int row, int col)

 {
     int     homecost,
             crcost,
 {
     int     homecost,
             crcost,


@@ -434,7 +429,7 @@ cmgoto (tty, row, col)
 void
 Wcm_clear (struct tty_display_info *tty)
 {
 void
 Wcm_clear (struct tty_display_info *tty)
 {

-  bzero (tty->Wcm, sizeof (struct cm));
+  memset (tty->Wcm, 0, sizeof (struct cm));

   UP = 0;
   BC = 0;
 }
   UP = 0;
   BC = 0;
 }


@@ -466,5 +461,3 @@ Wcm_init (struct tty_display_info *tty)
   return 0;
 }
 
   return 0;
 }
 

-/* arch-tag: bcf64c02-00f6-44ef-94b6-c56eab5b3dc4
-   (do not change this comment) */