Update years in copyright notice; nfc.

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

diff --git a/src/cm.h b/src/cm.h
index 44326b9..a2ae611 100644 (file)
--- a/src/cm.h
+++ b/src/cm.h
@@ -1,5 +1,6 @@
 /* Cursor motion calculation definitions for GNU Emacs
-   Copyright (C) 1985, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,7 +16,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
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* Holds the minimum and maximum costs for the parametrized capabilities.  */
 struct parmcap
@@ -99,7 +101,6 @@ struct cm
 
 extern struct cm Wcm;          /* Terminal capabilities */
 extern char PC;                        /* Pad character */
-extern short ospeed;           /* Output speed (from sg_ospeed) */
 
 /* Shorthand */
 #ifndef NoCMShortHand
@@ -164,7 +165,10 @@ extern int evalcost ();
 
 extern void cmcheckmagic ();
 extern int cmputc ();
-extern int cmcostinit ();
-extern int cmgoto ();
-extern int Wcm_clear ();
+extern void cmcostinit ();
+extern void cmgoto ();
+extern void Wcm_clear ();
 extern int Wcm_init ();
+
+/* arch-tag: acc1535a-7136-49d6-b22d-9bc85702251b
+   (do not change this comment) */