* ChangeLog-2014: Address findings from codespell. * HACKING: Likewise. * NEWS: Likewise. * TODO: Likewise. * doc/m4.texi: Likewise. * examples/hanoi.m4: Likewise. * examples/include.m4: Likewise. * examples/indir.m4: Likewise. * examples/trace.m4: Likewise. * src/builtin.c: Likewise. * src/debug.c: Likewise. * src/output.c: Likewise. * cfg.mk: Run 'make update-NEWS-hash'. --- ChangeLog-2014 | 30 +++++++++++++++--------------- HACKING | 2 +- NEWS | 4 ++-- TODO | 2 +- cfg.mk | 2 +- doc/m4.texi | 4 ++-- examples/hanoi.m4 | 2 +- examples/include.m4 | 2 +- examples/indir.m4 | 8 ++++---- examples/trace.m4 | 2 +- src/builtin.c | 4 ++-- src/debug.c | 8 ++++---- src/output.c | 2 +- 13 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/ChangeLog-2014 b/ChangeLog-2014 index e3d00a01..28368b93 100644 --- a/ChangeLog-2014 +++ b/ChangeLog-2014 @@ -2395,7 +2395,7 @@ end of a TeX line splits incorrectly. (Foreach, Improved foreach): Write these sections, borrowing ideas from CVS head and from m4sugar. - * checks/get-them: Accomodate new way to show trailing space in + * checks/get-them: Accommodate new way to show trailing space in examples. * examples/foreach.m4: Make usable in documentation. * examples/foreachq.m4: New file. @@ -2410,7 +2410,7 @@ * doc/m4.texinfo (Mkstemp): Rename from Maketemp. Document the new `mkstemp' macro and the flaws of the old `maketemp'. (Incompatibilities): Move maketemp discussion to... - (Extensions): ...here, since -G now supresses the GNU extension. + (Extensions): ...here, since -G now suppresses the GNU extension. * NEWS: Document this. * examples/forloop.m4: Simplify. @@ -3068,7 +3068,7 @@ more examples. (Dnl): Update example to show side effects. * checks/get-them: Generate three digit test names. - * checks/Makefile.in (CHECKS): Accomodate 100+ tests. + * checks/Makefile.in (CHECKS): Accommodate 100+ tests. 2006-07-13 Eric Blake <e...@byu.net> @@ -3260,7 +3260,7 @@ (WTERMSIG, WIFSIGNALED, WIFEXITED): More fallback macros. (M4SYSVAL_EXITBITS, M4SYSVAL_TERMSIGBITS): New helper macros. (m4_esyscmd): Set sysval to -1 on failure. - (m4_sysval): Print 127 on failure, and accomodate signals if they + (m4_sysval): Print 127 on failure, and accommodate signals if they are detectable. * NEWS: Document this change. * doc/m4.texinfo (Platform macros, Esyscmd, Sysval): Fix typos in @@ -3467,7 +3467,7 @@ Eric Blake <e...@byu.net> * src/builtin.c (WEXITSTATUS): Provide fallback definition. - (m4_esyscmd): Set sysval to 0xffff, to accomodate both + (m4_esyscmd): Set sysval to 0xffff, to accommodate both big-endian and little-endian wait status definitions. (m4_sysval): Use WEXITSTATUS. Reported by Andreas Buening. @@ -3482,7 +3482,7 @@ Beta Release 1.4.4b: * configure.ac (AC_INIT): Bump version number. * NEWS: Describe changes since 1.4.4. - * Makefile.maint (cvs-news): Accomodate copyright line wrapping. + * Makefile.maint (cvs-news): Accommodate copyright line wrapping. * Makefile.am (MAINTAINERCLEANFILES): Clean files added by bootstrap. @@ -3888,7 +3888,7 @@ 2005-03-31 Eric Blake <e...@byu.net> (tiny change) - * doc/Makefile.in (install, uninstall): Accomodate DESTDIR. + * doc/Makefile.in (install, uninstall): Accommodate DESTDIR. * src/Makefile.in (install, uninstall): Likewise. 2005-02-07 Gary V. Vaughan <g...@gnu.org> @@ -4188,7 +4188,7 @@ Wed Sep 14 10:00:22 1994 François Pinard (pinard@icule) * configure.in: Use `choke me' in test, like everywhere! * {doc,examples,lib,src}/Makefile.in (check): Deleted, as - unreacheable and useless. + unreachable and useless. * doc/Makefile.in (texclean): Deleted, merged in mostlyclean. @@ -4695,7 +4695,7 @@ Thu Jun 23 00:00:30 1994 François Pinard (pinard@icule) Wed Jun 22 21:58:54 1994 François Pinard (pinard@icule) * configure.in: Avoid USE_STACKOVF if <siginfo.h> not found. Note - that Jim developped stackovf.c on a 486 running SVR4.0 (ESIX), and + that Jim developed stackovf.c on a 486 running SVR4.0 (ESIX), and also tested it on a Sun Sparc workstation running SunOS 4.x. * format.c (format): When not HAVE_EFGCVT, m4 was failing the @@ -4711,7 +4711,7 @@ Wed Jun 22 21:58:54 1994 François Pinard (pinard@icule) Reported by Joseph E. Sacco. * Regenerate configure using Autoconf 1.11, this corrects a - problem about an incorrect cpp seting on NeXT 3.1. + problem about an incorrect cpp setting on NeXT 3.1. Reported by Alexander Lehmann. Sun Jun 5 16:25:19 1994 François Pinard (pinard@icule) @@ -4844,7 +4844,7 @@ Wed Nov 17 09:34:55 1993 François Pinard (pinard@icule) * builtin.c (m4_eval): Cast strlen to (int) before comparing. * input.c (input_init): Initialize quote and comment strings - explicitely instead of calling set_quotes and set_comment: by + explicitly instead of calling set_quotes and set_comment: by doing so, we ensure we do not free uninitialized variables. * checks/check-them: Reverse arguments to both diff, so the @@ -5020,7 +5020,7 @@ Tue Nov 2 00:55:41 1993 François Pinard (pinard@icule) Mon Nov 1 07:45:24 1993 François Pinard (pinard@icule) * m4.h: Add blind_if_no_args in struct builtin, blind_no_args in - struct symbol adn SYMBOL_BLIND_NO_ARGS macro. + struct symbol and SYMBOL_BLIND_NO_ARGS macro. * builtin.c: Initialize all the blindness fields in builtin_tab. (define_builtin): Copy the blindness of a builtin into its symbol. * macro.c (expand_token): Avoid processing a blind builtin if the @@ -5364,7 +5364,7 @@ Tue Nov 10 08:57:05 1992 François Pinard (pinard at icule) * configure.in: Define U through FP_PROTOTYPES for old compilers. Add AC_ISC_POSIX, AC_CONST, AC_SIZE_T. * aclocal.m4: New, provide FP_PROTOTYPES. - * m4.h: Conditionnaly protoized through Args, save for varags. + * m4.h: Conditionally protoized through Args, save for varags. * builtin.c: Protoized. Then: Include <sys/types.h> if size_t is not defined, before "regex.h". (m4_ifelse): Fetch built-in name properly for diagnostic. @@ -5475,7 +5475,7 @@ Thu Oct 24 15:18:46 1991 René Seindal (seindal at diku.dk) * Uses GNU getopt(), with long option names. * The -Q/+quiet option is added, which suppresses warnings about - missing or superflous arguments to built-in macros. + missing or superfluous arguments to built-in macros. * Added default options via the M4OPTS environment variable. @@ -5509,7 +5509,7 @@ Fri Jul 26 15:28:42 1991 René Seindal (seindal at diku.dk) * Named files can now be undiverted. * The -Nnum option can be used to increase the number of - divertions available. + diversions available. * Calling changecom without arguments now disables all comment handling. diff --git a/HACKING b/HACKING index 6dfe66ee..cf6ccd0e 100644 --- a/HACKING +++ b/HACKING @@ -116,7 +116,7 @@ and is not part of a release distribution. linkers you can. * For branch-1.4, the testsuite is generated from the documentation. - All instances of @example in doc/m4.texi that are not preceeded by + All instances of @example in doc/m4.texi that are not proceeded by "@comment ignore" are turned into tests in the checks directory. diff --git a/NEWS b/NEWS index b3aa441c..6c09605f 100644 --- a/NEWS +++ b/NEWS @@ -682,7 +682,7 @@ Version 1.0 - October 1991, by René Seindal * Uses GNU getopt(), with long option names. * The -Q/+quiet option is added, which suppresses warnings about missing -or superflous arguments to built-in macros. +or superfluous arguments to built-in macros. * Added default options via the M4OPTS environment variable. @@ -706,7 +706,7 @@ is defined. * Named files can now be undiverted. -* The -Nnum option can be used to increase the number of divertions +* The -Nnum option can be used to increase the number of diversions available. * Calling changecom without arguments now disables all comment handling. diff --git a/TODO b/TODO index d3f9aadc..c51530fb 100644 --- a/TODO +++ b/TODO @@ -19,7 +19,7 @@ of these ideas, listed more or less in decreasing order of priority. From David J. MacKenzie <d...@eng.umd.edu>, 1993-01-20 GNU m4 should be sped up by a factor of three for competing - with other versions (I think that the lexer is not agressive + with other versions (I think that the lexer is not aggressive enough and too often return single characters; obstacks might be a little abused, too). - Have NULs go really undisturbed through GNU m4 diff --git a/cfg.mk b/cfg.mk index 6cdfc3e9..7f5c01ab 100644 --- a/cfg.mk +++ b/cfg.mk @@ -34,7 +34,7 @@ local-checks-to-skip += sc_cast_of_x_alloc_return_value config_h_header = "m4\.h" # Hash of NEWS contents, to ensure we don't add entries to wrong section. -old_NEWS_hash = 1a900762a4ed2b550e6abd8163f1dfea +old_NEWS_hash = 4e455cf16043061b7ffe289a9b604f33 # Update m4-latest.tar.* symlinks during 'make stable/beta'. GNUPLOADFLAGS = --symlink-regex diff --git a/doc/m4.texi b/doc/m4.texi index e9e5339b..ed169e68 100644 --- a/doc/m4.texi +++ b/doc/m4.texi @@ -7884,7 +7884,7 @@ Improved forloop @file{m4-@value{VERSION}/@/examples/@/forloop3.m4} rearranges the arguments of the helper @code{_forloop} to take two arguments that are placed around the current value. By splitting a balanced set of -parantheses across multiple arguments, the helper macro can now be +parentheses across multiple arguments, the helper macro can now be shared by @code{forloop} and the new @code{forloop_arg}. @comment examples @@ -8200,7 +8200,7 @@ Improved foreach several scenarios that would wreak havoc on one or both of the original implementations. This points out one other difference between the list styles. @code{foreach} evaluates unquoted list elements only once, -in preparation for calling @code{@w{_foreach}}, similary for +in preparation for calling @code{@w{_foreach}}, similarly for @code{foreachq} as provided by @file{foreachq3.m4} or @file{foreachq4.m4}. But @code{foreachq}, as provided by @file{foreachq2.m4}, diff --git a/examples/hanoi.m4 b/examples/hanoi.m4 index d290866f..9aadb4d9 100644 --- a/examples/hanoi.m4 +++ b/examples/hanoi.m4 @@ -9,7 +9,7 @@ define(`_hanoi', `ifelse(eval(`$1'<=1), 1, `move($2, $3)', `$0(decr($1), $2, $4, $3)move($2, $3)$0(decr($1), $4, $3, $2)')') # hanoi (cnt) -define(`hanoi', `_$0(`$1', source, destination, auxilliary)') +define(`hanoi', `_$0(`$1', source, destination, auxiliary)') # traceon(`move', `_hanoi', `decr') divert`'dnl diff --git a/examples/include.m4 b/examples/include.m4 index fb788047..58ae5922 100644 --- a/examples/include.m4 +++ b/examples/include.m4 @@ -1,6 +1,6 @@ Beginning. include(`NOFILE') -Intermidiate +Intermediate include(`test/incl-test.m4') After include(`NOFILE') diff --git a/examples/indir.m4 b/examples/indir.m4 index bc301238..51d2b64f 100644 --- a/examples/indir.m4 +++ b/examples/indir.m4 @@ -1,10 +1,10 @@ define(`%%$$##', `>>>$0<<< cnt $#') -# indir(`%%$$##', nonsens, nonsens) -indir(`%%$$##', nonsens, nonsens) +# indir(`%%$$##', nonsense, nonsense) +indir(`%%$$##', nonsense, nonsense) -# indir(`indir', `%%$$##', nonsens) -indir(`indir', `%%$$##', nonsens) +# indir(`indir', `%%$$##', nonsense) +indir(`indir', `%%$$##', nonsense) # indir(`indir', `indir', `indir', `indir', `%%$$##') indir(`indir', `indir', `indir', `indir', `%%$$##') diff --git a/examples/trace.m4 b/examples/trace.m4 index 92ce9816..07876230 100644 --- a/examples/trace.m4 +++ b/examples/trace.m4 @@ -9,7 +9,7 @@ define(`_hanoi', `ifelse(eval(`$1'<=1), 1, `move($2, $3)', `$0(decr($1), $2, $4, $3)move($2, $3)$0(decr($1), $4, $3, $2)')') # hanoi (cnt) -define(`hanoi', `_$0(`$1', source, destination, auxilliary)') +define(`hanoi', `_$0(`$1', source, destination, auxiliary)') divert`'dnl # Debugmode t diff --git a/src/builtin.c b/src/builtin.c index 3dceaa2d..134607f6 100644 --- a/src/builtin.c +++ b/src/builtin.c @@ -530,7 +530,7 @@ dump_args (struct obstack *obs, int argc, token_data **argv, individual arguments to the macro. Please note that in general argv[argc] != NULL. */ -/* The first section are macros for definining, undefining, examining, +/* The first section are macros for defining, undefining, examining, changing, ... other macros. */ /*-------------------------------------------------------------------. @@ -2132,7 +2132,7 @@ m4_regexp (struct obstack *obs, int argc, token_data **argv) } /*--------------------------------------------------------------------------. -| Substitute all matches of a regexp occuring in a string. Each match of | +| Substitute all matches of a regexp occurring in a string. Each match of | | the second argument (a regexp) in the first argument is changed to the | | third argument, with \& substituted by the matched text, and \N | | substituted by the text matched by the Nth parenthesized sub-expression. | diff --git a/src/debug.c b/src/debug.c index acc83e5e..d2d41b49 100644 --- a/src/debug.c +++ b/src/debug.c @@ -345,10 +345,10 @@ trace_flush (void) obstack_free (&trace, line); } -/*-------------------------------------------------------------. -| Do pre-argument-collction tracing for macro NAME. Used from | -| expand_macro (). | -`-------------------------------------------------------------*/ +/*--------------------------------------------------------------. +| Do pre-argument-collection tracing for macro NAME. Used from | +| expand_macro (). | +`--------------------------------------------------------------*/ void trace_prepre (const char *name, int id) diff --git a/src/output.c b/src/output.c index 381ef6fb..63e765f8 100644 --- a/src/output.c +++ b/src/output.c @@ -406,7 +406,7 @@ output_exit (void) /*----------------------------------------------------------------. | Reorganize in-memory diversion buffers so the current diversion | -| can accomodate LENGTH more characters without further | +| can accommodate LENGTH more characters without further | | reorganization. The current diversion buffer is made bigger if | | possible. But to make room for a bigger buffer, one of the | | in-memory diversion buffers might have to be flushed to a newly | -- 2.49.0
_______________________________________________ M4-patches mailing list M4-patches@gnu.org https://lists.gnu.org/mailman/listinfo/m4-patches