Move globals rval and tabmask to eval and line.

estruct.h

@@ -249,7 +249,6 @@
 
 /*	Internal defined functions					*/
 
-#define	nextab(a)	(a & ~tabmask) + (tabmask+1)
 #ifdef	abs
 #undef	abs
 #endif

eval.c

@@ -44,6 +44,8 @@ int gflags = GFREAD ;		/* global control flag */
 int macbug = FALSE ;		/* macro debuging flag          */
 int cmdstatus = TRUE ;		/* last command status          */
 int flickcode = FALSE ;		/* do flicker supression?       */
+int rval = 0 ;			/* return value of a subprocess */
+
 
 static int saveflag = 0 ;	/* Flags, saved with the $target var */
 

eval.h

@@ -19,6 +19,7 @@ extern int gflags ;		/* global control flag          */
 extern int macbug ;		/* macro debuging flag          */
 extern int cmdstatus ;		/* last command status          */
 extern int flickcode ;		/* do flicker supression?       */
+extern int rval ;		/* return value of a subprocess */
 extern long envram ;		/* # of bytes current in use by malloc */
 
 /*	Macro argument token types					*/

globals.c

@@ -10,11 +10,6 @@ int ctlxc = CONTROL | 'X';	/* current control X prefix char */
 int reptc = CONTROL | 'U';	/* current universal repeat char */
 int abortc = CONTROL | 'G';	/* current abort command char   */
 
-int tabmask = 0x07;		/* tabulator mask */
-
-
-int rval = 0;			/* return value of a subprocess */
-
 /* uninitialized global definitions */
 
 int thisflag;			/* Flags, this command          */

globals.h

@@ -10,11 +10,6 @@ extern int ctlxc;		/* current control X prefix char */
 extern int reptc;		/* current universal repeat char */
 extern int abortc;		/* current abort command char   */
 
-extern int tabmask;
-
-
-extern int rval;		/* return value of a subprocess */
-
 /* Uninitialized global external declarations. */
 
 #define CFCPCN  0x0001		/* Last command was C-P, C-N    */

line.c

@@ -26,6 +26,9 @@
 #include "log.h"
 #include "window.h"
 
+
+int tabmask = 0x07 ;		/* tabulator mask */
+
 #define	BLOCK_SIZE 16 /* Line block chunk size. */
 
 static int ldelnewline( void) ;

line.h

@@ -25,6 +25,9 @@ struct line {
 #define lputc(lp, n, c) ((lp)->l_text[(n)]=(c))
 #define llength(lp)     ((lp)->l_used)
 
+#define	nextab(a)	(a & ~tabmask) + (tabmask+1)
+extern int tabmask ;
+
 char *getkill( void) ;
 
 int backchar( int f, int n) ;