fmt_scan() no longer subtracts 1 from the width. This has the effect

[nmh] / test / dist / test-dist

diff --git a/test/dist/test-dist b/test/dist/test-dist
index 19ba6406f9ab5ade8404df5648eaf599b7fd9206..0d0d7b04361ca59e3f80fa4500176a2bf56f85d8 100755 (executable)
--- a/test/dist/test-dist
+++ b/test/dist/test-dist
@@ -366,7 +366,7 @@ This is message number 1
 EOF
 
 test_dist 1 -noedit -to somebody@example.com -fcc outbox
-run_test 'scan +outbox -width 6' '   1 '
+run_test 'scan +outbox -width 6' '   1  '
 
 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
@@ -382,13 +382,14 @@ This is message number 1
 EOF
 
 test_dist +inbox 1 -noedit -to somebody@example.com -fcc +outbox
-run_test 'scan +outbox -width 6 2' '   2 '
+run_test 'scan +outbox -width 6 2' '   2  '
 
 #
 # Check that dist encodes headers using RFC-2047 properly
 #
 
-export LC_ALL=en_US.UTF-8
+require_locale en_US.utf-8 en_US.utf8
+LC_ALL=en_US.UTF-8; export LC_ALL
 
 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>