Merge tag 'debian/0.28-2'

notmuch release 0.28-2 for unstable (sid) [dgit]
[dgit distro=debian]

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index df2ac4470f5200fcfb183f5c1cf01c5c84a15c24..e205fa4c92ff9ce7451e1e9c908acac101a978aa 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -306,7 +306,7 @@ modified. This function is notmuch addaptation of
          (if window
              ;; Raise the frame already displaying the message buffer.
              (progn
-               (gnus-select-frame-set-input-focus (window-frame window))
+               (select-frame-set-input-focus (window-frame window))
                (select-window window))
            (funcall switch-function buffer)
            (set-buffer buffer))

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index a0a58373aa675a330dc57c04f94bcde622a0f53e..78f1af4710a70dcc4deaa913ddd81b2bc2807781 100644 (file)
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -604,7 +604,7 @@ will return nil if the CID is unknown or cannot be retrieved."
     (unless (assq 'notmuch-show-mode w3m-cid-retrieve-function-alist)
       (push (cons 'notmuch-show-mode #'notmuch-show--cid-w3m-retrieve)
            w3m-cid-retrieve-function-alist)))
-  (setq mm-inline-text-html-with-images t))
+  (setq mm-html-inhibit-images nil))
 
 (defvar w3m-current-buffer) ;; From `w3m.el'.
 (defun notmuch-show--cid-w3m-retrieve (url &rest args)

diff --git a/test/.gitignore b/test/.gitignore
index 73fe7e24620f923826803dbaa0449e1350cd1716..69080e5e6123d75e3dec3d98e2d0d41c7f72b1a4 100644 (file)
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -9,3 +9,4 @@
 /test-results
 /ghost-report
 /tmp.*
+/message-id-parse