X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-tag.c;h=130de6343f8ec42bac91c7b6114e83ab2a4f854c;hb=23819e82d061502fce8d3876f3e606aa56ca6ea0;hp=c020cb6f40b8ad3677aac9fa6104ef3d4aba78b6;hpb=6cdd34a4c762c954426f586d514a3e041c1db3b0;p=notmuch

diff --git a/notmuch-tag.c b/notmuch-tag.c
index c020cb6f..130de634 100644
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
@@ -121,7 +121,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
     /* tagging is not interested in any special sort order */
     notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED);
 
-    status = notmuch_query_search_messages_st (query, &messages);
+    status = notmuch_query_search_messages (query, &messages);
     if (print_status_query ("notmuch tag", query, status))
 	return status;
 
@@ -235,10 +235,8 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])
     if (batch) {
 	if (opt_index != argc) {
 	    fprintf (stderr, "Can't specify both cmdline and stdin!\n");
-	    return EXIT_FAILURE;
-	}
-	if (remove_all) {
-	    fprintf (stderr, "Can't specify both --remove-all and --batch\n");
+	    if (input)
+		fclose (input);
 	    return EXIT_FAILURE;
 	}
     } else {