Merge remote-tracking branch 'origin/release'

diff --combined NEWS
index c0ae6afe9c7b4307a15350673c0714db0f53879c,4bb4779e6ec49e7bd8b1f4041bc41f2300822978..35b57cefc2ff7eb592a4dee1928504cb8005da1f
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,11 -1,3 +1,11 @@@
 +Notmuch 0.33 (UNRELEASED)
 +=========================
 +
 +Vim
 +---
 +
 +Respect excluded tags when showing a thread.
 +
  Notmuch 0.32.1 (2021-05-15)
  ===========================
  
@@@ -101,6 -93,13 +101,13 @@@ Removed, inlined or renamed functions a
      `notmuch-sexp-eof`, `notmuch-split-content-type`, and
      `notmuch-tree-button-activate`.
  
+ Keymaps are no longer fset, which means they need to be referred to in
+ define-key directly (without quotes).  If your Emacs configuration has a
+ keybinding like:
+    (define-key 'notmuch-show-mode-map "7" 'foo)
+ you should change it to:
+    (define-key notmuch-show-mode-map "7" 'foo)
+ 
  Notmuch 0.31.4 (2021-02-18)
  ===========================