gbranden pushed a commit to branch master
in repository groff.
commit 990b4a757a8d4174d502671cd030931d707f4595
Author: G. Branden Robinson <[email protected]>
AuthorDate: Wed Feb 18 13:05:12 2026 -0600
[mm]: Fix truncated diagnostic messages.
* contrib/mm/m.tmac: Fix truncated diagnostic messages caused by macro
programmer forgetting to name the string to which the `as` request is
meant to append.
(MULN): Fix truncated fatal error diagnostic arising from disordered
internal state when an undefined column width is encountered when
using groff mm's extended multi-column layout feature.
(ML): Fix truncated error diagnostic when 2nd argument to macro is not
numeric.
Noticed while investigating Savannah #68059.
---
contrib/mm/ChangeLog | 12 ++++++++++++
contrib/mm/m.tmac | 5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index ce54c4321..7191fd238 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,15 @@
+2026-02-18 G. Branden Robinson <[email protected]>
+
+ * m.tmac: Fix truncated diagnostic messages caused by macro
+ programmer forgetting to name the string to which the `as`
+ request is meant to append.
+ (MULN): Fix truncated fatal error diagnostic arising from
+ disordered internal state when an undefined column width is
+ encountered when using groff mm's extended multi-column layout
+ feature.
+ (ML): Fix truncated error diagnostic when 2nd argument to macro
+ is not numeric.
+
2026-02-16 G. Branden Robinson <[email protected]>
* m.tmac (li@pop): When popping a nested list level, restore
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 17185ba68..840eb7bf3 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -1949,7 +1949,8 @@ breaking page
.if \\n[pg*cols-per-page]<2 .@error \\$0: not in multi-column mode
.if \\n[pg*mul-x]>=\\n[pg*mul-max-col] \{\
. ds pg*msg .@abort undefined column width \"
-. as (pg*mul-x=\\n[pg*mul-x] >= pg*mul-max-col=\\n[pg*mul-max])\"
+. as pg*msg (pg*mul-x=\\n[pg*mul-x] >= \
+pg*mul-max-col=\\n[pg*mul-max])\"
. @abort \\*[pg*msg]
.\}
.br
@@ -2789,7 +2790,7 @@ exceeds depth of nested lists (\\n[li*lvl])
.el \{\
. if !\B'\\$2' \{\
. ds li*msg \\$0: text-indent argument is not numeric:\"
-. as " '\\$2'\"
+. as li*msg " '\\$2'\"
. @error \\*[li*msg]
. \}
. ie \\n[.$]=2 .LB \\$2 0 1 0 "\\$1"
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
