Merge branch 'newlock'

diff --cc Makefile.am
index a18a7c6391f92b90d6577b3e79bc18b699250b25,074adb263eec78a2d688dcbb5ea9a090e9955143..1e64f1592c4c06f7f0c68979a41270fb1bf56aac
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -58,9 -59,10 +59,11 @@@ TESTS = test/ali/test-ali test/anno/tes
        test/inc/test-deb359167 test/inc/test-eom-align \
        test/inc/test-inc-scanout test/inc/test-msgchk \
        test/inc/test-pop \
-       test/install-mh/test-install-mh test/manpages/test-manpages \
+       test/install-mh/test-install-mh \
+       test/locking/test-datalocking test/locking/test-spoollocking \
+       test/manpages/test-manpages \
        test/mhbuild/test-forw test/mhbuild/test-utf8-body \
 +      test/mhfixmsg/test-mhfixmsg \
        test/mhlist/test-mhlist test/mhmail/test-mhmail \
        test/mhparam/test-mhparam test/mhpath/test-mhpath \
        test/mhshow/test-cte-binary test/mhshow/test-qp \

diff --cc configure.ac
Simple merge

diff --cc docs/pending-release-notes
index 899318ef4ef11a71e10ff8c45511387b7ef9ef2c,3ff8fbd909886c45538962a23c34b8c1c32147d0..e275dfa6497d2424c350a9859b569722ed3259f0
--- 1/docs/pending-release-notes
--- 2/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@@ -44,12 -44,7 +44,13 @@@ NEW FEATURE
  - A new program, fmttest(1) is included to help debug format files
  - mhshow/mhstore now have support for RFC-2017 (access-type=url) for
    external message bodies.
 +- Added -retainsequences switch to refile(1).
 +- A new program, mhfixmsg(1), is included to rewrite MIME messages with
 +  various transformations.
 +- Added -[no]rmmproc switches to rmm(1).
 +- Added support for Content-Disposition header (RFC 2183) to mhstore(1)
 +  and mhn(1) when used with -auto.
+ - All nmh commands now support transactional locking for sequence files.
  
  ----------------------------
  OBSOLETE/DEPRECATED FEATURES

diff --cc man/mh-profile.man
Simple merge

diff --cc uip/mhbuildsbr.c
Simple merge

diff --cc uip/mhcachesbr.c
Simple merge

diff --cc uip/mhstoresbr.c
Simple merge

diff --cc uip/refile.c
Simple merge

diff --cc uip/rmm.c
Simple merge