From 329a8c7fcea634c197407eaa920765b757b0facb Mon Sep 17 00:00:00 2001 From: David Edmondson Date: Thu, 4 Oct 2018 10:45:45 +0100 Subject: [PATCH] emacs: Update integration with third party packages. `mm-inline-text-html-with-images' was removed from mm-decode.el in 2016 and replaced with `mm-html-inhibit-images'. `gnus-select-frame-set-input-focus' was removed from gnus-util.el in 2016 and existed only for XEmacs compatibility. --- emacs/notmuch-mua.el | 2 +- emacs/notmuch-show.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index df2ac447..e205fa4c 100644 --- 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 a0a58373..78f1af47 100644 --- 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) -- 2.43.0