(set_properties, add_properties, remove_properties):

[gnu-emacs] / src / cm.h

diff --git a/src/cm.h b/src/cm.h
index 7f61912afa1f19d78de5e4979def63858cc9f6c2..336a3308fd8677744b3bc8aee4c273cbd2baab57 100644 (file)
--- a/src/cm.h
+++ b/src/cm.h
@@ -5,7 +5,7 @@ This file is part of GNU Emacs.
 
 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
 
 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 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -15,7 +15,8 @@ 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
 
 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */

 
 /* Holds the minimum and maximum costs for the parametrized capabilities.  */
 struct parmcap
 
 /* Holds the minimum and maximum costs for the parametrized capabilities.  */
 struct parmcap


@@ -99,7 +100,13 @@ struct cm
 
 extern struct cm Wcm;          /* Terminal capabilities */
 extern char PC;                        /* Pad character */
 
 extern struct cm Wcm;          /* Terminal capabilities */
 extern char PC;                        /* Pad character */

+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+/* HJL's version of libc is said to need this on the Alpha.  */
+speed_t ospeed;
+#else

 extern short ospeed;           /* Output speed (from sg_ospeed) */
 extern short ospeed;           /* Output speed (from sg_ospeed) */

+#endif

 
 /* Shorthand */
 #ifndef NoCMShortHand
 
 /* Shorthand */
 #ifndef NoCMShortHand


@@ -162,6 +169,7 @@ extern short ospeed;                /* Output speed (from sg_ospeed) */
 extern int cost;
 extern int evalcost ();
 
 extern int cost;
 extern int evalcost ();
 

+extern void cmcheckmagic ();

 extern int cmputc ();
 extern int cmcostinit ();
 extern int cmgoto ();
 extern int cmputc ();
 extern int cmcostinit ();
 extern int cmgoto ();