From 31b1cc84fbe6361b2bb8ebd24c2f77fbecd9bca6 Mon Sep 17 00:00:00 2001
From: Renaud Fivet <renaud.fivet@gmail.com>
Date: Tue, 8 Oct 2013 15:53:27 +0800
Subject: [PATCH] Move gflags to eval.

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

diff --git a/edef.h b/edef.h
index 093e803..713185f 100644
--- a/edef.h
+++ b/edef.h
@@ -29,7 +29,6 @@ extern int eolexist;		/* does clear to EOL exist?     */
 extern int revexist;		/* does reverse video exist?    */
 extern int flickcode;		/* do flicker supression?       */
 extern int gmode;		/* global editor mode           */
-extern int gflags;		/* global control flag          */
 extern int gfcolor;		/* global forgrnd color (white) */
 extern int gbcolor;		/* global backgrnd color (black) */
 extern int gasave;		/* global ASAVE size            */
diff --git a/estruct.h b/estruct.h
index d756b32..dccfcd2 100644
--- a/estruct.h
+++ b/estruct.h
@@ -224,10 +224,6 @@
 #define	ENVFUNC	0
 #endif
 
-/* Emacs global flag bit definitions (for gflags). */
-
-#define	GFREAD	1
-
 /* Internal constants. */
 
 #define	NBINDS	256		/* max # of bound keys          */
diff --git a/eval.c b/eval.c
index f11220d..1e02c05 100644
--- a/eval.c
+++ b/eval.c
@@ -37,6 +37,8 @@
 char outline[ NSTRING] ;	/* global string to hold debug line text */
 #endif
 
+int gflags = GFREAD ;		/* global control flag */
+
 /* Max #chars in a var name. */
 #define	NVSIZE	10
 
diff --git a/eval.h b/eval.h
index 378c72a..13a72d5 100644
--- a/eval.h
+++ b/eval.h
@@ -11,6 +11,12 @@ extern char outline[] ;		/* Global string to hold debug line text. */
 #endif
 
 
+/* Emacs global flag bit definitions (for gflags). */
+
+#define	GFREAD	1
+
+extern int gflags ;		/* global control flag          */
+
 /*	Macro argument token types					*/
 
 #define	TKNUL	0		/* end-of-string                */
diff --git a/globals.c b/globals.c
index 627d58b..589bef7 100644
--- a/globals.c
+++ b/globals.c
@@ -14,7 +14,6 @@ int eolexist = TRUE;		/* does clear to EOL exist      */
 int revexist = FALSE;		/* does reverse video exist?    */
 int flickcode = FALSE;		/* do flicker supression?       */
 int gmode = 0;			/* global editor mode           */
-int gflags = GFREAD;		/* global control flag          */
 int gasave = 256;		/* global ASAVE size            */
 int gacount = 256;		/* count until next ASAVE       */
 int sgarbf = TRUE;		/* TRUE if screen is garbage    */