Move definition of LINK to mh header file, and garbage collect ATTVIBUG code.

diff --git a/acconfig.h b/acconfig.h
index 18945046948a065ab5cba08b021b8dc1f122f532..a99e5448d73f0469a940ba74d5a91ad1fbedec85 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -25,17 +25,5 @@
  */
 /* #define REALLYDUMB  1 */
 
  */
 /* #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@
 /***** END USER CONFIGURATION SECTION *****/
 @TOP@

diff --git a/h/mh.h b/h/mh.h
index abcf445168ac656d015548c624879a28370c8673..e3a382a32334b69b68551d9ee9a9a02f5a798a3f 100644 (file)
--- 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 OUTPUTLINELEN  72      /* default line length for headers */
 

+#define LINK   "@"             /* Name of link to file to which you are */
+                               /* replying. */
+

 /*
  * miscellaneous macros
  */
 /*
  * miscellaneous macros
  */

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index eaea7e14b123589fff74689bcb2bd4e6ef450752..18c25f884ebcbcb5b2a825b26ad1a059069d97f4 100644 (file)
--- 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))) {
 
        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) &&
                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;
                }
                status = -2;    /* maybe "reedit ? -2 : -1"? */
                break;

-#ifdef ATTVIBUG
-               }
-#endif

            }
 
            reedit++;
            }
 
            reedit++;