[groff] 02/02: an-old.tmac: Report macro file in diagnostics.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit a2058f6ba364144d193262f4efae8941c47c7fa1
Author: G. Branden Robinson <address@hidden>
Date:   Sun Nov 4 13:54:00 2018 -0500

    an-old.tmac: Report macro file in diagnostics.
    
        * tmac/an-old.tmac: When emitting diagnostics, report the name
        of the macro file complaining.
    
        Continues the long process of fixing
        <https://savannah.gnu.org/bugs/?52463>.
    
        Also:
        + Shorten abort diagnostic when version of groff is too old, to
          keep input line length within 72 columns.
    
    Signed-off-by: G. Branden Robinson <address@hidden>
---
 ChangeLog        | 10 ++++++++++
 tmac/an-old.tmac |  8 ++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f7fc3c..88c646d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2018-11-04  G. Branden Robinson <address@hidden>
 
+       * tmac/an-old.tmac: When emitting diagnostics, report the name
+       of the macro file complaining, and the name and line number of
+       the input file at the time of trouble.  Thanks to Bjarni Ingi
+       Gislason for part of the patch.
+
+       Fixes <https://savannah.gnu.org/bugs/?54175> and continues the
+       long process of fixing <https://savannah.gnu.org/bugs/?52463>.
+
+2018-11-04  G. Branden Robinson <address@hidden>
+
        * doc/meintro_fr.me: Add encoding hint to top of file so preconv
        works correctly even if the build environment's encoding is not
        UTF-8.  Adapted from Bjarni Ingi Gislason's patch.  Also add
diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index 883a8a2..971d2cd 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -44,7 +44,10 @@
 .cp 0
 .
 .if (\n[.x]\n[.y] < 118) \
-.  ab You need GNU troff version 1.18 or higher to run this version of man!
+.  ab You need GNU troff 1.18 or higher to run this version of man!
+.
+.\" Define a string for use in diagnostic messages.
+.ds an-old an-old.tmac
 .
 .if !r D .nr D 0
 .if !r C .nr C 0
@@ -644,7 +647,8 @@
 .de1 R
 \c
 .  ie \\n[.$] \{\
-.    tm \\n[.F]: line \\n[.c]: 'R' is a string (producing the registered 
sign), not a macro.
+.    tmc \\*[an-old]: \\n[.F]: line \\n[.c]: 'R' is a string
+.    tm1 " (producing the registered sign), not a macro.
 .    nop \\$*
 .  \}
 .  el \{\