h/mts.h: Remove unused isdlm{1,2}() macros.

[nmh] / uip / inc.c

diff --git a/uip/inc.c b/uip/inc.c
index 0f7c4a0df1163283f2f999f60c86c7ad9ae15707..1dea263bbddf2647839b49ee37fa7cd16f69e03c 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -587,7 +587,7 @@ go_to_it:
     if (audfile) {
        int i;
        if ((i = stat (audfile, &st)) == NOTOK)
-           advise (NULL, "Creating Receive-Audit: %s", audfile);
+           inform("Creating Receive-Audit: %s", audfile);
        if ((aud = fopen (audfile, "a")) == NULL)
            adios (audfile, "unable to append to");
        else if (i == NOTOK)
@@ -762,15 +762,15 @@ go_to_it:
            case SCNERR:
                if (aud)
                    fputs ("inc aborted!\n", aud);
-               advise (NULL, "aborted!");      /* doesn't clean up locks! */
+               inform("aborted!");     /* doesn't clean up locks! */
                break;
 
            case SCNNUM:
-               advise (NULL, "BUG in %s, number out of range", invo_name);
+               inform("BUG in %s, number out of range", invo_name);
                break;
 
            default:
-               advise (NULL, "BUG in %s, scan() botch (%d)", invo_name, incerr);
+               inform("BUG in %s, scan() botch (%d)", invo_name, incerr);
                break;
 
            case SCNMSG:
@@ -917,7 +917,7 @@ go_to_it:
     if (inc_type == INC_FILE && Maildir == NULL) {
        if (trnflag) {
            if (stat (newmail, &st) != NOTOK && s1.st_mtime != st.st_mtime)
-               advise (NULL, "new messages have arrived!\007");
+               inform("new messages have arrived!\007");
            else {
                int newfd;
                if ((newfd = creat (newmail, 0600)) != NOTOK)
@@ -933,7 +933,7 @@ go_to_it:
     }
 
     if (msgnum == hghnum) {
-       admonish (NULL, "no messages incorporated");
+       inform("no messages incorporated, continuing...");
     } else {
        /*
         * Lock the sequence file now, and loop to set the right flags
@@ -946,7 +946,7 @@ go_to_it:
        context_replace (pfolder, folder);      /* update current folder */
 
        if ((mp2 = folder_read(folder, 1)) == NULL) {
-           admonish(NULL, "Unable to reread folder %s", folder);
+           inform("Unable to reread folder %s, continuing...", folder);
            goto skip;
        }
 
@@ -956,7 +956,7 @@ go_to_it:
 
        if (msgnum >= mp2->hghoff
                && !(mp2 = folder_realloc (mp2, mp2->lowoff, msgnum + 1))) {
-           advise (NULL, "unable to reallocate folder storage");
+           inform("unable to reallocate folder storage");
            goto skip;
        }