gbranden pushed a commit to branch master
in repository groff.
commit 1514a3fc1884b1478f11a4edf8cce948af8235eb
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Nov 13 09:36:29 2026 -0600
m4/groff.m4: Fix code style nits.
* m4/groff.m4 (GROFF_G): Break long input lines. Unquote comparand
lacking shell metacharacters in test(1) expression.
Annotate macro.
---
ChangeLog | 6 ++++++
m4/groff.m4 | 9 +++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d2680c708..25c93014b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2026-11-13 G. Branden Robinson <[email protected]>
+
+ * m4/groff.m4 (GROFF_G): Fix code style nits. Break long input
+ lines. Unquote comparand lacking shell metacharacters in
+ test(1) expression.
+
2026-11-12 Jaipaul Cheernam <[email protected]>
* m4/groff.m4 (GROFF_G): Apply the "g" command prefix only when
diff --git a/m4/groff.m4 b/m4/groff.m4
index 7f415021b..0950b458f 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1057,6 +1057,10 @@ AC_DEFUN([GROFF_TMAC],
])
+dnl TODO: Permit `GROFF_COMMAND_PREFIX` environment variable to override
+dnl this check. But be careful, as the variable being unset has a
+dnl _different meaning_ from being set but null.
+dnl
# Check the build environment for a `troff` executable that defines a
# built-in register `.g`. It always interpolates `1` in GNU troff.
# If the build environment's troff does not thus advertise GNU troff
@@ -1067,14 +1071,15 @@ AC_DEFUN([GROFF_G], [
AC_MSG_CHECKING([whether a groff-incompatible troff is installed])
if test -n "`command -v troff`"
then
- troff_dotg=`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>/dev/null) \
+ troff_dotg=`(echo .tm '|n(.g' | tr '|' '\\\\' \
+ | troff -z -i 2>/dev/null) \
2>/dev/null`
if test -n "$troff_dotg" && test "$troff_dotg" != 1
then
g=g
fi
fi
- if test "$g" = "g"
+ if test "$g" = g
then
AC_MSG_RESULT([yes])
else
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit