* cua-base.el, cua-gmrk.el: Fix use of `filter-buffer-substring'.

[gnu-emacs] / src / cm.c

diff --git a/src/cm.c b/src/cm.c
index 0a257ec22a97a33342c8390cda789908bc099827..73d3791074ed0579ded65f42044ccc9bb1a5101b 100644 (file)
--- a/src/cm.c
+++ b/src/cm.c
@@ -1,6 +1,6 @@
 /* Cursor motion subroutines for GNU Emacs.
    Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
     based primarily on public domain code written by Chris Torek
 
 This file is part of GNU Emacs.
@@ -21,6 +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 "frame.h"
@@ -32,13 +33,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.  */
-
-#if defined HAVE_TERMCAP_H && 0
-#include <termcap.h>
-#else
 extern void tputs P_ ((const char *, int, int (*)(int)));
 extern char *tgoto P_ ((const char *, int, int));
-#endif
 
 #define        BIG     9999            /* 9999 good on VAXen.  For 16 bit machines
                                   use about 2000.... */