From: David Levine Date: Thu, 7 Jun 2012 03:02:21 +0000 (-0500) Subject: Removed the following environment variables, deprecated in nmh 1.5: X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=2726ac85e14391c3d78c79816eff959c560c986b;p=mmh Removed the following environment variables, deprecated in nmh 1.5: MHPOPDEBUG (use -snoop command line switch instead) MM_NOASK (use -nolist and -nopause command line switches instead) NOMHNPROC (use -nocheckmime command line switch instead) --- diff --git a/docs/pending-release-notes b/docs/pending-release-notes index 825f992..37cf3cb 100644 --- a/docs/pending-release-notes +++ b/docs/pending-release-notes @@ -1,6 +1,11 @@ Things to add to the release notes for the next full release: Backward incompatibilities: --- Changed exit status of each nmh command's -version and -help - switches from 1 to 0. +- Changed exit status of each nmh command's -version and -help + switches from 1 to 0. +- The following environment variables were deprecated in nmh 1.5 + and are removed from this release: + MHPOPDEBUG (use -snoop command line switch instead) + MM_NOASK (use -nolist and -nopause command line switches instead) + NOMHNPROC (use -nocheckmime command line switch instead) diff --git a/man/mh-profile.man b/man/mh-profile.man index 1a9201c..f08f62e 100644 --- a/man/mh-profile.man +++ b/man/mh-profile.man @@ -708,18 +708,6 @@ the environment variable to iso_8859_1). .RE .PP -.B $NOMHNPROC -.RS 5 -If this variable is set, -.B show -will next test for MIME messages. This mechanism is obsolete; -use the -.B \-nocheckmime -switch to -.B show -instead. -.RE -.PP .B $MAILDROP .RS 5 This variable tells @@ -812,21 +800,6 @@ These variables are searched, in order, for the directory in which to create some temporary files. .RE .PP -.B $MM_NOASK -.RS 5 -Setting this variable is set to 1 has the same effect as specifying -the -.B \-nolist -and -.B \-nopause -switches to -.BR mhbuild , -.BR mhn , -and -.BR mhshow . -OBSOLETE: will be removed in a future version of nmh. -.RE -.PP .B $MHLDEBUG .RS 5 If this variable is set to a non-null value, @@ -841,18 +814,6 @@ If this variable is set to a non-null value, will emit a representation of the search pattern. .RE .PP -.B $MHPOPDEBUG -.RS 5 -If this variable is set to a non-null value, -.B msgchck -and -.B inc -will display their interaction with the POP server. -This mechanism is obsolete; use the -.B \-snoop -switch instead. -.RE -.PP .B $MHWDEBUG .RS 5 If this variable is set to a non-null value, diff --git a/man/show.man b/man/show.man index d1140d8..7936e33 100644 --- a/man/show.man +++ b/man/show.man @@ -129,14 +129,6 @@ messages. It is equivalent to .IR cat . It is still accepted, but should be considered (somewhat) obsolete. .PP -If the environment variable -.B $NOMHNPROC -is set, the test for -non-text (MIME) messages will be disabled. This method is obsolete. -Use the -.B \-nocheckmime -switch instead. -.PP The .B \-header switch tells diff --git a/uip/inc.c b/uip/inc.c index 15aef0e..2f7001e 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -245,9 +245,6 @@ main (int argc, char **argv) if (pophost && *pophost) host = pophost; - if ((cp = getenv ("MHPOPDEBUG")) && *cp) - snoop++; - while ((cp = *argp++)) { if (*cp == '-') { switch (smatch (++cp, switches)) { diff --git a/uip/mhbuild.c b/uip/mhbuild.c index c612fc5..a4cce1c 100644 --- a/uip/mhbuild.c +++ b/uip/mhbuild.c @@ -256,9 +256,6 @@ main (int argc, char **argv) set_endian (); - if ((cp = getenv ("MM_NOASK")) && !strcmp (cp, "1")) - listsw = 0; - /* * Check if we've specified an additional profile */ diff --git a/uip/mhn.c b/uip/mhn.c index d8826a1..64a7fc4 100644 --- a/uip/mhn.c +++ b/uip/mhn.c @@ -431,12 +431,6 @@ do_cache: set_endian (); - if ((cp = getenv ("MM_NOASK")) && !strcmp (cp, "1")) { - nolist = 1; - listsw = 0; - pausesw = 0; - } - /* * Check if we've specified an additional profile */ diff --git a/uip/mhshow.c b/uip/mhshow.c index 3db6abd..e4eba4f 100644 --- a/uip/mhshow.c +++ b/uip/mhshow.c @@ -287,11 +287,6 @@ do_cache: set_endian (); - if ((cp = getenv ("MM_NOASK")) && !strcmp (cp, "1")) { - nolist = 1; - pausesw = 0; - } - /* * Check if we've specified an additional profile */ diff --git a/uip/msgchk.c b/uip/msgchk.c index 43ca792..3654995 100644 --- a/uip/msgchk.c +++ b/uip/msgchk.c @@ -106,9 +106,6 @@ main (int argc, char **argv) arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; - if ((cp = getenv ("MHPOPDEBUG")) && *cp) - snoop++; - while ((cp = *argp++)) { if (*cp == '-') { switch (smatch (++cp, switches)) { diff --git a/uip/mshcmds.c b/uip/mshcmds.c index b5debff..5f571b4 100644 --- a/uip/mshcmds.c +++ b/uip/mshcmds.c @@ -2273,7 +2273,7 @@ showcmd (char **args) return; seq_setprev (mp); - if (!nshow && !getenv ("NOMHNPROC")) + if (!nshow) for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) if (is_selected (mp, msgnum) && is_nontext (msgnum)) { proc = showmimeproc; diff --git a/uip/show.c b/uip/show.c index ad9b123..0b143fd 100644 --- a/uip/show.c +++ b/uip/show.c @@ -284,7 +284,7 @@ go_to_it: ; proc = catproc; } else { /* check if any messages are non-text MIME messages */ - if (checkmime && !getenv ("NOMHNPROC")) { + if (checkmime) { if (!draftsw && !file) { /* loop through selected messages and check for MIME */ for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index bb1e6b4..316c2c9 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -821,14 +821,12 @@ sendfile (char **arg, char *file, int pushsw) /* Translate MIME composition file, if necessary */ if ((cp = context_find ("automimeproc")) && (!strcmp (cp, "1")) - && !getenv ("NOMHNPROC") && check_draft (file) && (buildfile (NULL, file) == NOTOK)) return 0; /* For backwards compatibility */ if ((cp = context_find ("automhnproc")) - && !getenv ("NOMHNPROC") && check_draft (file) && (i = editfile (&cp, NULL, file, NOUSE, NULL, NULL, NULL, 0, 0))) return 0;