gbranden pushed a commit to branch master
in repository groff.
commit eee74c1a8f73ff7dd68aee59711bfbeb9174c20d
Author: Rocket Ma <[email protected]>
AuthorDate: Tue Mar 3 19:01:34 2026 +0800
[eqn]: Fix Savannah #68115.
* src/preproc/eqn/eqn.am (neqn): `-f $(SH_DEPS_SED_SCRIPT)` should be
placed before further `-e` substitutions so that it does not impact
the later expressions. This fixes the sed command to replace "@g@" in
neqn.sh correctly. The `/^$/N` in "shdeps.sed" (generated by Keith
Marshall's "arch/misc/shdeps.sh") might be implicated.
Fixes <https://savannah.gnu.org/bugs/?68115>. [Problem introduced by me
in commit 2b86c9332c, 4 February. --GBR]
Signed-off-by: RocketDev <[email protected]>
Copyright-paperwork-exempt: yes (< 15 net lines added)
---
ChangeLog | 12 ++++++++++++
src/preproc/eqn/eqn.am | 4 ++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6f7039825..5edc379be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2026-03-03 Rocket Ma <[email protected]>
+
+ * src/preproc/eqn/eqn.am (neqn): `-f $(SH_DEPS_SED_SCRIPT)`
+ should be placed before further `-e` substitutions so that it
+ does not impact the later expressions. This fixes the sed
+ command to replace "@g@" in neqn.sh correctly. The `/^$/N` in
+ "shdeps.sed" (generated by Keith Marshall's "arch/misc/
+ shdeps.sh") might be implicated.
+
+ Fixes <https://savannah.gnu.org/bugs/?68115>. [Problem
+ introduced by me in commit 2b86c9332c, 4 February. --GBR]
+
2026-03-03 G. Branden Robinson <[email protected]>
[eqn]: Regression-test Savannah #68115.
diff --git a/src/preproc/eqn/eqn.am b/src/preproc/eqn/eqn.am
index 3e9e95012..8aa223f40 100644
--- a/src/preproc/eqn/eqn.am
+++ b/src/preproc/eqn/eqn.am
@@ -63,8 +63,8 @@ MAINTAINERCLEANFILES += \
src/preproc/eqn/eqn.output
neqn: $(top_srcdir)/src/preproc/eqn/neqn.sh $(SH_DEPS_SED_SCRIPT)
- $(AM_V_GEN)sed -e 's/[@]g[@]/$(g)/g' \
- -f $(SH_DEPS_SED_SCRIPT) \
+ $(AM_V_GEN)sed -f $(SH_DEPS_SED_SCRIPT) \
+ -e 's/[@]g[@]/$(g)/g' \
-e $(SH_SCRIPT_SED_CMD) \
$(top_srcdir)/src/preproc/eqn/neqn.sh \
>[email protected] \
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
