On Fri, Apr 04, 2025 at 11:47:20AM -0500, Eric Blake via M4-patches wrote:
> * gnulib: Update to latest.
> ---
> gnulib | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gnulib b/gnulib
> index c9a4df6d..3773db65 160000
> --- a/gnulib
> +++ b/gnulib
> @@ -1 +1 @@
> -Subproject commit c9a4df6d65a578769a6944fa7fbfcd89f0b0453a
> +Subproject commit 3773db653242ab7165cd300295c27405e4f9cc79
This bump picks up a new 'make syntax-check' rule to automatically run
codespell, which will require the additional changes here:
diff --git i/BACKLOG w/BACKLOG
index 965d9161..30783535 100644
--- i/BACKLOG
+++ w/BACKLOG
@@ -16,7 +16,7 @@ rmail/configuration
rmail/documentation
1. 05 Jun 92 <bers...@mipsmath.math.uqam.ca> Re: M4
2. 10 Nov 92 <tchr...@convex.com> Re: Is anyone using m4?
- 3. 25 May 94 <sch...@issan.informatik.uni-dortmund.de> Autoconf 1.11: minor bu
+ 3. 25 May 94 <sch...@issan.informatik.uni-dortmund.de> Autoconf 1.11: minor
bug
4. 27 Jul 94 <pin...@iro.umontreal.ca> Re: 0.95: Spacing details
5. 28 Jul 94 <pin...@iro.umontreal.ca> Re: 0.95: Spacing details
6. 31 Aug 94 <k...@cs.umb.edu> Re: Frozen file documentation to proofread
diff --git i/ChangeLog-2014 w/ChangeLog-2014
index 28368b93..0783ad62 100644
--- i/ChangeLog-2014
+++ w/ChangeLog-2014
@@ -5463,7 +5463,7 @@ Sun Mar 8 11:01:55 1992 François Pinard (pinard at
icule)
* eval.c, input.c, m4.h: Remove last comma in enums.
Reported by Mike Lijewski.
- * Transfer of maintenance duties from Rene' to Franc,ois.
+ * Transfer of maintenance duties from René to François.
␌
Thu Oct 24 15:18:46 1991 René Seindal (seindal at diku.dk)
diff --git i/NEWS w/NEWS
index ede12caa..f131c13e 100644
--- i/NEWS
+++ w/NEWS
@@ -568,12 +568,12 @@ GNU M4 NEWS - User visible changes.
returning the name of a nonexistent file. This closes a security hole.
* Noteworthy changes in Version 1.4 (Oct 1994) [stable]
- Released by Franc,ois Pinard
+ Released by François Pinard
** (No user visible changes)
␌
-Version 1.3 - September 1994, by Franc,ois Pinard
+Version 1.3 - September 1994, by François Pinard
* Diversions are created as needed. Option `-N' is still accepted, but
otherwise ignored. Users should use only negative diversion numbers,
@@ -585,7 +585,7 @@ at all if all diversions taken altogether do not use more
than 512K.
* Frozen state files may be produced with the `--freeze-state' (-F)
option and later brought back through the `--reload-state' (-R) option.
␌
-Version 1.2 - July 1994, by Franc,ois Pinard
+Version 1.2 - July 1994, by François Pinard
* In patsubst(STRING, REGEXP, REPLACEMENT), \& in REPLACEMENT has been
changed to represent this part of STRING matched by the whole REGEXP,
@@ -612,7 +612,7 @@ configure time to get these things. Do *not* depend on
them yet.
* Various bugs have been corrected, m4 should be more portable. See the
ChangeLog for details.
␌
-Version 1.1 - November 1993, by Franc,ois Pinard
+Version 1.1 - November 1993, by François Pinard
Changes which might affect existing GNU m4 scripts:
@@ -647,7 +647,7 @@ exclusive-or, `~' for the bitwise negation, `<<' and `>>'
for shifts.
* `eval' recognizes the notation 0bDIGITS for binary numbers and the
notation 0rRADIX:DIGITS for numbers in any radix from 1 to 36.
␌
-Version 1.0.3 - December 1992, by Franc,ois Pinard
+Version 1.0.3 - December 1992, by François Pinard
Changes for the user:
diff --git i/cfg.mk w/cfg.mk
index 721617c3..52c2e91e 100644
--- i/cfg.mk
+++ w/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 = beb0fe1124e1148f05fc64abac57eff5
+old_NEWS_hash = 293273266bb174fb68ee74e80508d8f8
# Update m4-latest.tar.* symlinks during 'make stable/beta'.
GNUPLOADFLAGS = --symlink-regex
@@ -51,3 +51,7 @@ indent_args = --ignore-profile --preprocessor-indentation 1
--no-tabs \
exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \
(^(GNU)?Makefile(\.am)?|\.mk|^HACKING|^ChangeLog.*)$$
exclude_file_name_regexp--update-copyright = ^m4/gnulib-cache.m4$$
+exclude_file_name_regexp--sc_codespell = ^THANKS$$
+
+# Codespell exemptions:
+codespell_ignore_words_list = ois,WIDTHn
diff --git i/doc/m4.texi w/doc/m4.texi
index c3dbfa8b..34956f5a 100644
--- i/doc/m4.texi
+++ w/doc/m4.texi
@@ -4740,40 +4740,40 @@ Changeword
Because @code{m4} constructs its words a character at a time, there
is a restriction on the regular expressions that may be passed to
@code{changeword}. This is that if your regular expression accepts
-@samp{foo}, it must also accept @samp{f} and @samp{fo}.
+@samp{abc}, it must also accept @samp{a} and @samp{ab}.
@example
ifdef(`changeword', `', `errprint(` skipping: no changeword support
')m4exit(`77')')dnl
-define(`foo
+define(`abc
', `bar
')
@result{}
-dnl This example wants to recognize changeword, dnl, and `foo\n'.
+dnl This example wants to recognize changeword, dnl, and `abc\n'.
dnl First, we check that our regexp will match.
-regexp(`changeword', `[cd][a-z]*\|foo[
+regexp(`changeword', `[cd][a-z]*\|abc[
]')
@result{}0
-regexp(`foo
-', `[cd][a-z]*\|foo[
+regexp(`abc
+', `[cd][a-z]*\|abc[
]')
@result{}0
-regexp(`f', `[cd][a-z]*\|foo[
+regexp(`a', `[cd][a-z]*\|abc[
]')
@result{}-1
-foo
-@result{}foo
-changeword(`[cd][a-z]*\|foo[
+abc
+@result{}abc
+changeword(`[cd][a-z]*\|abc[
]')
@result{}
-dnl Even though `foo\n' matches, we forgot to allow `f'.
-foo
-@result{}foo
-changeword(`[cd][a-z]*\|fo*[
+dnl Even though `abc\n' matches, we forgot to allow `ab'.
+abc
+@result{}abc
+changeword(`[cd][a-z]*\|ab?c?[
]?')
@result{}
-dnl Now we can call `foo\n'.
-foo
+dnl Now we can call `abc\n'.
+abc
@result{}bar
@end example
--
Eric Blake, Principal Software Engineer
Red Hat, Inc.
Virtualization: qemu.org | libguestfs.org
_______________________________________________
M4-patches mailing list
M4-patches@gnu.org
https://lists.gnu.org/mailman/listinfo/m4-patches
