From 87197050230ea195e7be326324f2864a1f94d442 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Sun, 21 Apr 2019 23:51:21 +0000
Subject: When calling an empty macro, do not clobber existing arguments.
 Fixing a bug found with the groffer(1) version 1.19 manual page following a
 report from Jan Stary.

---
 regress/roff/de/Makefile        |  6 +++---
 regress/roff/de/empty.in        | 18 ++++++++++++++++++
 regress/roff/de/empty.out_ascii |  9 +++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 regress/roff/de/empty.in
 create mode 100644 regress/roff/de/empty.out_ascii

(limited to 'regress/roff/de')

diff --git a/regress/roff/de/Makefile b/regress/roff/de/Makefile
index 0d4d203f..a68656ce 100644
--- a/regress/roff/de/Makefile
+++ b/regress/roff/de/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.12 2019/02/06 20:54:28 schwarze Exp $
+# $OpenBSD: Makefile,v 1.13 2019/04/21 23:45:50 schwarze Exp $
 
-REGRESS_TARGETS	 = append cond escname factorial indir infinite startde tab
-REGRESS_TARGETS	+= TH Dd
+REGRESS_TARGETS	 = append cond empty escname factorial
+REGRESS_TARGETS	+= indir infinite startde tab TH Dd
 LINT_TARGETS	 = escname indir infinite
 
 # groff-1.22.4 defect:
diff --git a/regress/roff/de/empty.in b/regress/roff/de/empty.in
new file mode 100644
index 00000000..dc5e1c93
--- /dev/null
+++ b/regress/roff/de/empty.in
@@ -0,0 +1,18 @@
+.\" $OpenBSD: empty.in,v 1.1 2019/04/21 23:45:50 schwarze Exp $
+.Dd $Mdocdate$
+.Dt DE-EMPTY 1
+.Os
+.Sh NAME
+.Nm de-empty
+.Nd empty user-defined macro with arguments
+.Sh DESCRIPTION
+initial text
+.de empty
+..
+.de real
+arg=\\$1
+.empty wrong
+arg=\\$1
+..
+.real right
+final text
diff --git a/regress/roff/de/empty.out_ascii b/regress/roff/de/empty.out_ascii
new file mode 100644
index 00000000..1883fd3e
--- /dev/null
+++ b/regress/roff/de/empty.out_ascii
@@ -0,0 +1,9 @@
+DE-EMPTY(1)                 General Commands Manual                DE-EMPTY(1)
+
+NNAAMMEE
+     ddee--eemmppttyy - empty user-defined macro with arguments
+
+DDEESSCCRRIIPPTTIIOONN
+     initial text arg=right arg=right final text
+
+OpenBSD                         April 21, 2019                         OpenBSD
-- 
cgit