[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. a395a8839181b9895fdd0cafdb40be35675ced48

[Ken Hornstein]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, master has been updated
       via  a395a8839181b9895fdd0cafdb40be35675ced48 (commit)
      from  93bd0519e7383755a82da4aeff3e1e368f048525 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=a395a8839181b9895fdd0cafdb40be35675ced48


commit a395a8839181b9895fdd0cafdb40be35675ced48
Author: Ken Hornstein <address@hidden>
Date:   Thu Jan 5 12:05:43 2012 -0500

    Bring in all of the mh-e support that is actually used to be compiled by
    default, and garbage collect the stuff that is not used.

diff --git a/configure.in b/configure.in
index 9cb18fc..55e1393 100644
--- a/configure.in
+++ b/configure.in
@@ -56,17 +56,6 @@ AC_ARG_ENABLE(masquerade,
   fi], [masquerade="draft_from mmailid username_extension"])
 AC_SUBST(masquerade)dnl
 
-dnl Do you want mhe support?
-AC_ARG_ENABLE(mhe,
-  AS_HELP_STRING([--disable-mhe],[disable mhe support]))
-
-dnl mhe support is on by default, so define it unless --disable-mhe or the
-dnl deprecated, undocumented --disable-nmh-mhe are specified.
-if test x"$enable_mhe" != x"no" -a x"$enable_nmh_mhe" != x"no"; then
-  AC_DEFINE(MHE, 1,
-    [Define to compile in support for the Emacs front-end mh-e.])dnl
-fi
-
 dnl Do you want client-side support for pop?
 AC_ARG_ENABLE(pop,
   AS_HELP_STRING([--enable-pop], [enable client-side support for plain POP3]))
diff --git a/man/forw.man b/man/forw.man
index 877b49b..5b7dc6d 100644
--- a/man/forw.man
+++ b/man/forw.man
@@ -265,18 +265,13 @@ will prevent any edit from occurring.)
 The
 .B \-build
 switch is intended to be used by the Emacs mh-e interface to
-.BR nmh ,
-and is only present if
-.B nmh
-was compiled with support for mh-e. It implies
+.BR nmh .
+It implies
 .BR \-nowhatnowproc .
 It causes a file <mh\-dir>/draft
 to be created, containing the draft message that would normally be presented
 to the user for editing.
-No mail is actually sent. Note that this switch is not guaranteed to
-be present or to have the same effects in future versions of
-.BR nmh :
-it is documented here only for completeness.
+No mail is actually sent.
 .PP
 The
 .B \-file
diff --git a/man/mh-profile.man b/man/mh-profile.man
index cd47524..e5a7b52 100644
--- a/man/mh-profile.man
+++ b/man/mh-profile.man
@@ -223,21 +223,6 @@ command.
 (context, no default)
 .RE
 .PP
-.BR mhe :
-.RS 5
-If present, tells
-.B inc
-to compose an
-.I MHE
-auditfile in addition to its other tasks. 
-.I MHE
-is Brian Reid's 
-.B emacs
-front-end for
-.BR nmh .
-(profile, no default)
-.RE
-.PP
 .BR Alternate\-Mailboxes :
 address@hidden, bug-mh*
 .RS 5
diff --git a/man/repl.man b/man/repl.man
index 9f2f489..acc1c76 100644
--- a/man/repl.man
+++ b/man/repl.man
@@ -425,20 +425,14 @@ The
 .B \-build
 switch is intended to be used by the Emacs mh-e interface
 to
-.BR nmh ,
-and is only present if
-.B nmh
-was compiled with support
-for mh-e. It implies
+.BR nmh .
+It implies
 .BR \-nowhatnowproc .
 It causes a file
 .I <mh\-dir>/reply
 to be created, containing the draft message that would normally be presented
 to the user for editing.
-No mail is actually sent. Note that this switch is not guaranteed to
-be present or to have the same effects in future versions of
-.BR nmh :
-it is documented here only for completeness.
+No mail is actually sent.
 .PP
 The
 .B \-file
diff --git a/sbr/folder_read.c b/sbr/folder_read.c
index bb88659..2920448 100644
--- a/sbr/folder_read.c
+++ b/sbr/folder_read.c
@@ -99,9 +99,6 @@ folder_read (char *name)
            switch (dp->d_name[0]) {
                case '.': 
                case ',': 
-#ifdef MHE
-               case '+': 
-#endif /* MHE */
                    continue;
 
                default: 
diff --git a/uip/forw.c b/uip/forw.c
index ac0c4c5..8b5e008 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -68,11 +68,8 @@ static struct swit switches[] = {
     { "help", 0 },
 #define        FILESW                24
     { "file file", 4 },                        /* interface from msh */
-
-#ifdef MHE
 #define        BILDSW                25
     { "build", 5 },                    /* interface from mhe */
-#endif /* MHE */
 
     { NULL, 0 }
 };
@@ -132,9 +129,7 @@ main (int argc, char **argv)
     char **argp, **arguments, *msgs[MAXARGS];
     struct stat st;
 
-#ifdef MHE
     int buildsw = 0;
-#endif /* MHE */
 
 #ifdef LOCALE
     setlocale(LC_ALL, "");
@@ -186,10 +181,8 @@ main (int argc, char **argv)
                        adios (NULL, "missing argument to %s", argp[-2]);
                    nwhat = 0;
                    continue;
-#ifdef MHE
                case BILDSW:
                    buildsw++;  /* fall... */
-#endif /* MHE */
                case NWHATSW: 
                    nwhat++;
                    continue;
@@ -298,18 +291,11 @@ main (int argc, char **argv)
 
 try_it_again:
 
-#ifdef MHE
     strncpy (drft, buildsw ? m_maildir ("draft")
                          : m_draft (dfolder, NULL, NOUSE, &isdf), 
sizeof(drft));
 
     /* Check if a draft already exists */
     if (!buildsw && stat (drft, &st) != NOTOK) {
-#else
-    strncpy (drft, m_draft (dfolder, dmsg, NOUSE, &isdf), sizeof(drft));
-
-    /* Check if a draft already exists */
-    if (stat (drft, &st) != NOTOK) {
-#endif /* MHE */
        printf ("Draft \"%s\" exists (%ld bytes).", drft, (long) st.st_size);
        for (i = LISTDSW; i != YESW;) {
            if (!(argp = getans ("\nDisposition? ", isdf ? aqrnl : aqrl)))
diff --git a/uip/inc.c b/uip/inc.c
index 3dd1872..1dcba6a 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -236,10 +236,6 @@ main (int argc, char **argv)
     char *MAILHOST_env_variable;
 #endif
 
-#ifdef MHE
-    FILE *mhe = NULL;
-#endif
-
     done=inc_done;
 
 /* absolutely the first thing we do is save our privileges,
@@ -632,20 +628,6 @@ go_to_it:
 #endif /* POP */
     }
 
-#ifdef MHE
-    if (context_find ("mhe")) {
-       int i;
-       cp = concat (maildir, "/++", NULL);
-       i = stat (cp, &st);
-       if ((mhe = fopen (cp, "a")) == NULL)
-           admonish (cp, "unable to append to");
-       else
-           if (i == NOTOK)
-               chmod (cp, m_gmprot ());
-       free (cp);
-    }
-#endif /* MHE */
-
     /* Get new format string */
     nfs = new_fs (form, format, FORMAT);
 
@@ -741,10 +723,6 @@ go_to_it:
            default: 
                if (aud)
                    fputs (scanl, aud);
-# ifdef MHE
-               if (mhe)
-                   fputs (scanl, mhe);
-# endif /* MHE */
                if (noisy)
                    fflush (stdout);
                if (!packfile) {
@@ -852,10 +830,6 @@ go_to_it:
 
                if (aud)
                    fputs (scanl, aud);
-#ifdef MHE
-               if (mhe)
-                   fputs (scanl, mhe);
-#endif /* MHE */
                if (noisy)
                    fflush (stdout);
 
@@ -951,10 +925,6 @@ go_to_it:
 
                if (aud)
                    fputs (scanl, aud);
-# ifdef MHE
-               if (mhe)
-                   fputs (scanl, mhe);
-# endif /* MHE */
                if (noisy)
                    fflush (stdout);
                if (!packfile) {
@@ -995,11 +965,6 @@ go_to_it:
     if (aud)
        fclose (aud);
 
-#ifdef MHE
-    if (mhe)
-       fclose (mhe);
-#endif /* MHE */
-
     if (noisy)
        fflush (stdout);
 
diff --git a/uip/repl.c b/uip/repl.c
index d2b75df..ab8042f 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -68,11 +68,8 @@ static struct swit switches[] = {
     { "help", 0 },
 #define        FILESW                27
     { "file file", 4 },                        /* interface from msh */
-
-#ifdef MHE
 #define        BILDSW                28
     { "build", 5 },                    /* interface from mhe */
-#endif
 
     { NULL, 0 }
 };
@@ -145,9 +142,7 @@ main (int argc, char **argv)
     struct stat st;
     FILE *in;
 
-#ifdef MHE
     int buildsw = 0;
-#endif /* MHE */
 
 #ifdef LOCALE
     setlocale(LC_ALL, "");
@@ -217,10 +212,8 @@ main (int argc, char **argv)
                        adios (NULL, "missing argument to %s", argp[-2]);
                    nwhat = 0;
                    continue;
-#ifdef MHE
                case BILDSW: 
                    buildsw++;  /* fall... */
-#endif /* MHE */
                case NWHATSW: 
                    nwhat++;
                    continue;
@@ -342,18 +335,11 @@ main (int argc, char **argv)
 
 try_it_again:
 
-#ifdef MHE
     strncpy (drft, buildsw ? m_maildir ("reply")
                          : m_draft (dfolder, NULL, NOUSE, &isdf), 
sizeof(drft));
 
     /* Check if a draft exists */
     if (!buildsw && stat (drft, &st) != NOTOK) {
-#else
-    strncpy (drft, m_draft (dfolder, dmsg, NOUSE, &isdf), sizeof(drft));
-
-    /* Check if a draft exists */
-    if (stat (drft, &st) != NOTOK) {
-#endif /* MHE */
        printf ("Draft \"%s\" exists (%ld bytes).", drft, (long) st.st_size);
        for (i = LISTDSW; i != YESW;) {
            if (!(argp = getans ("\nDisposition? ", isdf ? aqrnl : aqrl)))
diff --git a/uip/rmf.c b/uip/rmf.c
index a49ba4c..563b20f 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -169,9 +169,6 @@ rmf (char *folder)
                    continue;   /* else fall */
 
            case ',': 
-#ifdef MHE
-           case '+': 
-#endif /* MHE */
 #ifdef UCI
            case '_': 
            case '#': 

-----------------------------------------------------------------------

Summary of changes:
 configure.in       |   11 -----------
 man/forw.man       |   11 +++--------
 man/mh-profile.man |   15 ---------------
 man/repl.man       |   12 +++---------
 sbr/folder_read.c  |    3 ---
 uip/forw.c         |   14 --------------
 uip/inc.c          |   35 -----------------------------------
 uip/repl.c         |   14 --------------
 uip/rmf.c          |    3 ---
 9 files changed, 6 insertions(+), 112 deletions(-)


hooks/post-receive
-- 
The nmh Mail Handling System