Merge branch 'release'

7 files changed, 19 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 4cdbaebd..b84bfed6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.39~rc3-1) experimental; urgency=medium
+
+  * New upstream pre-release
+
+ -- David Bremner <bremner@debian.org>  Fri, 14 Mar 2025 19:07:04 -0300
+
 notmuch (0.39~rc2-2) experimental; urgency=medium
 
   * Increase test timeout to 10m (per test script). This is currently
diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 15ba7c78..67c805a8 100644
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -760,7 +760,9 @@ The screen may be customized via `\\[customize]'.
 Complete list of currently available key bindings:
 
 \\{notmuch-hello-mode-map}"
-  (setq notmuch-buffer-refresh-function #'notmuch-hello-update))
+  (setq notmuch-buffer-refresh-function #'notmuch-hello-update)
+  (when (boundp 'untrusted-content)
+    (setq untrusted-content t)))
 
 ;;; Inserters
 
diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index a75b0f5c..74c62aaf 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -379,7 +379,9 @@ Typically this is added to `notmuch-mua-send-hook'."
 
 (define-derived-mode notmuch-message-mode message-mode "Message[Notmuch]"
   "Notmuch message composition mode. Mostly like `message-mode'."
-  (notmuch-address-setup))
+  (notmuch-address-setup)
+  (when (boundp 'untrusted-content)
+    (setq untrusted-content t)))
 
 (put 'notmuch-message-mode 'flyspell-mode-predicate 'mail-mode-flyspell-verify)
 
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 921c0ef1..8a8e6a7b 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -1696,6 +1696,8 @@ All currently available key bindings:
   (setq notmuch-buffer-refresh-function #'notmuch-show-refresh-view)
   (setq buffer-read-only t)
   (setq truncate-lines t)
+  (when (boundp 'untrusted-content)
+    (setq untrusted-content t))
   (setq imenu-prev-index-position-function
 	#'notmuch-show-imenu-prev-index-position-function)
   (setq imenu-extract-index-name-function
diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index 301ffd6e..aa0d92a7 100644
--- a/emacs/notmuch-tree.el
+++ b/emacs/notmuch-tree.el
@@ -1095,6 +1095,8 @@ Complete list of currently available key bindings:
     (hl-line-mode 1))
   (setq buffer-read-only t)
   (setq truncate-lines t)
+  (when (boundp 'untrusted-content)
+    (setq untrusted-content t))
   (when notmuch-tree-outline-enabled (notmuch-tree-outline-mode 1)))
 
 (defvar notmuch-tree-process-exit-functions nil
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 5477bf4a..29b2a9ed 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -416,6 +416,8 @@ Complete list of currently available key bindings:
   (add-to-invisibility-spec (cons 'ellipsis t))
   (setq truncate-lines t)
   (setq buffer-read-only t)
+  (when (boundp 'untrusted-content)
+    (setq untrusted-content t))
   (setq imenu-prev-index-position-function
 	#'notmuch-search-imenu-prev-index-position-function)
   (setq imenu-extract-index-name-function
diff --git a/version.txt b/version.txt
index 90a7d3ab..edb4df4e 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.39~rc2
+0.39~rc3