[groff] 08/08: [me]: Fix regression of '.nm' (#57638).

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 0c010b1c2394fdb16417c04907e34de47ffe63be
Author: George HELFFRICH <ghfbsd@gmail.com>
AuthorDate: Sun Oct 11 19:08:30 2020 +1100

    [me]: Fix regression of '.nm' (#57638).
    
    * tmac/e.tmac-u (nm): Use saved point size and font position for line
      numbering only if those registers exist.
    
    Regressed in groff 1.22.4.
    
    Fixes <https://savannah.gnu.org/bugs/index.php?57638>.
---
 ChangeLog     | 9 +++++++++
 tmac/e.tmac-u | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ca2bd48..415b419 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1539,6 +1539,15 @@
 
        Resolves <https://savannah.gnu.org/bugs/?57583>.
 
+2020-01-21  George HELFFRICH  <ghfbsd@gmail.com>
+
+       [me]: Fix regression of '.nm' (#57638).
+
+       * tmac/e.tmac-u (nm): Use saved point size and font position
+       for line numbering only if those registers exist.
+
+       Fixes <https://savannah.gnu.org/bugs/index.php?57638>.
+
 2020-01-18  Ingo Schwarze  <schwarze@openbsd.org>
 
        Accept any number of arguments for .Dd in the groff_mdoc(7)
diff --git a/tmac/e.tmac-u b/tmac/e.tmac-u
index 6728cd3..f76e7de 100644
--- a/tmac/e.tmac-u
+++ b/tmac/e.tmac-u
@@ -137,8 +137,8 @@
 \{\
 .      nr _S \\n(.s
 .      nr _F \\n(.f
-.      ps \\n[_#p]
-.      ft \\n[_#f]
+.      if r _#p .ps \\n[_#p]
+.      if r _#f .ft \\n[_#f]
 .      @# \\$1 \\$2 \\$3 \\$4
 .      ft \\n(_F
 .      ps \\n(_S