X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-tag.c;h=6204ae3cefcaddb78051a8b5955ec642db596b08;hp=53f08f43dc1019a9f8ada6e905dc1d36f5c43d5c;hb=191c4ae693c35ecd9e905e64c7619734171c4a8a;hpb=4cfb2a02778bac16e785bbea1fd6c665e34bd955

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 53f08f43..6204ae3c 100644
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -25,10 +25,8 @@ static volatile sig_atomic_t interrupted;
 static void
 handle_sigint (unused (int sig))
 {
-    ssize_t ignored;
-
     static char msg[] = "Stopping...         \n";
-    ignored = write(2, msg, sizeof(msg)-1);
+    write(2, msg, sizeof(msg)-1);
     interrupted = 1;
 }
 
@@ -45,6 +43,7 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
     notmuch_messages_t *messages;
     notmuch_message_t *message;
     struct sigaction action;
+    notmuch_bool_t synchronize_flags;
     int i;
 
     /* Setup our handler for SIGINT */
@@ -100,8 +99,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_synchronize_flags (config));
+
+    synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);
 
     query = notmuch_query_create (notmuch, query_string);
     if (query == NULL) {
@@ -129,6 +128,9 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[]))
 
 	notmuch_message_thaw (message);
 
+	if (synchronize_flags)
+	    notmuch_message_tags_to_maildir_flags (message);
+
 	notmuch_message_destroy (message);
     }