More care in final status reporting.

Printing "Added 1 new messages" just looks like lack of attention
to detail, (but yes plurals can be annoying this way).

diff --git a/notmuch.c b/notmuch.c
index d4e0745369b57b82069260c8ffd2a45b088a476b..581cc4c0cbfe52b61d1cd860e950e3e474f7d138 100644 (file)
--- a/notmuch.c
+++ b/notmuch.c
@@ -447,8 +447,12 @@ setup_command (int argc, char *argv[])
     } else {
        printf (".                    \n");
     }
     } else {
        printf (".                    \n");
     }

-    printf ("Added %d unique messages to the database.\n\n",
-           add_files_state.added_messages);
+    if (add_files_state.added_messages) {
+       printf ("Added %d %s to the database.\n\n",
+               add_files_state.added_messages,
+               add_files_state.added_messages == 1 ?
+               "message" : "unique messages");
+    }

 
     printf ("When new mail is delivered to %s in the future,\n"
            "run \"notmuch new\" to add it to the database.\n",
 
     printf ("When new mail is delivered to %s in the future,\n"
            "run \"notmuch new\" to add it to the database.\n",


@@ -507,8 +511,10 @@ new_command (int argc, char *argv[])
        }
     }
     if (add_files_state.added_messages) {
        }
     }
     if (add_files_state.added_messages) {

-       printf ("Added %d new messages to the database (not much, really).\n",
-               add_files_state.added_messages);
+       printf ("Added %d new %s to the database (not much, really).\n",
+               add_files_state.added_messages,
+               add_files_state.added_messages == 1 ?
+               "message" : "messages");

     } else {
        printf ("No new mail---and that's not much!\n");
     }
     } else {
        printf ("No new mail---and that's not much!\n");
     }