(xic_create_fontsetname): If ADSTYLE field is not a wild

[gnu-emacs] / src / cm.h

diff --git a/src/cm.h b/src/cm.h
index 4567c4474a9fa68d826294e4d9539258fc50503f..c94c0d43597c1ead9235f3337b6804c9f3588c2f 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, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,8 +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, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, 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
@@ -101,15 +102,6 @@ struct cm
 extern struct cm Wcm;          /* Terminal capabilities */
 extern char PC;                        /* Pad character */
 
-#if defined (HAVE_TERMIOS_H) && defined (LINUX)
-#include <termios.h>
-/* HJL's version of libc is said to need this on the Alpha.
-   On the other hand, DEC OSF1 on the Alpha needs ospeed to be a short.  */
-extern speed_t ospeed;
-#else
-extern short ospeed;           /* Output speed (from sg_ospeed) */
-#endif
-
 /* Shorthand */
 #ifndef NoCMShortHand
 #define curY           Wcm.cm_curY
@@ -173,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) */