Merge branch 'base64-text-fixup'

diff --combined test/mhfixmsg/test-mhfixmsg
index 9df3f657455d3a810f256c89b6fe1eba8b4576be,6536029f4ed424e85edd8fdd5a2e35b5b1ba67da..aa8c9514e646d6e3d8096c5e5144697ef9912903
--- 1/test/mhfixmsg/test-mhfixmsg
--- 2/test/mhfixmsg/test-mhfixmsg
+++ b/test/mhfixmsg/test-mhfixmsg
@@@ -22,6 -22,7 +22,6 @@@ actual_err="$MH_TEST_DIR/test-mhfixmsg$
  #### Make sure that html-to-text conversion is what we expect.
  LC_ALL=en_US.UTF-8; export LC_ALL
  
 -set +e
  if grep mhfixmsg-format-text/html "${MH_TEST_DIR}/Mail/mhn.defaults" \
    >/dev/null; then
    can_reformat_texthtml=1
@@@ -38,6 -39,7 +38,6 @@@ els
    echo "$0: skipping -reformat check because no text browser was found"
    can_reformat_texthtml=0
  fi
 -set -e
  
  
  # check -help
@@@ -558,7 -560,7 +558,7 @@@ check "$expected" "$actual
  
  # check attempted -decode of binary text
  #### Generated the encoded text below with:
- ####   $ printf '\x0d\xbd\xb2=\xbc\n' | base64
+ ####   $ printf '\x0\xbd\xb2=\xbc\n' | base64
  cat >`mhpath new` <<EOF
  To: recipient@example.com
  From: sender@example.com
@@@ -570,13 -572,15 +570,13 @@@ Content-Type: multipart/mixed; boundary
  Content-Type: text/plain; charset="iso-8859-1"; name="square.txt"
  Content-Transfer-Encoding: base64
  
- Db2yPbwK
+ AL2yPbwK
  
  ------- =_aaaaaaaaaa0--
  EOF
  
  cp -p `mhpath last` "$expected"
 -set +e
  run_prog mhfixmsg last
 -set -e
  check `mhpath last` "$expected" 'keep first'