diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2014-11-11 02:43:12 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2014-11-11 02:43:12 +0000 |
| commit | b2f36b215434934de935260f79a7aca28d07e259 (patch) | |
| tree | 2281e901479b3cd52b0bf3cf6ddf4720d7ff29b9 /usr.bin | |
| parent | 2783e2022814c64b24e5ff04b3bee5007504677d (diff) | |
Let -h imply -c (that is, not use the pager).
Usually, -h output is short, so the pager is just a nuisance.
Also, traditional man(1) does not use a pager for -h.
Triggered by a remark of deraadt@ on ICB.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/mandoc/main.c | 3 | ||||
| -rw-r--r-- | usr.bin/mandoc/man.1 | 8 | ||||
| -rw-r--r-- | usr.bin/mandoc/mandoc.1 | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/usr.bin/mandoc/main.c b/usr.bin/mandoc/main.c index f6420c4b621..4c943cc04b1 100644 --- a/usr.bin/mandoc/main.c +++ b/usr.bin/mandoc/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.105 2014/11/11 02:08:57 schwarze Exp $ */ +/* $OpenBSD: main.c,v 1.106 2014/11/11 02:43:11 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -173,6 +173,7 @@ main(int argc, char *argv[]) case 'h': (void)strlcat(curp.outopts, "synopsis,", BUFSIZ); synopsis_only = 1; + use_pager = 0; outmode = OUTMODE_ALL; break; case 'I': diff --git a/usr.bin/mandoc/man.1 b/usr.bin/mandoc/man.1 index e78a385a8a8..5b153be553a 100644 --- a/usr.bin/mandoc/man.1 +++ b/usr.bin/mandoc/man.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: man.1,v 1.4 2014/10/30 00:05:02 schwarze Exp $ +.\" $OpenBSD: man.1,v 1.5 2014/11/11 02:43:11 schwarze Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -31,7 +31,7 @@ .\" .\" @(#)man.1 8.2 (Berkeley) 1/2/94 .\" -.Dd $Mdocdate: October 30 2014 $ +.Dd $Mdocdate: November 11 2014 $ .Dt MAN 1 .Os .Sh NAME @@ -98,7 +98,9 @@ options. .It Fl h Display only the SYNOPSIS lines of the requested manual pages. Implies -.Fl a . +.Fl a +and +.Fl c . .It Fl k A synonym for .Xr apropos 1 . diff --git a/usr.bin/mandoc/mandoc.1 b/usr.bin/mandoc/mandoc.1 index 931d4b31da4..fc416a33c0a 100644 --- a/usr.bin/mandoc/mandoc.1 +++ b/usr.bin/mandoc/mandoc.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mandoc.1,v 1.65 2014/10/30 15:05:05 jmc Exp $ +.\" $OpenBSD: mandoc.1,v 1.66 2014/11/11 02:43:11 schwarze Exp $ .\" .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> .\" Copyright (c) 2012, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: October 30 2014 $ +.Dd $Mdocdate: November 11 2014 $ .Dt MANDOC 1 .Os .Sh NAME @@ -89,7 +89,7 @@ macro. .It Fl h Display only the SYNOPSIS lines. Implies -.Fl a . +.Fl c . .It Fl K Ns Ar encoding Specify the input encoding. The supported |