entered into RCS

2 files changed, 4 insertions, 4 deletions

diff --git a/src/cm.h b/src/cm.h
index eef86b93be4..112bbfd020f 100644
--- 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++;            \
diff --git a/src/termopts.h b/src/termopts.h
index 0b4c6234c4c..489b786b248 100644
--- a/src/termopts.h
+++ b/src/termopts.h
@@ -36,5 +36,5 @@ extern int interrupts_deferred;
 /* Terminal has meta key */
 extern int meta_key;
 
-/* Nonzero means truncate lines in all windows less wide than the screen */
+/* Nonzero means truncate lines in all windows less wide than the frame */
 extern int truncate_partial_width_windows;