From 6d6cf5563fd5dc6d186f03e31f4939737e0d1110 Mon Sep 17 00:00:00 2001 From: Ralph Corderoy Date: Sun, 27 Aug 2017 10:39:11 +0100 Subject: [PATCH] pick: Remove support for MHPDEBUG environment variable. It was deprecated in 1.7, and the -debug option gives the same behaviour. --- man/mh-profile.man | 12 ------------ test/common.sh.in | 2 +- uip/pick.c | 4 ---- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/man/mh-profile.man b/man/mh-profile.man index 72ba2dc1..405ee639 100644 --- a/man/mh-profile.man +++ b/man/mh-profile.man @@ -884,18 +884,6 @@ profile (file) to be read by .BR mhstore , in addition to the mhn.defaults profile. .TP -MHPDEBUG -If this variable is set to a non-null value, -.B pick -will emit a representation of the search pattern. -MHPDEBUG -is deprecated, so support for this variable will be removed from a -future nmh release. Instead, -.B pick -now supports a -.B \-debug -switch. -.TP MHTMPDIR, TMPDIR These variables are searched, in order, for the directory in which to create some temporary files. diff --git a/test/common.sh.in b/test/common.sh.in index 45db9db3..1dbbf2cc 100644 --- a/test/common.sh.in +++ b/test/common.sh.in @@ -35,7 +35,7 @@ HOME="$MH_TEST_DIR" export HOME unset MAILDROP MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE -unset MHLDEBUG MHPDEBUG MHWDEBUG PAGER XOAUTH SMTPUTF8 +unset MHLDEBUG MHWDEBUG PAGER XOAUTH SMTPUTF8 #### Set LC_ALL in individual tests as needed. Unset these so #### that we don't depend on user's settings in other tests. unset LANG LC_ALL LC_CTYPE diff --git a/uip/pick.c b/uip/pick.c index 373fa595..596133af 100644 --- a/uip/pick.c +++ b/uip/pick.c @@ -74,10 +74,6 @@ main (int argc, char **argv) done=putzero_done; - /* Deprecated. Use -debug instead. */ - if ((cp = getenv ("MHPDEBUG")) && *cp) - ++debug; - arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; -- 2.56.0