From d2e40bd9ce3c3973a1666eaa9477cea927baf84f Mon Sep 17 00:00:00 2001
From: Ken Hornstein <kenh@pobox.com>
Date: Fri, 6 Jan 2012 14:40:31 -0500
Subject: [PATCH] Move definition of LINK to mh header file, and garbage
 collect ATTVIBUG code.

---
 acconfig.h       |   12 ------------
 h/mh.h           |    3 +++
 uip/whatnowsbr.c |   10 ----------
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/acconfig.h b/acconfig.h
index 1894504..a99e544 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -25,17 +25,5 @@
  */
 /* #define REALLYDUMB  1 */
 
-/*
- * Name of link to file to which you are replying.
- */
-#define LINK "@"
-
-/*
- * Define to 1 if your vi has ATT bug, such that it returns
- * non-zero exit codes on `pseudo-errors'.
- */
-#undef ATTVIBUG
-
-
 /***** END USER CONFIGURATION SECTION *****/
 @TOP@
diff --git a/h/mh.h b/h/mh.h
index abcf445..e3a382a 100644
--- a/h/mh.h
+++ b/h/mh.h
@@ -261,6 +261,9 @@ extern char *msg_delim;		/*  .. */
 
 #define OUTPUTLINELEN	72	/* default line length for headers */
 
+#define LINK	"@"		/* Name of link to file to which you are */
+				/* replying. */
+
 /*
  * miscellaneous macros
  */
diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index eaea7e1..18c25f8 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -726,13 +726,6 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 
 	default:
 	    if ((status = pidwait (pid, NOTOK))) {
-#ifdef ATTVIBUG
-		if ((cp = r1bindex (*ed, '/'))
-			&& strcmp (cp, "vi") == 0
-			&& (status & 0x00ff) == 0)
-		    status = 0;
-		else {
-#endif
 		if (((status & 0xff00) != 0xff00)
 		    && (!reedit || (status & 0x00ff))) {
 		    if (!use && (status & 0xff00) &&
@@ -744,9 +737,6 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp,
 		}
 		status = -2;	/* maybe "reedit ? -2 : -1"? */
 		break;
-#ifdef ATTVIBUG
-		}
-#endif
 	    }
 
 	    reedit++;
-- 
1.7.10.4