Article View: gnu.utils.bug
Article #1544GNU diff3 1.4 spelling corrections
From: Paul Eggert
Date: Fri, 07 Apr 1989 22:05
Date: Fri, 07 Apr 1989 22:05
78 lines
3077 bytes
3077 bytes
The source code for GNU diff3 version 1.4 contains some spelling errors.
Here are some fixes.
===================================================================
RCS file: RCS/diff3.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -r1.1 -r1.2
174c174
< * (ie. line number within the original file). Note that these are
---
> * (i.e. line number within the original file). Note that these are
184c184
< * numbers (ie. line number within the diff itself). Note that these
---
> * numbers (i.e. line number within the diff itself). Note that these
246c246
< * to write out the file being editted.
---
> * to write out the file being edited.
283c283
< * "include write command", to emulate system V behaivior.
---
> * "include write command", to emulate system V behavior.
429c429
< * do bcmp's between correspponding strings in the two diffs.
---
> * do bcmp's between corresponding strings in the two diffs.
436c436
< * strings of diffs, then that file (ie. the one other than
---
> * strings of diffs, then that file (i.e. the one other than
440c440
< * Same number of lines? If so, do a set of bcmps (if a
---
> * Same number of lines? If so, do a set of bcmp's (if a
452c452
< * the two diffs passed are off of the same file (ie. that each of the
---
> * the two diffs passed are off of the same file (i.e. that each of the
686c686
< * and file 2 relative to the coresp lines struct.
---
> * and file 2 relative to the corresponding lines struct.
939c939
< * Return 1 if they are equivelent, 0 if not.
---
> * Return 1 if they are equivalent, 0 if not.
1012c1012
< parsel them out among these pointers */
---
> parcel them out among these pointers */
1030c1030
< /* Get past the seperator for changes */
---
> /* Get past the separator for changes */
1034c1034
< fatal ("Bad diff format: bad change seperater");
---
> fatal ("Bad diff format: bad change separator");
1039c1039
< parsel them out among these pointers */
---
> parcel them out among these pointers */
1353c1353
< * Also, occaisionally this routine needs the real names of the files
---
> * Also, occasionally this routine needs the real names of the files
1419c1419
< /* Add in code to take care of leading dots, if necc. */
---
> /* Add in code to take care of leading dots, if necessary. */
1479c1479
< /* Add in code to take care of leading dots, if necc. */
---
> /* Add in code to take care of leading dots, if necessary. */
-- Paul Eggert, Twin Sun Inc <uunet!twinsun!eggert>
Technical Details
Message-ID:
<8904072205.AA01414@stand.twinsun.com>Path:
arc1-ca.pugleaf.net!utzoo!utgpu!jarvis.csri.toronto.edu!mailrus!tut.cis.ohio-state.edu!WHEATIES.AI.MIT.EDU!twinsun!stand!eggertShow Full Headers
Complete Article Headers
Path: arc1-ca.pugleaf.net!utzoo!utgpu!jarvis.csri.toronto.edu!mailrus!tut.cis.ohio-state.edu!WHEATIES.AI.MIT.EDU!twinsun!stand!eggert From: twinsun!stand!eggert@WHEATIES.AI.MIT.EDU (Paul Eggert) Newsgroups: gnu.utils.bug Subject: GNU diff3 1.4 spelling corrections Message-ID: <8904072205.AA01414@stand.twinsun.com> Date: 7 Apr 89 22:05:26 GMT Sender: news@tut.cis.ohio-state.edu Distribution: gnu Organization: GNUs Not Usenet Lines: 78