Merge

diff --git a/man/Makefile.in b/man/Makefile.in
index 2246c17..44d0b75 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -56,7 +56,7 @@ MAN1SRC = ali. anno. burst. comp. dist. flist. flists. folder. folders. \
        rcvstore. refile. repl. rmf. rmm. scan. send. sendfiles. \
        show. slocal. sortm. whatnow. whom.
 
-MAN5SRC = mh-alias. mh-format. mh-mail. mh-profile. mh-tailor.
+MAN5SRC = mh-alias. mh-format. mh-mail. mh-profile.
 
 MAN7SRC = mmh-intro. mh-chart. mh-draft. mh-sequence. 
 

diff --git a/man/mh-tailor.man5 b/man/mh-tailor.man5
deleted file mode 100644 (file)
index 097242b..0000000
--- a/man/mh-tailor.man5
+++ /dev/null
@@ -1,64 +0,0 @@
-.\"
-.\" %nmhwarning%
-.\"
-.TH MH-TAILOR %manext5% "%nmhdate%" MH.6.8 [%nmhversion%]
-.SH NAME
-mh\-tailor \- obsolete man page
-.SH DESCRIPTION
-.B "This man page is in transition state.
-.B "It's original use is gone.
-.B "Eventually it will be removed.
-.B "Until then, it contains information that have no better place yet.
-.SS "Spost's handling of From: headers
-.B spost
-will send messages by forking a
-local copy of
-.BR sendmail .
-.PP
-When a user explicitly specifies a `From:' header in a draft,
-.B nmh
-uses it
-rather than constructing its own.  However, to discourage email forgery, the
-SMTP envelope `From:' and a `Sender:' header are set to the user's real address.
-.RE
-.SS "File Locking"
-A few words on locking:
-.B nmh
-has several methods for creating locks
-on files.  When configuring
-.BR nmh ,
-you will need to decide on the
-locking style and locking directory (if any).  The first controls the
-method of locking, the second says where lock files should be created.
-.PP
-To configure
-.B nmh
-for kernel locking, use the `--with-locking=flock' configure option if
-you want to use the
-.B flock
-system call; use `--with-locking=lockf' if
-you want to use the
-.B lockf
-system call; or use `--with-locking=fcntl'
-if you want to use the
-.B fcntl
-system call for kernel-level locking.
-.PP
-Instead of kernel locking, you can configure
-.B nmh
-to use dot locking by using `--with-locking=dot'.  Dot locking
-specifies that
-a file should be created whose existence means `locked' and
-whose non-existence means `unlocked'.  The name of this file is
-constructed by appending `.lock' to the name of the file being
-locked.  If
-.B LOCKDIR
-is not specified, lock files will be created
-in the directory where the file being locked resides.  Otherwise, lock
-files will be created in the directory specified by
-.BR LOCKDIR .
-.PP
-Prior to installing
-.BR nmh ,
-you should see how locking is done at
-your site, and set the appropriate values.

diff --git a/man/mmh-intro.man7 b/man/mmh-intro.man7
index e9d0f13..3ee998e 100644 (file)
--- a/man/mmh-intro.man7
+++ b/man/mmh-intro.man7
@@ -48,7 +48,7 @@ or
 .I \&.cshrc
 in your home directory.  (Check the
 manual entry for the shell you use, in case you don't know how to
-do this.)  Run the
+do this.) Then run the
 .B mmh
 command.  If you've never used
 .B mmh
@@ -104,7 +104,7 @@ with message numbers passed as arguments, to delete specific messages.
 is used to respond to the current message (by default).
 It places you in the editor with a prototype response form.
 After completing your response, type
-.B l
+.B li
 to
 .B list
 (review) it, or
@@ -114,7 +114,7 @@ to
 it.
 .PP
 .B comp
-allows you to compose a message by putting you in the editor
+allows you to compose a fresh message by putting you in the editor
 on a prototype message form, and then lets you send it.
 .PP
 All the
@@ -199,6 +199,7 @@ commands:
 ^mhsign(1)~^\- sign or encrypt a message with gnupg
 ^mhstore(1)~^\- store contents of MIME messages into files
 ^mmh(1)~^\- initialize the mmh environment
+^mmhwrap(1)~^\- invoke mmh commands if they are not in $PATH
 ^next(1)~^\- show the next message
 ^packf(1)~^\- pack a folder into mbox format
 ^pick(1)~^\- select messages by content
@@ -223,7 +224,7 @@ commands:
 ^ap(8)~^\- parse addresses 822\-style
 ^dp(8)~^\- parse dates 822\-style
 ^fmtdump(8)~^\- decode \fImmh\fP format files
-^post(8)~^\- deliver a message
+^spost(8)~^\- deliver a message
 .fi
 .RE
 .PP
@@ -237,7 +238,6 @@ The following man pages describe file formats and concepts:
 ^mh\-format(5)~^\- format file for mmh message system
 ^mh\-mail(5)~^\- message format for mmh message system
 ^mh\-profile(5)~^\- user customization for mmh message system
-^mh\-tailor(5)~^\- mail transport customization for mmh message system
 .sp
 ^mmh(7)~^\- introduction to the mmh message system
 ^mh\-draft(7)~^\- draft folder facility
@@ -282,9 +282,9 @@ by invoking the program with the
 switch.
 .PP
 Send bug reports, comments, and suggestions to
-.I "markus schnalke <meillo@marmaro.de>
+.I <mmh@marmaro.de>
 or to
-.IR <nmh-workers@nongnu.org> .
+.IR "markus schnalke <meillo@marmaro.de>" .
 
 .SH "SEE ALSO"
 mmh(1)

diff --git a/test/runtest b/test/runtest
index 498db05..9f35ade 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -51,6 +51,7 @@ folder +inbox >/dev/null
 
 # now run the test
 set +e
+export SHELL="${SHELL:-/bin/sh}"
 /bin/sh "$1"
 return_value=$?
 set -e

diff --git a/uip/forw.c b/uip/forw.c
index 52d4179..4bb03d3 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -130,7 +130,6 @@ main(int argc, char **argv)
                                if (!(digest = *argp++) || *digest == '-')
                                        adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
-                               //mime = 0;
                                continue;
                        case ISSUESW:
                                if (!(cp = *argp++) || *cp == '-')