From de6e4036438f3ef060eeb50e41c4b03d4e45ba26 Mon Sep 17 00:00:00 2001
From: bentley <bentley@openbsd.org>
Date: Fri, 30 Jun 2017 14:42:05 +0000
Subject: [PATCH] Add mdoc(7) macros to vi's built-in lists of roff
 paragraph/section macros.

ok jmc@, no objection schwarze@
---
 usr.bin/vi/common/options.c         | 6 +++---
 usr.bin/vi/docs/USD.doc/vi.man/vi.1 | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr.bin/vi/common/options.c b/usr.bin/vi/common/options.c
index 15c9e3b5999..38ca08d7f6d 100644
--- a/usr.bin/vi/common/options.c
+++ b/usr.bin/vi/common/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.23 2017/04/18 01:45:35 deraadt Exp $	*/
+/*	$OpenBSD: options.c,v 1.24 2017/06/30 14:42:05 bentley Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -335,12 +335,12 @@ opts_init(SCR *sp, int *oargs)
 	OI(O_KEYTIME, "keytime=6");
 	OI(O_MATCHTIME, "matchtime=7");
 	OI(O_REPORT, "report=5");
-	OI(O_PARAGRAPHS, "paragraphs=IPLPPPQPP LIpplpipbp");
+	OI(O_PARAGRAPHS, "paragraphs=IPLPPPQPP LIpplpipbpBlBdPpLpIt");
 	(void)snprintf(b1, sizeof(b1), "path=%s", "");
 	OI(O_PATH, b1);
 	(void)snprintf(b1, sizeof(b1), "recdir=%s", _PATH_PRESERVE);
 	OI(O_RECDIR, b1);
-	OI(O_SECTIONS, "sections=NHSHH HUnhsh");
+	OI(O_SECTIONS, "sections=NHSHH HUnhshShSs");
 	(void)snprintf(b1, sizeof(b1),
 	    "shell=%s", (s = getenv("SHELL")) == NULL ? _PATH_BSHELL : s);
 	OI(O_SHELL, b1);
diff --git a/usr.bin/vi/docs/USD.doc/vi.man/vi.1 b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
index 02a2d9fe9fa..3f75652834d 100644
--- a/usr.bin/vi/docs/USD.doc/vi.man/vi.1
+++ b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.1,v 1.68 2017/06/20 07:32:56 bentley Exp $
+.\"	$OpenBSD: vi.1,v 1.69 2017/06/30 14:42:05 bentley Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -14,7 +14,7 @@
 .\"
 .\"     @(#)vi.1	8.51 (Berkeley) 10/10/96
 .\"
-.Dd $Mdocdate: June 20 2017 $
+.Dd $Mdocdate: June 30 2017 $
 .Dt VI 1
 .Os
 .Sh NAME
@@ -2429,7 +2429,7 @@ commands are disallowed.
 only.
 Optimize text throughput to dumb terminals.
 This option is not yet implemented
-.It Cm paragraphs , para Bq "IPLPPPQPP LIpplpipbp"
+.It Cm paragraphs , para Bq "IPLPPPQPP LIpplpipbpBlBdPpLpIt"
 .Nm vi
 only.
 Define additional paragraph boundaries for the
@@ -2470,7 +2470,7 @@ Makes the
 and
 .Cm ?\&
 commands incremental.
-.It Cm sections , sect Bq "NHSHH HUnhsh"
+.It Cm sections , sect Bq "NHSHH HUnhshShSs"
 .Nm vi
 only.
 Define additional section boundaries for the
-- 
2.20.1