Merge branch 'jh/apply-free-patch'

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 30ed4d74bb2851c1b76f343160a0e34758d580f5..b7d7100c4e5c060c1956e5d4f372fa1fa6ee8c85 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -46,7 +46,7 @@ EDITOR=:
 # /usr/xpg4/bin/sh and /bin/ksh to bail out.  So keep the unsets
 # deriving from the command substitution clustered with the other
 # ones.
-unset VISUAL EMAIL LANGUAGE $(perl -e '
+unset VISUAL EMAIL LANGUAGE COLUMNS $(perl -e '
        my @env = keys %ENV;
        my $ok = join("|", qw(
                TRACE