From ff2832024ce5363103365c0caff85e75e4590b83 Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Wed, 11 Apr 2012 11:09:16 +0200 Subject: [PATCH] Merged man pages next(1) and prev(1) into show(1). --- man/next.man1 | 93 +-------------------------------------------------------- man/prev.man1 | 92 +------------------------------------------------------- man/show.man1 | 91 +++++++++++++++++++++++++++++++++++-------------------- 3 files changed, 60 insertions(+), 216 deletions(-) diff --git a/man/next.man1 b/man/next.man1 index 2b44d9f..b756c04 100644 --- a/man/next.man1 +++ b/man/next.man1 @@ -1,92 +1 @@ -.\" -.\" %nmhwarning% -.\" -.TH NEXT %manext1% "%nmhdate%" MH.6.8 [%nmhversion%] -.SH NAME -next \- show the next message -.SH SYNOPSIS -.HP 5 -.na -.B next -.RI [ +folder ] -.RB [\-showproc -.IR program ] -.RB [ \-showmimeproc -.IR program ] -.RB [ \-header " | " \-noheader ] -.RB [ \-checkmime " | " \-nocheckmime ] -[switches\ for -.I showproc -or -.IR showmimeproc ] -.RB [ \-version ] -.RB [ \-help ] -.ad -.SH DESCRIPTION -.B Next -performs a -.B show -on the next message in the specified -(or current) folder. Like -.BR show , -it passes any switches on to -the program -.I showproc -or -.IR showmimeproc , -which is called to list -the message. This command is almost exactly equivalent to -.RB \*(lq show -.BR next \*(rq. -Consult the manual entry for -.BR show (1) -for all the -details. - -.SH FILES -.fc ^ ~ -.nf -.ta \w'%etcdir%/ExtraBigFileName 'u -^$HOME/.mmh/profile~^The user profile -.fi - -.SH "PROFILE COMPONENTS" -.fc ^ ~ -.nf -.ta 2.4i -.ta \w'ExtraBigProfileName 'u -^Path:~^To determine the user's mail storage -^Current\-Folder:~^To find the default current folder -.fi - -.SH "SEE ALSO" -show(1), prev(1), mhshow(1) - -.SH DEFAULTS -.nf -.RB ` +folder "' defaults to the current folder" -.RB ` \-checkmime ' -.RB ` \-header ' - -.SH CONTEXT -If a folder is specified, it will become the current folder. The message -that is shown (i.e., the next message in sequence) will become the -current message. - -.SH BUGS -.B next -is really a link to the -.B show -program. As a result, if -you make a link to -.B next -and that link is not called -.BR next , -your link will act like -.B show -instead. To circumvent this, add a -profile\-entry for the link to your -.B nmh -profile and add the argument -.I next -to the entry. +.so man1/show.1 diff --git a/man/prev.man1 b/man/prev.man1 index 06464d4..b756c04 100644 --- a/man/prev.man1 +++ b/man/prev.man1 @@ -1,91 +1 @@ -.\" -.\" %nmhwarning% -.\" -.TH PREV %manext1% "%nmhdate%" MH.6.8 [%nmhversion%] -.SH NAME -prev \- show the previous message -.SH SYNOPSIS -.HP 5 -.na -.B prev -.RI [ +folder ] -.RB [\-showproc -.IR program ] -.RB [ \-showmimeproc -.IR program ] -.RB [ \-header " | " \-noheader ] -.RB [ \-checkmime " | " \-nocheckmime ] -[switches\ for -.I showproc -or -.IR showmimeproc ] -.RB [ \-version ] -.RB [ \-help ] -.ad -.SH DESCRIPTION -.B Prev -performs a -.B show -on the previous message in the specified -(or current) folder. Like -.BR show , -it passes any switches on to -the program named by -.I showproc -or -.IR showmimeproc , -which is called -to list the message. This command is almost exactly equivalent to -.RB \*(lq "show prev" \*(rq. -Consult the manual entry for -.BR show (1) -for all the details. - -.SH FILES -.fc ^ ~ -.nf -.ta \w'%etcdir%/ExtraBigFileName 'u -^$HOME/.mmh/profile~^The user profile -.fi - -.SH "PROFILE COMPONENTS" -.fc ^ ~ -.nf -.ta 2.4i -.ta \w'ExtraBigProfileName 'u -^Path:~^To determine the user's mail storage -^Current\-Folder:~^To find the default current folder -.fi - -.SH "SEE ALSO" -show(1), next(1), mhshow(1) - -.SH DEFAULTS -.nf -.RB ` +folder "' defaults to the current folder" -.RB ` \-checkmime ' -.RB ` \-header ' -.fi - -.SH CONTEXT -If a folder is specified, it will become the current folder. The message -that is shown (i.e., the previous message in sequence) will become the -current message. - -.SH BUGS -.B prev -is really a link to the -.B show -program. As a result, if -you make a link to -.B prev -and that link is not called -.BR prev , -your link will act like -.B show -instead. To circumvent this, add a -profile\-entry for the link to your -.B nmh -profile and add the argument -.B prev -to the entry. +.so man1/show.1 diff --git a/man/show.man1 b/man/show.man1 index 047baf5..b467122 100644 --- a/man/show.man1 +++ b/man/show.man1 @@ -4,6 +4,10 @@ .TH SHOW %manext1% "%nmhdate%" MH.6.8 [%nmhversion%] .SH NAME show \- show (display) messages +.PP +next \- show the next message +.PP +prev \- show the previous message .SH SYNOPSIS .HP 5 .na @@ -22,11 +26,29 @@ or .IR showmimeproc ] .RB [ \-version ] .RB [ \-help ] +.PP +.HP 5 +.B next +is equivalent to +.B show n +.PP +.HP 5 +.B prev +is equivalent to +.B show p .ad + .SH DESCRIPTION .B Show lists each of the specified messages to the standard output (typically, the terminal). +.B Next +and +.B prev +perform a +.B show +on the next or previous message in the specified +(or current) folder, respectively. .PP By default, text (non-MIME) messages are filtered and displayed by the @@ -52,8 +74,7 @@ will cause the .B more program to list the messages with no reformatting. .PP -By default, non-text messages (MIME messages with multi-media -contents) are processed and displayed by the +By default, MIME messages are processed and displayed by the .B nmh command .BR mhshow . @@ -70,31 +91,18 @@ default, use the .I program switch. .PP -Note that in some cases, +Note that, .B show -may invoke the +will invoke the .I showmimeproc -even for textual contents. This will happen for text messages that -specify a transfer encoding (such as MIME quoted-printable or -base64) or specify a character set that -.B show -doesn't believe -can be displayed natively. The environment variable -.B $MM_CHARSET -should be set to the terminal's native character set to avoid -gratuitous invocations of the -.IR showmimeproc . -See the -.BR mh-profile (5) -man page for details about this environment variable. +even for textual contents if the message has a MIME-Version header. .PP The option .B \-checkmime (set by default) instructs .B show -to -test if any of the messages to be displayed are non-text (MIME) -messages. If any are non-text, they are displayed by the +to check if any of the messages contains a MIME-Version header. +If so, they are displayed by the .IR showmimeproc , else they are displayed by the .BR showproc . @@ -105,7 +113,7 @@ disables this test and instructs to use .IR showproc , regardless of whether -any of the messages are non-text (MIME) messages. +any of the messages are MIME messages. .PP The .B \-header @@ -115,18 +123,10 @@ to display a one\-line description of the message being shown. This description includes the folder and the message number. .PP -If no `msgs' are specified, the current message is used. Although -it depends on the specific -.I showproc -or -.IR showmimeproc , -in the default setup when more than one message is specified, you -will be prompted for a prior to listing each message. -Each message will be listed a page at a time, and when the end of -page is reached, the program will wait for a or . -If a is entered, it will print the next line, whereas - will print the next screenful. +If no `msgs' are specified, the current message is used. .PP +If the standard output is a terminal, output will be piped through +a pager. If the standard output is not a terminal, no queries are made, and each file is listed with a one\-line header and two lines of separation. @@ -155,7 +155,7 @@ from each sequence named by the profile entry. .fi .SH "SEE ALSO" -mhl(1), mhshow(1), more(1), next(1), prev(1), scan(1) +mhl(1), mhshow(1), more(1), scan(1) .SH DEFAULTS .nf @@ -224,3 +224,28 @@ For users of .RS 5 show 2>&1 | imprint & .RE +.PP +.B Next +and +.B prev +are really links to the +.B show +program. As a result, if +you make a link to +.B next +or +.B prev +and that link is not called +.B next +or +.BR prev , +your link will act like +.B show +instead. To circumvent this, add a +profile\-entry for the link to your +.B nmh +profile and add the argument +.I n +or +.I p +to the entry. -- 1.7.10.4