[groff] 04/16: [man]: Fix Savannah #65462.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit bbcc04fd90cd773e9ebe6956ba44002f5a3b4324
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Mar 15 16:17:24 2024 -0500

    [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.
---
 ChangeLog    | 14 ++++++++++++++
 tmac/an.tmac |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c37ba5c20..450d2bffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+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.
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
 ..