Merge branch 'release'

diff --git a/NEWS b/NEWS
index 538ec168baaef0a16b666f39856312e856225020..09456f605908aa34ffa565bba68db992e494f93c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,31 @@ Vim
 
 Respect excluded tags when showing a thread.
 
+Notmuch 0.32.2 (UNRELEASED)
+===========================
+
+General
+-------
+
+Fix a bug from 2017 that can add duplicate thread-id terms to message
+documents.
+
+Emacs
+-----
+
+Add `(require 'seq)` for `seq-some`.
+
+Documentation
+-------------
+
+Fix man page build for Sphinx 4.x. Fix variable name in emacs docs.
+
+Tests
+-----
+
+Fix backup creation in `perf-test/T00-new`.  Check openssl
+prerequisite in `add_gpgsm_home`.
+
 Notmuch 0.32.1 (2021-05-15)
 ===========================
 

diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
index ae8f5140f34d2b2283bc9507b0744c6f30640700..c715532b38c4b46f5ac85dda3715d2b972d5d217 100644 (file)
--- a/emacs/notmuch-maildir-fcc.el
+++ b/emacs/notmuch-maildir-fcc.el
@@ -21,6 +21,8 @@
 
 ;;; Code:
 
+(require 'seq)
+
 (require 'message)
 
 (require 'notmuch-lib)

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 23f7c8f80aaf741cf81a8f2af249cfc05675b94b..f83f7c6aab25d8c040b25378074616a5f1167f19 100644 (file)
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -135,6 +135,8 @@ add_gnupg_home () {
 }
 
 add_gpgsm_home () {
+    test_require_external_prereq openssl
+
     local fpr
     [ -e "$GNUPGHOME/gpgsm.conf" ] && return
     _gnupg_exit () { gpgconf --kill all 2>/dev/null || true; }