* xfns.c (Fx_open_connection): Don't trust HAVE_XRMSETDATABASE;

[gnu-emacs] / src / cm.h

diff --git a/src/cm.h b/src/cm.h
index eef86b93be43fe251a6a18ea4011b54ba2e403ff..112bbfd020f0ab9f4d6a220be101dcd33d8e3c04 100644 (file)
--- a/src/cm.h
+++ b/src/cm.h
@@ -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++;            \