From: David Bremner <david@tethera.net>
Date: Thu, 1 Jun 2017 10:54:38 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.25_rc0~58
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=1ec634461ea25d87cc16dbeb1318f8e30a07c9f1;hp=-c

Merge branch 'release'
---

1ec634461ea25d87cc16dbeb1318f8e30a07c9f1
diff --combined bindings/python/notmuch/version.py
index bfdcf7ed,49bca347..6101902b
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@@ -1,3 -1,3 +1,3 @@@
  # this file should be kept in sync with ../../../version
- __VERSION__ = '0.24.1'
+ __VERSION__ = '0.24.2'
 -SOVERSION = '4'
 +SOVERSION = '5'
diff --combined notmuch-dump.c
index e451ac0c,f0ac1932..5cc3b2f6
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@@ -240,7 -240,7 +240,7 @@@ database_dump_file (notmuch_database_t 
       */
      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 dump", query, status))
  	return EXIT_FAILURE;
  
@@@ -250,7 -250,8 +250,8 @@@
  
  	message = notmuch_messages_get (messages);
  
- 	if (dump_tags_message (notmuch, message, output_format, output,
+ 	if ((include & DUMP_INCLUDE_TAGS) &&
+ 	    dump_tags_message (notmuch, message, output_format, output,
  			       &buffer, &buffer_size))
  	    return EXIT_FAILURE;