diff --git a/Makefile b/Makefile index 25c9dbb..9ec8584 100644 --- a/Makefile +++ b/Makefile @@ -146,13 +146,14 @@ ebind.o: ebind.c ebind.h basic.h bind.h edef.h buffer.h crypt.h line.h \ utf8.h estruct.h retcode.h bindable.h eval.h exec.h file.h isearch.h \ random.h region.h search.h spawn.h window.h defines.h word.h eval.o: eval.c eval.h basic.h bind.h edef.h buffer.h crypt.h line.h \ - utf8.h estruct.h retcode.h display.h exec.h flook.h input.h random.h \ - search.h terminal.h defines.h termio.h version.h window.h + utf8.h estruct.h retcode.h display.h exec.h execute.h flook.h input.h \ + random.h search.h terminal.h defines.h termio.h version.h window.h exec.o: exec.c exec.h buffer.h crypt.h line.h utf8.h bind.h edef.h \ estruct.h retcode.h display.h eval.h file.h flook.h input.h window.h \ defines.h -execute.o: execute.c edef.h buffer.h crypt.h line.h utf8.h estruct.h \ - retcode.h bind.h random.h display.h file.h terminal.h defines.h window.h +execute.o: execute.c execute.h edef.h buffer.h crypt.h line.h utf8.h \ + estruct.h retcode.h bind.h random.h display.h file.h terminal.h \ + defines.h window.h file.o: file.c file.h crypt.h retcode.h buffer.h line.h utf8.h defines.h \ estruct.h edef.h execute.h fileio.h input.h lock.h log.h window.h fileio.o: fileio.c fileio.h crypt.h retcode.h defines.h diff --git a/edef.h b/edef.h index bf32c69..10cc895 100644 --- a/edef.h +++ b/edef.h @@ -31,8 +31,6 @@ extern int flickcode; /* do flicker supression? */ extern int gmode; /* global editor mode */ extern int gfcolor; /* global forgrnd color (white) */ extern int gbcolor; /* global backgrnd color (black) */ -extern int gasave; /* global ASAVE size */ -extern int gacount; /* count until next ASAVE */ extern int sgarbf; /* State of screen unknown */ extern int clexec; /* command line execution flag */ extern int discmd; /* display command flag */ diff --git a/eval.c b/eval.c index 46a7642..fcb2d2e 100644 --- a/eval.c +++ b/eval.c @@ -18,6 +18,7 @@ #include "estruct.h" #include "edef.h" #include "exec.h" +#include "execute.h" #include "flook.h" #include "input.h" #include "line.h" diff --git a/execute.c b/execute.c index 0afd8a3..708a723 100644 --- a/execute.c +++ b/execute.c @@ -1,3 +1,6 @@ +/* execute.c -- implements execute.h */ +#include "execute.h" + #include "edef.h" #include "bind.h" #include "random.h" @@ -6,6 +9,9 @@ #include "terminal.h" #include "window.h" +int gasave = 256 ; /* global ASAVE size */ +int gacount = 256 ; /* count until next ASAVE */ + /* * This is the general command execution routine. It handles the fake binding * of all the keys to "self-insert". It also clears out the "thisflag" word, diff --git a/execute.h b/execute.h index 4cb6224..a172652 100644 --- a/execute.h +++ b/execute.h @@ -1,2 +1,5 @@ +extern int gasave ; /* global ASAVE size */ +extern int gacount ; /* count until next ASAVE */ + int execute( int c, int f, int n) ; diff --git a/globals.c b/globals.c index afad3bc..c54cdb6 100644 --- a/globals.c +++ b/globals.c @@ -14,8 +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 gasave = 256; /* global ASAVE size */ -int gacount = 256; /* count until next ASAVE */ int sgarbf = TRUE; /* TRUE if screen is garbage */ int clexec = FALSE; /* command line execution flag */ int discmd = TRUE; /* display command flag */