(Fbyte_code): Harmonize arguments with documentation.

[gnu-emacs] / src / cm.h

diff --git a/src/cm.h b/src/cm.h
index eef86b93be43fe251a6a18ea4011b54ba2e403ff..44326b9b83bce82e4fceeb85710ec7e94bd5864c 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
-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,
@@ -125,8 +125,8 @@ extern short ospeed;                /* Output speed (from sg_ospeed) */
 #define AutoWrap       Wcm.cm_autowrap
 #define MagicWrap      Wcm.cm_magicwrap
 #define UseTabs                Wcm.cm_usetabs
-#define ScreenRows     Wcm.cm_rows
-#define ScreenCols     Wcm.cm_cols
+#define FrameRows      Wcm.cm_rows
+#define FrameCols      Wcm.cm_cols
 
 #define UpCost         Wcm.cc_up
 #define DownCost       Wcm.cc_down
@@ -149,7 +149,7 @@ extern short ospeed;                /* Output speed (from sg_ospeed) */
 #define cmat(row,col)  (curY = (row), curX = (col))
 #define cmplus(n)                                      \
   {                                                    \
-    if ((curX += (n)) >= ScreenCols && !MagicWrap)     \
+    if ((curX += (n)) >= FrameCols && !MagicWrap)      \
       {                                                        \
        if (Wcm.cm_losewrap) losecursor ();             \
        else if (AutoWrap) curX = 0, curY++;            \
@@ -162,7 +162,8 @@ extern short ospeed;                /* Output speed (from sg_ospeed) */
 extern int cost;
 extern int evalcost ();
 
-extern void cmputc ();
+extern void cmcheckmagic ();
+extern int cmputc ();
 extern int cmcostinit ();
 extern int cmgoto ();
 extern int Wcm_clear ();