emacs: add invisible space after the search widget field in notmuch-hello

[notmuch] / notmuch-search.c

diff --git a/notmuch-search.c b/notmuch-search.c
index 616fe68a12f8253045a4faa973571e1303823a2f..6f04d9a45d719a37d7c17056d3a3e623560232db 100644 (file)
--- a/notmuch-search.c
+++ b/notmuch-search.c
@@ -275,6 +275,7 @@ do_search_messages (const search_format_t *format,
 {
     notmuch_message_t *message;
     notmuch_messages_t *messages;
+    notmuch_filenames_t *filenames;
     int first_message = 1;
 
     messages = notmuch_query_search_messages (query);
@@ -289,19 +290,33 @@ do_search_messages (const search_format_t *format,
     {
        message = notmuch_messages_get (messages);
 
-       if (! first_message)
-           fputs (format->item_sep, stdout);
-
        if (output == OUTPUT_FILES) {
-           format->item_id (message, "",
-                            notmuch_message_get_filename (message));
+           filenames = notmuch_message_get_filenames (message);
+
+           for (;
+                notmuch_filenames_valid (filenames);
+                notmuch_filenames_move_to_next (filenames))
+           {
+               if (! first_message)
+                   fputs (format->item_sep, stdout);
+
+               format->item_id (message, "",
+                                notmuch_filenames_get (filenames));
+
+               first_message = 0;
+           }
+           
+           notmuch_filenames_destroy( filenames );
+
        } else { /* output == OUTPUT_MESSAGES */
+           if (! first_message)
+               fputs (format->item_sep, stdout);
+
            format->item_id (message, "id:",
                             notmuch_message_get_message_id (message));
+           first_message = 0;
        }
 
-       first_message = 0;
-
        notmuch_message_destroy (message);
     }
 
@@ -380,6 +395,8 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
     int i, ret;
     output_t output = OUTPUT_SUMMARY;
 
+    argc--; argv++; /* skip subcommand argument */
+
     for (i = 0; i < argc && argv[i][0] == '-'; i++) {
        if (strcmp (argv[i], "--") == 0) {
            i++;