[groff] 01/01: mom: Abort early with diagnostic in compat mode.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 4adf51897b2a6976c5977ab8e4ea45441bee71b2
Author: G. Branden Robinson <address@hidden>
Date:   Fri Nov 10 08:47:56 2017 -0500

    mom: Abort early with diagnostic in compat mode.
    
    Test compatibility mode register using traditional syntax.
    
    Rearrange requirement checks to go from general to specific.
    
    Tested with "groff -C -ww om.tmac-u".
    
    Fix bug https://savannah.gnu.org/bugs/?52333.
    
    Signed-off-by: Bjarni Ingi Gislason <address@hidden>
    Signed-off-by: G. Branden Robinson <address@hidden>
---
 ChangeLog             |  6 ++++++
 contrib/mom/om.tmac-u | 16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68f6d99..353ef77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-10  Bjarni Ingi Gislason <address@hidden>
+
+       mom: Abort early with diagnostic in compatibility mode.
+
+       Fix bug https://savannah.gnu.org/bugs/?52333.
+
 2017-11-10  G. Branden Robinson <address@hidden>
 
        contrib: Migrate diagnostics away from `quotes'.
diff --git a/contrib/mom/om.tmac-u b/contrib/mom/om.tmac-u
index 97f04a7..931972c 100644
--- a/contrib/mom/om.tmac-u
+++ b/contrib/mom/om.tmac-u
@@ -45,20 +45,20 @@ extensions, and float management).
 \#
 \# ====================================================================
 \#
+.if \n(.C \
+.   ab [mom]: The groff mom macros do not work in compatibility mode.
+\# Check that GNU troff is being run
+.if !\n[.g]=1 \
+.   ab [mom]: The mom macros require that you be running GNU troff.
+\# Check which version of groff is being run
+.if (\n[.x]\n[.y] < 118) \
+.   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
 .ds version 2.2-a
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
 \#
-\# Check which version of groff is being run
-.if (\n[.x]\n[.y] < 118) \
-.   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
-\# Check that GNU troff is being run
-.if !\n[.g]=1 \
-.   ab [mom]: The mom macros require that you be running GNU troff.
-.if \n[.C] \
-.   ab [mom]: The groff mom macros do not work in compatibility mode.
 \# Add supplementary styles
 .sty \n[.fp] UL      \"  Ultra Light
 .sty \n[.fp] ULI     \"  Ultra Light Italic