home *** CD-ROM | disk | FTP | other *** search
- Path: sparky!uunet!nwnexus!remote!UUCP
- From: Craig.Groeschel@f15.n229.z1.fidonet.org (Craig Groeschel)
- Newsgroups: comp.os.linux
- Subject: patches for elvis-1.6 (lo
- Message-ID: <726211386.AA30274@remote.halcyon.com>
- Date: Sun, 27 Dec 1992 04:29:11 -0800
- Sender: UUCP@remote.halcyon.com
- Lines: 238
-
-
- Here is what I had to change to get elvis 1.6 to compile on my machine.
- To apply these patches use something like
- patch -d /usr/src/elvis-1.6/src < elvis.dif
- Hope they save time.
-
- diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/cmd1.c
- /local/src/elvis-1.6/src/cmd1.c
- *** /tmp/elvis-1.6/src/cmd1.cSun Aug 23 01:18:19 1992
- ***************
- *** 1192,1196 ****
- {
- REG char*cpy;
- - longatol();
- # if COHERENT || TOS /* any Mark Williams compiler */
- /* Get the line number. If no line number, then ignore this line. */
- diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/fmt.c
- /local/src/elvis-1.6/src/fmt.c
- *** /tmp/elvis-1.6/src/fmt.cSun Aug 23 01:18:23 1992
- ***************
- *** 21,25 ****
-
- intwidth = 72;/* the desired line width */
- ! intisblank;/* is the current output line blank? */
- intindent;/* width of the indentation */
- charind[512];/* indentation text */
-
- intwidth = 72;/* the desired line width */
- ! intisblnk;/* is the current output line blank? */
- intindent;/* width of the indentation */
- charind[512];/* indentation text */
- ***************
- *** 65,69 ****
-
- /* if this is the first word on the line... */
- ! if (isblank)
- {
- /* output the indentation first */
-
- /* if this is the first word on the line... */
- ! if (isblnk)
- {
- /* output the indentation first */
- ***************
- *** 100,104 ****
-
- /* this output line isn't blank anymore. */
- ! isblank = FALSE;
- }
-
-
- /* this output line isn't blank anymore. */
- ! isblnk = FALSE;
- }
-
- ***************
- *** 116,120 ****
-
- /* for each character in the stream... */
- ! for (indent = -1, isblank = TRUE, inword = FALSE, i = 0, prevch =
- '\n';
- (ch = getc(in)) != EOF;
- prevch = ch)
-
- /* for each character in the stream... */
- ! for (indent = -1, isblnk = TRUE, inword = FALSE, i = 0, prevch =
- '\n';
- (ch = getc(in)) != EOF;
- prevch = ch)
- ***************
- *** 137,144 ****
- {
- /* finish the previous paragraph */
- ! if (!isblank)
- {
- putchar('\n');
- ! isblank = TRUE;
- }
-
- {
- /* finish the previous paragraph */
- ! if (!isblnk)
- {
- putchar('\n');
- ! isblnk = TRUE;
- }
-
- ***************
- *** 207,214 ****
-
- /* if necessary, write a final newline */
- ! if (!isblank)
- {
- putchar('\n');
- ! isblank = TRUE;
- }
- }
-
- /* if necessary, write a final newline */
- ! if (!isblnk)
- {
- putchar('\n');
- ! isblnk = TRUE;
- }
- }
- diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/move2.c
- /local/src/elvis-1.6/src/move2.c
- *** /tmp/elvis-1.6/src/move2.cSun Aug 23 01:18:26 1992
- ***************
- *** 15,19 ****
- #include "regexp.h"
-
- - extern longatol();
-
- static regexp*re;/* compiled version of the pattern to search for */
- diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/ref.c
- /local/src/elvis-1.6/src/ref.c
- *** /tmp/elvis-1.6/src/ref.cSun Aug 23 01:18:31 1992
- ***************
- *** 25,29 ****
- extern intcountcolons P_((char *));
- extern voidmain P_((int, char **));
- - extern char*getenv P_((char *));
-
-
- diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/tmp.c
- /local/src/elvis-1.6/src/tmp.c
- *** /tmp/elvis-1.6/src/tmp.cSun Aug 23 01:18:34 1992
- ***************
- *** 176,180 ****
- else
- {
- ! setflag(file, NOFILE);
- origfd = -1;
- origtime = 0L;
- else
- {
- ! setflag(file, NOFILEvi);
- origfd = -1;
- origtime = 0L;
- diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/unix.c
- /local/src/elvis-1.6/src/unix.c
- *** /tmp/elvis-1.6/src/unix.cSun Aug 23 01:18:35 1992
- ***************
- *** 118,122 ****
- int ttyread(buf, len, time)
- char*buf;/* where to store the gotten characters */
- ! unsigned len;/* maximum number of characters to read */
- inttime;/* maximum time to allow for reading */
- {
- int ttyread(buf, len, time)
- char*buf;/* where to store the gotten characters */
- ! int len;/* maximum number of characters to read */
- inttime;/* maximum time to allow for reading */
- {
- diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/vcmd.c
- /local/src/elvis-1.6/src/vcmd.c
- *** /tmp/elvis-1.6/src/vcmd.cSun Aug 23 01:18:36 1992
- ***************
- *** 650,654 ****
- staticsign;
- charnewval[12];
- - longatol();
-
- DEFAULT(1);
- diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/vi.h
- /local/src/elvis-1.6/src/vi.h
- *** /tmp/elvis-1.6/src/vi.hSun Aug 23 01:18:37 1992
- ***************
- *** 105,109 ****
- #define HADNUL0x0004/* the file contained NUL characters */
- #define MODIFIED0x0008/* the file has been modified, but not saved */
- ! #define NOFILE0x0010/* no name is known for the current text */
- #define ADDEDNL0x0020/* newlines were added to the file */
- #define HADBS0x0040/* backspace chars were lost from the file */
- #define HADNUL0x0004/* the file contained NUL characters */
- #define MODIFIED0x0008/* the file has been modified, but not saved */
- ! #define NOFILEvi 0x0010/* no name is known for the current text
- */
- #define ADDEDNL0x0020/* newlines were added to the file */
- #define HADBS0x0040/* backspace chars were lost from the file */
- *** Makefile.mixSun Aug 23 01:18:15 1992
- ***************
- *** 37,62 ****
-
- #---- These settings are recommended for System-V UNIX and SCO
- XENIX-386 ----
- ! #OBJ=.o
- ! #EXE=
- ! #COM=
- ! #EXTRA=unix$(OBJ)
- ! #EXTRA2=
- ! #LIBS=-lterm
- ! #BIN=/usr/local/bin
- ! #CC=cc
- ! #CFLAGS=-DM_SYSV -O -DNO_SHIFT_FKEYS
- ! #SMALL=
- ! #OF=-o ""
- ! #RF=-c
- ! #EVAL=eval
- ! #PROGS=elvis$(EXE) ctags$(COM) ref$(COM) elvrec$(COM) fmt$(COM) \
- ! #elvprsv$(COM)
- ! #CHMEM=
- ! #SORT=-DSORT
- ! #RM=rm -f
- ! #CP=cp
- ! #SYS=unx
- ! #DUMMY=
- ! #CFG=
-
- #---- These settings are recommended for SCO XENIX-286 ----
-
- #---- These settings are recommended for System-V UNIX and SCO
- XENIX-386 ----
- ! OBJ=.o
- ! EXE=
- ! COM=
- ! EXTRA=unix$(OBJ)
- ! EXTRA2=
- ! LIBS=-ltermcap
- ! BIN=/usr/local/bin
- ! CC=cc
- ! CFLAGS=-DM_SYSV -O -DNO_SHIFT_FKEYS -DTERMIOS -DFILEPERMS=0644
- -DMAILER=\"mail\"
- ! SMALL=
- ! OF=-o ""
- ! RF=-c
- ! EVAL=eval
- ! PROGS=elvis$(EXE) ctags$(COM) ref$(COM) elvrec$(COM) fmt$(COM) \
- ! elvprsv$(COM)
- ! CHMEM=
- ! SORT=-DSORT
- ! RM=rm -f
- ! CP=cp
- ! SYS=unx
- <<MESSAGE TOO LONG -- SOME LINES WERE DELETED>>
- * Origin: Canada Remote Systems, Mississauga, Ontario (1:229/15)
-
-