X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-tag.c;h=3a489a97c50e2ed55edd7bdd2ba7cc46abe69441;hp=00588a11608bc0b5a8ead8d7f7e4a2bb804d403b;hb=d9d3d3e6f06a76dc0fbe24c9655b64acfcd4b9e4;hpb=e72a6176e3fc3fcf4b1696e3f0ee9cf66509fb4d

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 00588a11..3a489a97 100644
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -100,6 +100,8 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
 				     NOTMUCH_DATABASE_MODE_READ_WRITE);
     if (notmuch == NULL)
 	return 1;
+    notmuch_database_set_maildir_sync (notmuch,
+				       notmuch_config_get_maildir_sync (config));
 
     query = notmuch_query_create (notmuch, query_string);
     if (query == NULL) {
@@ -107,9 +109,12 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
 	return 1;
     }
 
+    /* tagging is not interested in any special sort order */
+    notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED);
+
     for (messages = notmuch_query_search_messages (query);
-	 notmuch_messages_has_more (messages) && !interrupted;
-	 notmuch_messages_advance (messages))
+	 notmuch_messages_valid (messages) && !interrupted;
+	 notmuch_messages_move_to_next (messages))
     {
 	message = notmuch_messages_get (messages);