[PATCH 11/11] emacs: Support cid: references with shr renderer
On Thu, 01 May 2014, David Edmondson wrote: > On Mon, Apr 21 2014, Austin Clements wrote: >> +(defun notmuch-show--insert-part-text/html-shr (msg part) >> + ;; Make sure shr is loaded before we start let-binding its globals >> + (require 'shr) >> + (let ((dom (let (process-crypto notmuch-show-process-crypto) > > Missing brackets? (You let-bind both `process-crypto' and > `notmuch-show-process-crypto' as nil.) 'Doh. Thanks.
Re: [PATCH 11/11] emacs: Support cid: references with shr renderer
On Thu, 01 May 2014, David Edmondson d...@dme.org wrote: On Mon, Apr 21 2014, Austin Clements wrote: +(defun notmuch-show--insert-part-text/html-shr (msg part) + ;; Make sure shr is loaded before we start let-binding its globals + (require 'shr) + (let ((dom (let (process-crypto notmuch-show-process-crypto) Missing brackets? (You let-bind both `process-crypto' and `notmuch-show-process-crypto' as nil.) 'Doh. Thanks. ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH 11/11] emacs: Support cid: references with shr renderer
On Mon, Apr 21 2014, Austin Clements wrote: > +(defun notmuch-show--insert-part-text/html-shr (msg part) > + ;; Make sure shr is loaded before we start let-binding its globals > + (require 'shr) > + (let ((dom (let (process-crypto notmuch-show-process-crypto) Missing brackets? (You let-bind both `process-crypto' and `notmuch-show-process-crypto' as nil.)
Re: [PATCH 11/11] emacs: Support cid: references with shr renderer
On Mon, Apr 21 2014, Austin Clements wrote: +(defun notmuch-show--insert-part-text/html-shr (msg part) + ;; Make sure shr is loaded before we start let-binding its globals + (require 'shr) + (let ((dom (let (process-crypto notmuch-show-process-crypto) Missing brackets? (You let-bind both `process-crypto' and `notmuch-show-process-crypto' as nil.) ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
[PATCH 11/11] emacs: Support cid: references with shr renderer
shr has really nice support for inline image rendering, but previously we only had the hooks for w3m cid: references. --- emacs/notmuch-show.el | 41 + 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index f758091..a489279 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -745,14 +745,39 @@ (defun notmuch-show-get-mime-type-of-application/octet-stream (part) nil (defun notmuch-show-insert-part-text/html (msg part content-type nth depth button) - ;; text/html handler to work around bugs in renderers and our - ;; invisibile parts code. In particular w3m sets up a keymap which - ;; "leaks" outside the invisible region and causes strange effects - ;; in notmuch. We set mm-inline-text-html-with-w3m-keymap to nil to - ;; tell w3m not to set a keymap (so the normal notmuch-show-mode-map - ;; remains). - (let ((mm-inline-text-html-with-w3m-keymap nil)) -(notmuch-show-insert-part-*/* msg part content-type nth depth button))) + (if (eq mm-text-html-renderer 'shr) + ;; It's easier to drive shr ourselves than to work around the + ;; goofy things `mm-shr' does (like irreversibly taking over + ;; content ID handling). + (notmuch-show--insert-part-text/html-shr msg part) +;; Otherwise, let message-mode do the heavy lifting +;; +;; w3m sets up a keymap which "leaks" outside the invisible region +;; and causes strange effects in notmuch. We set +;; mm-inline-text-html-with-w3m-keymap to nil to tell w3m not to +;; set a keymap (so the normal notmuch-show-mode-map remains). +(let ((mm-inline-text-html-with-w3m-keymap nil)) + (notmuch-show-insert-part-*/* msg part content-type nth depth button + +(defun notmuch-show--insert-part-text/html-shr (msg part) + ;; Make sure shr is loaded before we start let-binding its globals + (require 'shr) + (let ((dom (let (process-crypto notmuch-show-process-crypto) + (with-temp-buffer +(insert (notmuch-get-bodypart-text msg part process-crypto)) +(libxml-parse-html-region (point-min) (point-max) + (shr-content-function +(lambda (url) + ;; shr strips the "cid:" part of URL, but doesn't + ;; URL-decode it (see RFC 2392). + (let ((cid (url-unhex-string url))) +(first (notmuch-show--get-cid-content cid) + ;; Block all external images to prevent privacy leaks and + ;; potential attacks. FIXME: If we block an image, offer a + ;; button to load external images. + (shr-blocked-images ".")) +(shr-insert-document dom) +t)) (defun notmuch-show-insert-part-*/* (msg part content-type nth depth button) ;; This handler _must_ succeed - it is the handler of last resort. -- 1.9.1
[PATCH 11/11] emacs: Support cid: references with shr renderer
shr has really nice support for inline image rendering, but previously we only had the hooks for w3m cid: references. --- emacs/notmuch-show.el | 41 + 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index f758091..a489279 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -745,14 +745,39 @@ (defun notmuch-show-get-mime-type-of-application/octet-stream (part) nil (defun notmuch-show-insert-part-text/html (msg part content-type nth depth button) - ;; text/html handler to work around bugs in renderers and our - ;; invisibile parts code. In particular w3m sets up a keymap which - ;; leaks outside the invisible region and causes strange effects - ;; in notmuch. We set mm-inline-text-html-with-w3m-keymap to nil to - ;; tell w3m not to set a keymap (so the normal notmuch-show-mode-map - ;; remains). - (let ((mm-inline-text-html-with-w3m-keymap nil)) -(notmuch-show-insert-part-*/* msg part content-type nth depth button))) + (if (eq mm-text-html-renderer 'shr) + ;; It's easier to drive shr ourselves than to work around the + ;; goofy things `mm-shr' does (like irreversibly taking over + ;; content ID handling). + (notmuch-show--insert-part-text/html-shr msg part) +;; Otherwise, let message-mode do the heavy lifting +;; +;; w3m sets up a keymap which leaks outside the invisible region +;; and causes strange effects in notmuch. We set +;; mm-inline-text-html-with-w3m-keymap to nil to tell w3m not to +;; set a keymap (so the normal notmuch-show-mode-map remains). +(let ((mm-inline-text-html-with-w3m-keymap nil)) + (notmuch-show-insert-part-*/* msg part content-type nth depth button + +(defun notmuch-show--insert-part-text/html-shr (msg part) + ;; Make sure shr is loaded before we start let-binding its globals + (require 'shr) + (let ((dom (let (process-crypto notmuch-show-process-crypto) + (with-temp-buffer +(insert (notmuch-get-bodypart-text msg part process-crypto)) +(libxml-parse-html-region (point-min) (point-max) + (shr-content-function +(lambda (url) + ;; shr strips the cid: part of URL, but doesn't + ;; URL-decode it (see RFC 2392). + (let ((cid (url-unhex-string url))) +(first (notmuch-show--get-cid-content cid) + ;; Block all external images to prevent privacy leaks and + ;; potential attacks. FIXME: If we block an image, offer a + ;; button to load external images. + (shr-blocked-images .)) +(shr-insert-document dom) +t)) (defun notmuch-show-insert-part-*/* (msg part content-type nth depth button) ;; This handler _must_ succeed - it is the handler of last resort. -- 1.9.1 ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch
