From a0279731569e5aaaee2f4b97b2774b3df525c4f2 Mon Sep 17 00:00:00 2001
From: Renaud Fivet <renaud.fivet@gmail.com>
Date: Tue, 8 Oct 2013 16:24:11 +0800
Subject: [PATCH] Move macbug, cmdstatus and saveflag to eval.

---
 edef.h    | 3 ---
 eval.c    | 5 +++++
 eval.h    | 2 ++
 globals.c | 3 ---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/edef.h b/edef.h
index 713185f..bf32c69 100644
--- a/edef.h
+++ b/edef.h
@@ -60,9 +60,6 @@ extern int kbdrep;		/* number of repetitions        */
 extern int restflag;		/* restricted use?              */
 extern int lastkey;		/* last keystoke                */
 extern long envram;		/* # of bytes current in use by malloc */
-extern int macbug;		/* macro debuging flag          */
-extern int cmdstatus;		/* last command status          */
-extern int saveflag;		/* Flags, saved with the $target var */
 extern int rval;		/* return value of a subprocess */
 extern int overlap;		/* line overlap in forw/back page */
 extern int scrollcount;		/* number of lines to scroll */
diff --git a/eval.c b/eval.c
index 1e02c05..46a7642 100644
--- a/eval.c
+++ b/eval.c
@@ -38,6 +38,11 @@ char outline[ NSTRING] ;	/* global string to hold debug line text */
 #endif
 
 int gflags = GFREAD ;		/* global control flag */
+int macbug = FALSE ;		/* macro debuging flag          */
+int cmdstatus = TRUE ;		/* last command status          */
+
+static int saveflag = 0 ;	/* Flags, saved with the $target var */
+
 
 /* Max #chars in a var name. */
 #define	NVSIZE	10
diff --git a/eval.h b/eval.h
index 13a72d5..85fe51f 100644
--- a/eval.h
+++ b/eval.h
@@ -16,6 +16,8 @@ extern char outline[] ;		/* Global string to hold debug line text. */
 #define	GFREAD	1
 
 extern int gflags ;		/* global control flag          */
+extern int macbug ;		/* macro debuging flag          */
+extern int cmdstatus ;		/* last command status          */
 
 /*	Macro argument token types					*/
 
diff --git a/globals.c b/globals.c
index 589bef7..afad3bc 100644
--- a/globals.c
+++ b/globals.c
@@ -34,9 +34,6 @@ int kbdrep = 0;			/* number of repetitions        */
 int restflag = FALSE;		/* restricted use?              */
 int lastkey = 0;		/* last keystoke                */
 long envram = 0l;		/* # of bytes current in use by malloc */
-int macbug = FALSE;		/* macro debuging flag          */
-int cmdstatus = TRUE;		/* last command status          */
-int saveflag = 0;		/* Flags, saved with the $target var */
 int rval = 0;			/* return value of a subprocess */
 int overlap = 0;		/* line overlap in forw/back page */
 int scrollcount = 1;		/* number of lines to scroll */