Merge remote-tracking branch 'origin' into convertargs

diff --cc docs/pending-release-notes
index efcdd072142a11de122d6345b54e027b67b949d7,56fe0de82a1de4ae9a0f47f1adff98beb8b57fea..334cfdd04c254923a72e9841e3bd45ab9a68f291
--- 1/docs/pending-release-notes
--- 2/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@@ -29,12 -29,13 +29,18 @@@ NEW FEATURE
    to mhfixmsg(1).
  - mhfixmsg now removes an extraneous trailing semicolon from header
    parameter lists.
 +- Added -convertargs switch to repl(1), to pass arguments to programs
 +  specified in the user's profile or mhn.defaults to convert message
 +  content.
 +- Added mhical(1), to display, reply to, and cancel iCalendar (RFC 5545)
 +  event requests.
  - added multiply format function
+ - "mhparam bindir" prints the path to the directory containing the public
+   executables (${bindir}).
+ - new "-prefer" switch for mhshow (and mhlist and mhshow), to allow specifying
+   the preferred content types to show, if present in a multipart alternative.
+ - mh-format now has %(kilo) and %(kibi) functions, to allow printing
+   numbers as, for example, "10K", or "2.3Mi"
  
  -----------------
  OBSOLETE FEATURES