From 870989f9486010fe9b16b83d6577c61dfde2d476 Mon Sep 17 00:00:00 2001
From: Renaud Fivet <renaud.fivet@gmail.com>
Date: Mon, 23 Sep 2013 18:58:31 +0800
Subject: [PATCH] Move struct region from estruct.t to regiom.h.

---
 Makefile  |  4 ++--
 estruct.h | 10 ----------
 region.h  | 12 +++++++++++-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 67df64a..0a84df7 100644
--- a/Makefile
+++ b/Makefile
@@ -178,8 +178,8 @@ posix.o: posix.c termio.h
 random.o: random.c random.h basic.h buffer.h crypt.h line.h utf8.h \
  display.h estruct.h retcode.h edef.h execute.h input.h log.h search.h \
  window.h defines.h
-region.o: region.c region.h estruct.h retcode.h buffer.h crypt.h line.h \
- utf8.h edef.h log.h window.h defines.h
+region.o: region.c region.h line.h utf8.h buffer.h crypt.h estruct.h \
+ retcode.h edef.h log.h window.h defines.h
 search.o: search.c search.h estruct.h retcode.h basic.h buffer.h crypt.h \
  line.h utf8.h display.h edef.h input.h log.h window.h defines.h
 spawn.o: spawn.c spawn.h defines.h buffer.h crypt.h line.h utf8.h \
diff --git a/estruct.h b/estruct.h
index 4b0fb78..ad22d3e 100644
--- a/estruct.h
+++ b/estruct.h
@@ -385,16 +385,6 @@
 int cexit( int status) ;
 #endif
 
-/*
- * The starting position of a region, and the size of the region in
- * characters, is kept in a region structure.  Used by the region commands.
- */
-struct region {
-	struct line *r_linep;	/* Origin struct line address.         */
-	int r_offset;		/* Origin struct line offset.          */
-	long r_size;		/* Length in characters.        */
-};
-
 /*
  * The editor communicates with the display using a high level interface. A
  * "TERM" structure holds useful variables, and indirect pointers to routines
diff --git a/region.h b/region.h
index bd98247..1e46e7f 100644
--- a/region.h
+++ b/region.h
@@ -1,7 +1,17 @@
 #ifndef _REGION_H_
 #define _REGION_H_
 
-#include "estruct.h"
+#include "line.h"
+
+/*
+ * The starting position of a region, and the size of the region in
+ * characters, is kept in a region structure.  Used by the region commands.
+ */
+struct region {
+	struct line *r_linep;	/* Origin struct line address.         */
+	int r_offset;		/* Origin struct line offset.          */
+	long r_size;		/* Length in characters.        */
+};
 
 int killregion( int f, int n) ;
 int copyregion( int f, int n) ;