Changed minchars swit values for -[no]concat switches to show(1)

from negative to 0, so that they can be abbreviated and so that they
appear with -help.  Added them to the man page, and fixed text that
was copied from mhshow(1) man page.

diff --git a/man/mhshow.man b/man/mhshow.man
index c2bba35c3b7569585db622fe36c2fd5984a030f1..58e2c1952c3ef6197fcf717c1669d75d0cb9663b 100644 (file)
--- a/man/mhshow.man
+++ b/man/mhshow.man
@@ -1,4 +1,4 @@
-.TH MHSHOW %manext1% "February 8, 2015" "%nmhversion%"
+.TH MHSHOW %manext1% "March 24, 2016" "%nmhversion%"

 .\"
 .\" %nmhwarning%
 .\"
 .\"
 .\" %nmhwarning%
 .\"


@@ -93,7 +93,7 @@ string representing the current folder.
 .PP
 By default
 .B mhshow
 .PP
 By default
 .B mhshow

-will concatenate all content under one pager.  If you which each part to
+will concatenate all content under one pager.  If you want each part to

 displayed separately, you can override the default behavior with
 .B \-noconcat.
 .PP
 displayed separately, you can override the default behavior with
 .B \-noconcat.
 .PP

diff --git a/man/show.man b/man/show.man
index 57832c3f66a75a5012b324fd899cf56ef640ae03..2e9169aa51315cbf31101df5417bfd5a8128a2b7 100644 (file)
--- a/man/show.man
+++ b/man/show.man
@@ -1,4 +1,4 @@
-.TH SHOW %manext1% "February 8, 2015" "%nmhversion%"
+.TH SHOW %manext1% "March 24, 2016" "%nmhversion%"

 .\"
 .\" %nmhwarning%
 .\"
 .\"
 .\" %nmhwarning%
 .\"


@@ -17,6 +17,7 @@ show \- show (display) messages
 .IR program ]
 .RB [ \-header " | " \-noheader ]
 .RB [ \-checkmime " | " \-nocheckmime ]
 .IR program ]
 .RB [ \-header " | " \-noheader ]
 .RB [ \-checkmime " | " \-nocheckmime ]

+.RB [ \-concat " | " \-noconcat ]

 [switches\ for
 .I showproc
 or
 [switches\ for
 .I showproc
 or


@@ -142,6 +143,12 @@ to display a one\-line
 description of the message being shown.  This description includes
 the folder and the message number.
 .PP
 description of the message being shown.  This description includes
 the folder and the message number.
 .PP

+By default
+.B show
+will concatenate all content under one pager.  If you want each part to
+displayed separately, you can override the default behavior with
+.B \-noconcat.
+.PP

 If no `msgs' are specified, the current message is used.  Although
 it depends on the specific
 .I showproc
 If no `msgs' are specified, the current message is used.  Although
 it depends on the specific
 .I showproc


@@ -196,6 +203,7 @@ from each sequence named by the profile entry.
 .RB ` msgs "' defaults to cur"
 .RB ` \-checkmime '
 .RB ` \-header '
 .RB ` msgs "' defaults to cur"
 .RB ` \-checkmime '
 .RB ` \-header '

+.RB ` \-concat '

 .fi
 .SH CONTEXT
 If a folder is given, it will become the current folder.  The last
 .fi
 .SH CONTEXT
 If a folder is given, it will become the current folder.  The last

diff --git a/uip/show.c b/uip/show.c
index 5b815f4e3c67824ab41f6cec007a43eb66bc6edd..32917398e409630ec707d4e2c9cc17aef1362fb1 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -32,8 +32,8 @@
     /*                         \
      * switches for mhlproc    \
      */                                \
     /*                         \
      * switches for mhlproc    \
      */                                \

-    X("concat", -6, CONCATSW) \
-    X("noconcat", -8, NCONCATSW) \
+    X("concat", 0, CONCATSW) \
+    X("noconcat", 0, NCONCATSW) \

     /*                         \
      * switches for mhshow     \
      */                                \
     /*                         \
      * switches for mhshow     \
      */                                \