summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorG. Branden Robinson <g.branden.robinson@gmail.com>2024-03-15 16:17:24 -0500
committerG. Branden Robinson <g.branden.robinson@gmail.com>2024-03-15 16:17:24 -0500
commitbbcc04fd90cd773e9ebe6956ba44002f5a3b4324 (patch)
tree61e16ec8585470034dcacc8d79507ad5fb05e26a
parentcb34b1e1970001f5fbd5454db96833fed7efe8b2 (diff)
[man]: Fix Savannah #65462.
* tmac/an.tmac (TP): Save the existing adjustment mode before disabling adjustment in the diversion used to format the paragraph tag. (an*TP-trap): Restore the saved adjustment mode after closing the diversion, instead of using the configured default adjustment mode. Fixes <https://savannah.gnu.org/bugs/?65462>. Thanks to Russ Allbery for the report.
-rw-r--r--ChangeLog14
-rw-r--r--tmac/an.tmac4
2 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c37ba5c20..450d2bffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2024-03-15 G. Branden Robinson <g.branden.robinson@gmail.com>
+ [man]: Fix Savannah #65462.
+
+ * tmac/an.tmac (TP): Save the existing adjustment mode before
+ disabling adjustment in the diversion used to format the
+ paragraph tag.
+ (an*TP-trap): Restore the saved adjustment mode after closing
+ the diversion, instead of using the configured default
+ adjustment mode.
+
+ Fixes <https://savannah.gnu.org/bugs/?65462>. Thanks to Russ
+ Allbery for the report.
+
+2024-03-15 G. Branden Robinson <g.branden.robinson@gmail.com>
+
[man]: Regression-test Savannah #65462.
* tmac/tests/\
diff --git a/tmac/an.tmac b/tmac/an.tmac
index 2b1789741..b4710e23a 100644
--- a/tmac/an.tmac
+++ b/tmac/an.tmac
@@ -700,7 +700,8 @@ contains unsupported escape sequence
.de1 an*TP-trap
. br
. di
-. ad \\*[AD]
+. ad \\n[an*saved-adjustment-mode]
+. rr an*saved-adjustment-mode
. ll
. if \\n[an*have-paragraph-tag] .an-write-paragraph-tag
..
@@ -842,6 +843,7 @@ contains unsupported escape sequence
. itc 1 an-input-trap
. in 0
. ll -\\n[an-margin]u
+. nr an*saved-adjustment-mode \\n[.j]
. di an*paragraph-tag
. na
..