From a96f1b5f854ac6ee5178d37b355a11065c444e19 Mon Sep 17 00:00:00 2001
From: Renaud Fivet <renaud.fivet@gmail.com>
Date: Mon, 3 Jun 2013 16:29:33 +0800
Subject: [PATCH] Move rdonly and reterr from main to display to avoid
 dependencies to main.

---
 Makefile  | 59 ++++++++++++++++++++++++++-----------------------------
 display.c | 19 ++++++++++++++++++
 display.h |  3 +++
 line.c    |  1 -
 main.c    | 18 -----------------
 main.h    |  2 --
 region.c  |  1 -
 search.c  |  1 -
 spawn.c   |  1 -
 word.c    |  1 -
 10 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/Makefile b/Makefile
index 2b072b1..f175715 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# makefile for emacs, updated Sat Jun  1 12:46:04 CST 2013
+# makefile for emacs, updated Mon, Jun 03, 2013 12:05:22 PM
 
 SRC=ansi.c basic.c bind.c buffer.c crypt.c display.c ebind.c eval.c exec.c file.c fileio.c globals.c ibmpc.c input.c isearch.c line.c lock.c main.c names.c pklock.c posix.c random.c region.c search.c spawn.c tcap.c termio.c utf8.c vmsvt.c vt52.c window.c word.c wrapper.c
 OBJ=ansi.o basic.o bind.o buffer.o crypt.o display.o ebind.o eval.o exec.o file.o fileio.o globals.o ibmpc.o input.o isearch.o line.o lock.o main.o names.o pklock.o posix.o random.o region.o search.o spawn.o tcap.o termio.o utf8.o vmsvt.o vt52.o window.o word.o wrapper.o
@@ -125,61 +125,58 @@ depend: ${SRC}
 
 ansi.o: ansi.c estruct.h line.h utf8.h edef.h
 basic.o: basic.c basic.h display.h estruct.h line.h utf8.h edef.h input.h \
- random.h word.h
+  random.h word.h
 bind.o: bind.c bind.h edef.h estruct.h line.h utf8.h buffer.h display.h \
- ebind.h exec.h file.h fileio.h input.h main.h names.h window.h
+  ebind.h exec.h file.h fileio.h input.h main.h names.h window.h
 buffer.o: buffer.c buffer.h estruct.h line.h utf8.h display.h edef.h \
- file.h input.h window.h
+  file.h input.h window.h
 crypt.o: crypt.c crypt.h display.h estruct.h line.h utf8.h edef.h input.h
 display.o: display.c display.h estruct.h line.h utf8.h edef.h termio.h \
- version.h wrapper.h window.h
+  version.h wrapper.h window.h
 ebind.o: ebind.c ebind.h basic.h bind.h edef.h estruct.h line.h utf8.h \
- buffer.h crypt.h eval.h exec.h file.h isearch.h main.h random.h region.h \
- search.h spawn.h window.h word.h
+  buffer.h crypt.h eval.h exec.h file.h isearch.h main.h random.h \
+  region.h search.h spawn.h window.h word.h
 eval.o: eval.c eval.h estruct.h line.h utf8.h basic.h bind.h edef.h \
- buffer.h display.h exec.h fileio.h input.h random.h search.h termio.h \
- version.h window.h
+  buffer.h display.h exec.h fileio.h input.h random.h search.h termio.h \
+  version.h window.h
 exec.o: exec.c exec.h estruct.h line.h utf8.h buffer.h bind.h edef.h \
- display.h eval.h file.h input.h
+  display.h eval.h file.h input.h
 file.o: file.c file.h buffer.h estruct.h line.h utf8.h crypt.h display.h \
- edef.h fileio.h input.h lock.h main.h window.h
+  edef.h fileio.h input.h lock.h main.h window.h
 fileio.o: fileio.c fileio.h crypt.h display.h estruct.h line.h utf8.h \
- edef.h
+  edef.h
 globals.o: globals.c estruct.h line.h utf8.h edef.h
 ibmpc.o: ibmpc.c estruct.h line.h utf8.h edef.h
 input.o: input.c input.h edef.h estruct.h line.h utf8.h bind.h display.h \
- exec.h main.h names.h wrapper.h
+  exec.h main.h names.h wrapper.h
 isearch.o: isearch.c isearch.h basic.h display.h estruct.h line.h utf8.h \
- edef.h input.h search.h
-line.o: line.c line.h utf8.h basic.h display.h estruct.h edef.h main.h \
- random.h
-lock.o: lock.c lock.h estruct.h line.h utf8.h display.h edef.h input.h \
- pklock.h
+  edef.h input.h search.h
+line.o: line.c line.h utf8.h basic.h display.h estruct.h edef.h random.h
+lock.o: lock.c lock.h estruct.h line.h utf8.h display.h edef.h input.h
 main.o: main.c main.h crypt.h display.h estruct.h line.h utf8.h edef.h \
- input.h termio.h version.h basic.h bind.h buffer.h eval.h file.h lock.h \
- random.h search.h
+  input.h termio.h version.h basic.h bind.h buffer.h eval.h file.h lock.h \
+  random.h search.h
 names.o: names.c names.h basic.h bind.h edef.h estruct.h line.h utf8.h \
- buffer.h display.h eval.h exec.h crypt.h file.h isearch.h main.h \
- region.h random.h search.h spawn.h window.h word.h
+  buffer.h display.h eval.h exec.h crypt.h file.h isearch.h main.h \
+  region.h random.h search.h spawn.h window.h word.h
 pklock.o: pklock.c pklock.h estruct.h line.h utf8.h edef.h
-posix.o: posix.c termio.h estruct.h line.h utf8.h edef.h
+posix.o: posix.c termio.h
 random.o: random.c random.h basic.h display.h estruct.h line.h utf8.h \
- edef.h input.h main.h search.h
-region.o: region.c region.h estruct.h line.h utf8.h display.h edef.h \
- main.h
+  edef.h input.h main.h search.h
+region.o: region.c region.h estruct.h line.h utf8.h display.h edef.h
 search.o: search.c search.h estruct.h line.h utf8.h basic.h display.h \
- edef.h input.h main.h
+  edef.h input.h
 spawn.o: spawn.c spawn.h buffer.h estruct.h line.h utf8.h display.h \
- edef.h file.h input.h main.h window.h
+  edef.h file.h input.h window.h
 tcap.o: tcap.c display.h estruct.h line.h utf8.h edef.h termio.h
-termio.o: termio.c termio.h
+termio.o: termio.c termio.h estruct.h line.h utf8.h edef.h
 utf8.o: utf8.c utf8.h
 vmsvt.o: vmsvt.c estruct.h line.h utf8.h edef.h
 vt52.o: vt52.c estruct.h line.h utf8.h edef.h
 window.o: window.c window.h estruct.h line.h utf8.h basic.h display.h \
- edef.h main.h wrapper.h
+  edef.h main.h wrapper.h
 word.o: word.c word.h basic.h display.h estruct.h line.h utf8.h edef.h \
- main.h random.h region.h
+  random.h region.h
 wrapper.o: wrapper.c wrapper.h
 
 # DEPENDENCIES MUST END AT END OF FILE
diff --git a/display.c b/display.c
index 164527f..22345ae 100644
--- a/display.c
+++ b/display.c
@@ -1550,3 +1550,22 @@ static int newscreensize(int h, int w)
 }
 
 #endif
+
+/*
+ * tell the user that this command is illegal while we are in
+ * VIEW (read-only) mode
+ */
+int rdonly(void)
+{
+	TTbeep();
+	mlwrite("(Key illegal in VIEW mode)");
+	return FALSE;
+}
+
+int resterr(void)
+{
+	TTbeep();
+	mlwrite("(That command is RESTRICTED)");
+	return FALSE;
+}
+
diff --git a/display.h b/display.h
index 74e2785..1bf987a 100644
--- a/display.h
+++ b/display.h
@@ -20,4 +20,7 @@ void mlputs( char *s) ;
 void getscreensize( int *widthp, int *heightp) ;
 void sizesignal( int signr) ;
 
+int rdonly( void) ;
+int resterr( void) ;
+
 #endif
diff --git a/line.c b/line.c
index 05cd944..071c83c 100644
--- a/line.c
+++ b/line.c
@@ -21,7 +21,6 @@
 #include "display.h"
 #include "estruct.h"
 #include "edef.h"
-#include "main.h"
 #include "random.h"
 #include "utf8.h"
 
diff --git a/main.c b/main.c
index f09c64f..04224a6 100644
--- a/main.c
+++ b/main.c
@@ -720,24 +720,6 @@ int ctrlg(int f, int n)
 	return ABORT;
 }
 
-/*
- * tell the user that this command is illegal while we are in
- * VIEW (read-only) mode
- */
-int rdonly(void)
-{
-	TTbeep();
-	mlwrite("(Key illegal in VIEW mode)");
-	return FALSE;
-}
-
-int resterr(void)
-{
-	TTbeep();
-	mlwrite("(That command is RESTRICTED)");
-	return FALSE;
-}
-
 /* user function that does NOTHING */
 int nullproc(int f, int n)
 {
diff --git a/main.h b/main.h
index db60001..fb2150c 100644
--- a/main.h
+++ b/main.h
@@ -8,8 +8,6 @@ int ctlxlp( int f, int n) ;
 int ctlxrp( int f, int n) ;
 int ctlxe( int f, int n) ;
 int ctrlg( int f, int n) ;
-int rdonly( void) ;
-int resterr( void) ;
 int nullproc( int f, int n) ;
 int metafn( int f, int n) ;
 int cex( int f, int n) ;
diff --git a/region.c b/region.c
index 68a4bc0..b2e4ec7 100644
--- a/region.c
+++ b/region.c
@@ -16,7 +16,6 @@
 #include "estruct.h"
 #include "edef.h"
 #include "line.h"
-#include "main.h"
 
 /*
  * Kill the region. Ask "getregion"
diff --git a/search.c b/search.c
index 3651964..9275829 100644
--- a/search.c
+++ b/search.c
@@ -68,7 +68,6 @@
 #include "edef.h"
 #include "input.h"
 #include "line.h"
-#include "main.h"
 
 #if defined(MAGIC)
 /*
diff --git a/spawn.c b/spawn.c
index fc502b8..ef9318c 100644
--- a/spawn.c
+++ b/spawn.c
@@ -17,7 +17,6 @@
 #include "edef.h"
 #include "file.h"
 #include "input.h"
-#include "main.h"
 #include "window.h"
 
 #if     VMS
diff --git a/word.c b/word.c
index a8ec144..74aa0ac 100644
--- a/word.c
+++ b/word.c
@@ -17,7 +17,6 @@
 #include "estruct.h"
 #include "edef.h"
 #include "line.h"
-#include "main.h"
 #include "random.h"
 #include "region.h"