home *** CD-ROM | disk | FTP | other *** search
- --- config.X.rtr Fri Feb 24 16:28:40 1995
- +++ config.X Mon Feb 27 08:51:40 1995
- @@ -260,7 +260,7 @@
- ** DEFHASH (which will usually be named english.hash).
- */
- #ifndef LANGUAGES
- -#define LANGUAGES "{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=/usr/dict/words}"
- +#define LANGUAGES "{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=}"
- #endif /* LANGUAGES */
-
- /*
- --- correct.c.rtr Wed Nov 2 13:44:44 1994
- +++ correct.c Mon Feb 27 09:33:52 1995
- @@ -157,7 +157,7 @@
- struct flagent * sufent,
- ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN],
- int * nsaved));
- -static char * getline P ((char * buf));
- +static char * getline_local P ((char * buf));
- void askmode P ((void));
- void copyout P ((char ** cc, int cnt));
- static void lookharder P ((char * string));
- @@ -439,7 +439,7 @@
-
- move (li - 1, 0);
- (void) putchar ('!');
- - if (getline (buf) == NULL)
- + if (getline_local(buf) == NULL)
- {
- (void) putchar (7);
- erase ();
- @@ -464,7 +464,7 @@
- (void) printf ("%s ", CORR_C_READONLY);
- }
- (void) printf (CORR_C_REPLACE_WITH);
- - if (getline (ctok) == NULL)
- + if (getline_local (ctok) == NULL)
- {
- (void) putchar (7);
- /* Put it back */
- @@ -526,7 +526,7 @@
- char buf[100];
- move (li - 1, 0);
- (void) printf (CORR_C_LOOKUP_PROMPT);
- - if (getline (buf) == NULL)
- + if (getline_local (buf) == NULL)
- {
- (void) putchar (7);
- erase ();
- @@ -1380,7 +1380,7 @@
- #endif /* NO_CAPITALIZATION_SUPPORT */
- }
-
- -static char * getline (s)
- +static char * getline_local (s)
- register char * s;
- {
- register char * p;
- --- term.c.rtr Wed Nov 2 13:44:28 1994
- +++ term.c Mon Feb 27 13:24:39 1995
- @@ -2,7 +2,7 @@
- static char Rcs_Id[] =
- "$Id: term.c,v 1.48 1994/10/25 05:46:11 geoff Exp $";
- #endif
- -
- +#define ioctl FOOBAR
- /*
- * term.c - deal with termcap, and unix terminal mode settings
- *
- @@ -65,10 +65,11 @@
- #include "proto.h"
- #include "msgs.h"
- #ifdef USG
- -#include <termio.h>
- +#include <termios.h>
- #else
- #include <sgtty.h>
- #endif
- +#undef TIOCGWINSZ
- #include <signal.h>
-
- void erase P ((void));
- @@ -136,8 +137,8 @@
- }
-
- #ifdef USG
- -static struct termio sbuf;
- -static struct termio osbuf;
- +static struct termios sbuf;
- +static struct termios osbuf;
- #else
- static struct sgttyb sbuf;
- static struct sgttyb osbuf;
- @@ -247,7 +248,7 @@
- (void) fprintf (stderr, TERM_C_NO_BATCH);
- exit (1);
- }
- - (void) ioctl (0, TCGETA, (char *) &osbuf);
- + tcgetattr(0, &osbuf);
- termchanged = 1;
-
- sbuf = osbuf;
- @@ -256,7 +257,7 @@
- sbuf.c_iflag &= ~(INLCR | IGNCR | ICRNL);
- sbuf.c_cc[VMIN] = 1;
- sbuf.c_cc[VTIME] = 1;
- - (void) ioctl (0, TCSETAW, (char *) &sbuf);
- + tcsetattr(0, TCSADRAIN, &sbuf);
-
- uerasechar = osbuf.c_cc[VERASE];
- ukillchar = osbuf.c_cc[VKILL];
- @@ -344,7 +345,7 @@
- if (te)
- tputs (te, 1, putch);
- #ifdef USG
- - (void) ioctl (0, TCSETAW, (char *) &osbuf);
- + tcsetattr(0, TCSADRAIN, &osbuf);
- #else
- (void) ioctl (0, TIOCSETP, (char *) &osbuf);
- #ifdef TIOCSLTC
- @@ -360,7 +361,7 @@
- int signo;
- {
- #ifdef USG
- - (void) ioctl (0, TCSETAW, (char *) &osbuf);
- + tcsetattr(0, TCSADRAIN, &osbuf);
- #else
- (void) ioctl (0, TIOCSETP, (char *) &osbuf);
- #ifdef TIOCSLTC
- @@ -375,7 +376,7 @@
- /* stop here until continued */
- (void) signal (signo, onstop);
- #ifdef USG
- - (void) ioctl (0, TCSETAW, (char *) &sbuf);
- + tcsetattr(0, TCSADRAIN, &sbuf);
- #else
- (void) ioctl (0, TIOCSETP, (char *) &sbuf);
- #ifdef TIOCSLTC
- @@ -435,7 +436,7 @@
- argv[i] = NULL;
-
- #ifdef USG
- - (void) ioctl (0, TCSETAW, (char *) &osbuf);
- + tcsetattr(0, TCSADRAIN, &osbuf);
- #else
- (void) ioctl (0, TIOCSETP, (char *) &osbuf);
- #ifdef TIOCSLTC
- @@ -481,7 +482,7 @@
- #endif
-
- #ifdef USG
- - (void) ioctl (0, TCSETAW, (char *) &sbuf);
- + tcsetattr(0, TCSADRAIN, &sbuf);
- #else
- (void) ioctl (0, TIOCSETP, (char *) &sbuf);
- #ifdef TIOCSLTC
- --- local.h.rtr Fri Feb 24 16:28:38 1995
- +++ local.h Mon Feb 27 09:19:24 1995
- @@ -82,7 +82,7 @@
-
- #define MINIMENU /* Display a mini-menu at the bottom of the screen */
- #define NO8BIT /* Remove this if you use ISO character sets */
- -#undef USG /* Define this on System V */
- +#define USG /* Define this on System V */
-
- /*
- * Important directory paths
-