From 2a34d732c56ae0c71c5d4cf40554452f92c4ea94 Mon Sep 17 00:00:00 2001
From: Renaud Fivet <renaud.fivet@gmail.com>
Date: Sun, 29 Sep 2013 13:26:48 +0800
Subject: [PATCH] Move global variables to module scope, public of search and
 private of word.

---
 edef.h    | 6 ------
 globals.c | 6 ------
 search.c  | 4 ++++
 search.h  | 4 ++++
 word.c    | 4 ++++
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/edef.h b/edef.h
index f8a1ac4..792f61e 100644
--- a/edef.h
+++ b/edef.h
@@ -22,9 +22,6 @@ typedef int (*fn_t)(int, int);
 /* Initialized global external declarations. */
 
 extern int fillcol;		/* Fill column                  */
-extern char pat[];		/* Search pattern               */
-extern char rpat[];		/* Replacement pattern          */
-extern char tap[];	    /* Reversed pattern array.      */
 extern char *execstr;	/* pointer to string to execute */
 
 
@@ -84,9 +81,6 @@ extern int cmdstatus;		/* last command status          */
 extern char palstr[];		/* palette string               */
 extern int saveflag;		/* Flags, saved with the $target var */
 extern int rval;		/* return value of a subprocess */
-#if	PKCODE
-extern int justflag;		/* justify, don't fill */
-#endif
 extern int overlap;		/* line overlap in forw/back page */
 extern int scrollcount;		/* number of lines to scroll */
 
diff --git a/globals.c b/globals.c
index fe94fe3..76e67fa 100644
--- a/globals.c
+++ b/globals.c
@@ -82,9 +82,6 @@ int cmdstatus = TRUE;		/* last command status          */
 char palstr[49] = "";		/* palette string               */
 int saveflag = 0;		/* Flags, saved with the $target var */
 int rval = 0;			/* return value of a subprocess */
-#if	PKCODE
-int justflag = FALSE;		/* justify, don't fill */
-#endif
 int overlap = 0;		/* line overlap in forw/back page */
 int scrollcount = 1;		/* number of lines to scroll */
 
@@ -102,9 +99,6 @@ struct buffer *bheadp;			/* Head of list of buffers      */
 struct buffer *blistp;			/* Buffer for C-X C-B           */
 
 char sres[NBUFN];		/* current screen resolution    */
-char pat[NPAT];			/* Search pattern               */
-char tap[NPAT];			/* Reversed pattern array.      */
-char rpat[NPAT];		/* replacement pattern          */
 
 
 #if	DEBUGM
diff --git a/search.c b/search.c
index 0deccae..897519a 100644
--- a/search.c
+++ b/search.c
@@ -85,6 +85,10 @@ char *patmatch = NULL ;
 static struct line *matchline = NULL;
 static int matchoff = 0;
 
+char pat[ NPAT] ;	/* Search pattern               */
+char tap[ NPAT] ;	/* Reversed pattern array.      */
+char rpat[ NPAT] ;	/* replacement pattern          */
+
 
 #if defined(MAGIC)
 /*
diff --git a/search.h b/search.h
index 1bf2d1e..b354b50 100644
--- a/search.h
+++ b/search.h
@@ -8,6 +8,10 @@
 extern unsigned int matchlen ;
 extern char *patmatch ;
 
+extern char pat[] ;		/* Search pattern               */
+extern char tap[] ;		/* Reversed pattern array.      */
+extern char rpat[] ;		/* replacement pattern          */
+
 /*
  * PTBEG, PTEND, FORWARD, and REVERSE are all toggle-able values for
  * the scan routines.
diff --git a/word.c b/word.c
index 72edea4..3a3b0e8 100644
--- a/word.c
+++ b/word.c
@@ -22,6 +22,10 @@
 #include "region.h"
 #include "window.h"
 
+#if	PKCODE
+static int justflag = FALSE ;		/* justify, don't fill */
+#endif
+
 static int inword( void) ;
 
 /* Word wrap on n-spaces. Back-over whatever precedes the point on the current