X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/94cc397c541f50af6b049af6c42806daa2be2709..36941b32f3a3cd332b3adaf0cc8178177c2e9166:/src/cm.c
diff --git a/src/cm.c b/src/cm.c
index 0476638e7c..d4aedad6db 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -1,14 +1,13 @@
/* Cursor motion subroutines for GNU Emacs.
- Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008 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.
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,13 +15,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see . */
#include
#include
+#include
#include "lisp.h"
#include "frame.h"
@@ -34,13 +32,8 @@ Boston, MA 02110-1301, USA. */
/* 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. */
-
-#if defined HAVE_TERMCAP_H && 0
-#include
-#else
-extern void tputs P_ ((const char *, int, int (*)(int)));
-extern char *tgoto P_ ((const char *, int, int));
-#endif
+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.... */
@@ -51,8 +44,7 @@ int cost; /* sums up costs */
/* ARGSUSED */
int
-evalcost (c)
- char c;
+evalcost (int c)
{
cost++;
return c;
@@ -62,8 +54,7 @@ evalcost (c)
struct tty_display_info *current_tty;
int
-cmputc (c)
- char c;
+cmputc (int c)
{
if (current_tty->termscript)
putc (c & 0177, current_tty->termscript);
@@ -332,9 +323,7 @@ losecursor ()
#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,
@@ -440,7 +429,7 @@ cmgoto (tty, row, col)
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;
}
@@ -472,5 +461,3 @@ Wcm_init (struct tty_display_info *tty)
return 0;
}
-/* arch-tag: bcf64c02-00f6-44ef-94b6-c56eab5b3dc4
- (do not change this comment) */