Merge branch 'release'

10 files changed, 31 insertions, 49 deletions

diff --git a/NEWS b/NEWS
index 8fb2f248..4152e7c9 100644
--- a/NEWS
+++ b/NEWS
@@ -11,24 +11,6 @@ Reply to sender
   to all. The feature is available through the new command line option
   --reply-to=(all|sender).
 
-Tag exclusion
-
-  Tags can be automatically excluded from search results by adding them
-  to the new 'search.exclude_tags' option in the Notmuch config file.
-
-  This behaviour can be overridden by explicitly including an excluded
-  tag in your query, for example:
-
-    notmuch search $your_query and tag:$excluded_tag
-
-  Existing users will probably want to run "notmuch setup" again to add
-  the new well-commented [search] section to the configuration file.
-
-  For new configurations, accepting the default setting will cause the
-  tags "deleted" and "spam" to be excluded, equivalent to running:
-
-    notmuch config set search.exclude_tags deleted spam
-
 Mail store folder/file ignore
 
    A new configuration option, `new.ignore`, lets users specify a
@@ -80,6 +62,12 @@ Attachment buttons can be used to view or save attachments.
   button 1 saves the attachment but this is customisable (option
   Notmuch Show Part Button Default Action).
 
+New functions
+
+  `notmuch-show-stash-mlarchive-link{,-and-go}' allow stashing and
+  optionally visiting a URI to the current message at one of a number
+  of Mailing List Archives.
+
 Library changes
 ---------------
 
diff --git a/debian/.gitignore b/debian/.gitignore
index 801ca02d..9f09f22d 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,3 +1,10 @@
+tmp/
+libnotmuch-dev/
+libnotmuch2/
+notmuch-emacs/
+notmuch-vim/
+notmuch/
+python-notmuch/
 *.debhelper
 *.debhelper.log
 *.substvars
diff --git a/debian/changelog b/debian/changelog
index e820f892..147ae368 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 notmuch (0.12~rc1-1) experimental; urgency=low
 
   * Upstream pre-release.
+  * Bump standards version to 3.9.3; no changes.
 
  -- David Bremner <bremner@debian.org>  Thu, 01 Mar 2012 07:51:45 -0400
 
diff --git a/debian/control b/debian/control
index b60790e2..e1ac1a70 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~),
  gdb,
  dtach (>= 0.8)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://notmuchmail.org/
 Vcs-Git: git://notmuchmail.org/git/notmuch
 Vcs-Browser: http://git.notmuchmail.org/git/notmuch
diff --git a/debian/libnotmuch2.symbols b/debian/libnotmuch2.symbols
index 507600c8..272467a3 100644
--- a/debian/libnotmuch2.symbols
+++ b/debian/libnotmuch2.symbols
@@ -46,6 +46,7 @@ libnotmuch.so.2 libnotmuch2 #MINVER#
  notmuch_messages_get@Base 0.3
  notmuch_messages_move_to_next@Base 0.3
  notmuch_messages_valid@Base 0.3
+ notmuch_query_add_tag_exclude@Base 0.12~rc1
  notmuch_query_count_messages@Base 0.3
  notmuch_query_count_threads@Base 0.10~rc1
  notmuch_query_create@Base 0.3
diff --git a/emacs/notmuch-crypto.el b/emacs/notmuch-crypto.el
index 94da325d..83e5d37a 100644
--- a/emacs/notmuch-crypto.el
+++ b/emacs/notmuch-crypto.el
@@ -101,7 +101,7 @@ mode."
       (let ((keyid (concat "0x" (plist-get sigstatus :keyid))))
 	(setq label (concat "Unknown key ID " keyid " or unsupported algorithm"))
 	(setq button-action 'notmuch-crypto-sigstatus-error-callback)
-	(setq help-msg (concat "Click to retreive key ID " keyid " from keyserver and redisplay."))))
+	(setq help-msg (concat "Click to retrieve key ID " keyid " from keyserver and redisplay."))))
      ((string= status "bad")
       (let ((keyid (concat "0x" (plist-get sigstatus :keyid))))
 	(setq label (concat "Bad signature (claimed key ID " keyid ")"))
@@ -145,7 +145,7 @@ mode."
 	(insert "\n")
 	(call-process "gpg" nil t t "--list-keys" keyid))
       (recenter -1))
-    (notmuch-show-refresh-view t)))
+    (notmuch-show-refresh-view)))
 
 (defun notmuch-crypto-insert-encstatus-button (encstatus)
   (let* ((status (plist-get encstatus :status))
diff --git a/lib/database.cc b/lib/database.cc
index 5efa85eb..8f8df1a1 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -726,6 +726,17 @@ notmuch_database_close (notmuch_database_t *notmuch)
 	}
     }
 
+    /* Many Xapian objects (and thus notmuch objects) hold references to
+     * the database, so merely deleting the database may not suffice to
+     * close it.  Thus, we explicitly close it here. */
+    if (notmuch->xapian_db != NULL) {
+	try {
+	    notmuch->xapian_db->close();
+	} catch (const Xapian::Error &error) {
+	    /* do nothing */
+	}
+    }
+
     delete notmuch->term_gen;
     delete notmuch->query_parser;
     delete notmuch->xapian_db;
diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1
index e62577cc..57eee93b 100644
--- a/man/man1/notmuch-config.1
+++ b/man/man1/notmuch-config.1
@@ -85,14 +85,6 @@ directory hierarchy.
 
 .RS 4
 .TP 4
-.B search.exclude_tags
-A list of tags that will be excluded from search results by
-default. Using an excluded tag in a query will override that
-exclusion.
-.RE
-
-.RS 4
-.TP 4
 .B maildir.synchronize_flags
 If true, then the following maildir flags (in message filenames) will
 be synchronized with the corresponding notmuch tags:
diff --git a/notmuch-config.c b/notmuch-config.c
index e9b27509..61fda3ea 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -377,8 +377,7 @@ notmuch_config_open (void *ctx,
 
     if (notmuch_config_get_search_exclude_tags (config, &tmp) == NULL) {
 	if (is_new) {
-	    const char *tags[] = { "deleted", "spam" };
-	    notmuch_config_set_search_exclude_tags (config, tags, 2);
+	    /* We do not set default search_exclude_tags for 0.12 */
 	} else {
 	    notmuch_config_set_search_exclude_tags (config, NULL, 0);
 	}
diff --git a/notmuch-setup.c b/notmuch-setup.c
index 94d0aa7b..307231d5 100644
--- a/notmuch-setup.c
+++ b/notmuch-setup.c
@@ -133,8 +133,6 @@ notmuch_setup_command (unused (void *ctx),
     int is_new;
     const char **new_tags;
     size_t new_tags_len;
-    const char **search_exclude_tags;
-    size_t search_exclude_tags_len;
 
 #define prompt(format, ...)					\
     do {							\
@@ -211,22 +209,7 @@ notmuch_setup_command (unused (void *ctx),
     }
 
 
-    search_exclude_tags = notmuch_config_get_search_exclude_tags (config, &search_exclude_tags_len);
-
-    printf ("Tags to exclude when searching messages (separated by spaces) [");
-    print_tag_list (search_exclude_tags, search_exclude_tags_len);
-    prompt ("]: ");
-
-    if (strlen (response)) {
-	GPtrArray *tags = parse_tag_list (ctx, response);
-
-	notmuch_config_set_search_exclude_tags (config,
-						(const char **) tags->pdata,
-						tags->len);
-
-	g_ptr_array_free (tags, TRUE);
-    }
-
+    /* Temporarily remove exclude tag support for 0.12 */
 
     if (! notmuch_config_save (config)) {
 	if (is_new)