david@tethera.net writes:

> Yet another version. Luckily we all use threaded mailreaders, right?
>

A few fixups Jani mentioned in IRC:

commit 4cbd366d3cd29b5d26b36f3744c26b0853b23437
Author: David Bremner <bremner@debian.org>
Date:   Sun Dec 9 08:49:29 2012 -0400

    remove unused sigatomic_t from notmuch-restore
    
    I guess this must be cut and paste error from Jani's notmuch-tag code

diff --git a/notmuch-restore.c b/notmuch-restore.c
index dba882b..40596a8 100644
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -23,7 +23,6 @@
 #include "tag-util.h"
 #include "string-util.h"
 
-static volatile sig_atomic_t interrupted;
 static regex_t regex;
 
 static int

commit 75b2fab1874fc9f0bab514fe832cfd85d1319877
Author: David Bremner <bremner@debian.org>
Date:   Sun Dec 9 08:47:12 2012 -0400

    enum fixup for tag-utils

diff --git a/tag-util.c b/tag-util.c
index e7233ab..eab482f 100644
--- a/tag-util.c
+++ b/tag-util.c
@@ -16,7 +16,7 @@ struct _tag_op_list_t {
     size_t size;
 };
 
-static int
+static tag_parse_status_t
 line_error (tag_parse_status_t status,
 	    const char *line,
 	    const char *format, ...)
@@ -31,7 +31,7 @@ line_error (tag_parse_status_t status,
     return status;
 }
 
-int
+tag_parse_status_t
 parse_tag_line (void *ctx, char *line,
 		tag_op_flag_t flags,
 		char **query_string,
@@ -56,7 +56,7 @@ parse_tag_line (void *ctx, char *line,
 
     /* Skip empty and comment lines. */
     if (*tok == '\0' || *tok == '#') {
-	ret = 2;
+	ret = TAG_PARSE_SKIPPED;
 	goto DONE;
     }