[groff] 01/01: [mdoc] Fix Savannah bug #44733.

[Werner LEMBERG]

wl pushed a commit to branch master
in repository groff.

commit 9125552b0d054ed78612af642c303126ff7d3c82
Author: Ingo Schwarze <address@hidden>
Date:   Sat Apr 11 08:55:00 2015 +0200

    [mdoc] Fix Savannah bug #44733.
    
    Prevent mdoc(7) Bl with trailing -width or -offset from picking up
    old args.
    
    * tmac/doc.tmac-u (doc-do-Bl-args): When checking whether there is
    another argument to a Bl macro, do not inspect the argument list
    because it is never cleaned and may contain arguments from previous
    macro invocations.  Instead, inspect the argument count which is
    always up to date.
---
 ChangeLog       |   13 +++++++++++++
 tmac/doc.tmac-u |    2 +-
 2 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c044a51..a14909b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2015-03-07  Ingo Schwarze  <address@hidden>
+
+       [mdoc] Fix Savannah bug #44733.
+
+       Prevent mdoc(7) Bl with trailing -width or -offset from picking up
+       old args.
+
+       * tmac/doc.tmac-u (doc-do-Bl-args): When checking whether there is
+       another argument to a Bl macro, do not inspect the argument list
+       because it is never cleaned and may contain arguments from previous
+       macro invocations.  Instead, inspect the argument count which is
+       always up to date.
+
 2015-04-10  Daiki Ueno  <address@hidden>
 
        Fix link error on NetBSD 6.
diff --git a/tmac/doc.tmac-u b/tmac/doc.tmac-u
index 80c6b88..8b351b4 100644
--- a/tmac/doc.tmac-u
+++ b/tmac/doc.tmac-u
@@ -3126,7 +3126,7 @@
 .
 .  \" avoid a warning message in case e.g. `-offset' has no parameter
 .  nr doc-reg-dBla (\n[doc-arg-ptr] + 1)
-.  if !d doc-arg\n[doc-reg-dBla] \
+.  if (\n[doc-arg-limit] < \n[doc-reg-dBla]) \
 .    ds doc-arg\n[doc-reg-dBla]
 .
 .  nr doc-reg-dBla 1