From ed1005482916c73de23a958db00c71b6e21d2b8c Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Mon, 7 Dec 2009 09:34:06 -0800 Subject: [PATCH] Revert "Add some very rudimentary support for handling html parts" This reverts commit ed16edc94d6a50ca86ff1575d9ea6fb9168b2e81. The performance hit is just far too severe, (threads with many HTML messages make emacs stop and pause for seconds before displaying the thread even if most of the HTML messages are entirely hidden). --- notmuch.el | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/notmuch.el b/notmuch.el index c504f46d..81035311 100644 --- a/notmuch.el +++ b/notmuch.el @@ -637,52 +637,29 @@ which this thread was originally shown." (goto-char end)))))) (forward-line)))) -(defun notmuch-show-markup-part (beg end depth mime-message) +(defun notmuch-show-markup-part (beg end depth) (if (re-search-forward notmuch-show-part-begin-regexp nil t) (progn - (if (eq mime-message nil) - (let ((filename (notmuch-show-get-filename))) - (with-temp-buffer - (insert-file-contents filename nil nil nil t) - (setq mime-message (mm-dissect-buffer))))) (forward-line) - (let ((part-beg (point-marker))) + (let ((beg (point-marker))) (re-search-forward notmuch-show-part-end-regexp) - - (let ((part-end (copy-marker (match-beginning 0)))) - (goto-char part-end) + (let ((end (copy-marker (match-beginning 0)))) + (goto-char end) (if (not (bolp)) (insert "\n")) - (indent-rigidly part-beg part-end depth) - (save-excursion - (goto-char part-beg) - (forward-line -1) - (beginning-of-line) - (let ((handle-type (mm-handle-type mime-message)) - mime-type) - (if (sequencep (car handle-type)) - (setq mime-type (car handle-type)) - (setq mime-type (car (car (cdr handle-type)))) - ) - (if (equal mime-type "text/html") - (mm-display-part mime-message)))) - - (notmuch-show-markup-citations-region part-beg part-end depth) + (indent-rigidly beg end depth) + (notmuch-show-markup-citations-region beg end depth) ; Advance to the next part (if any) (so the outer loop can ; determine whether we've left the current message. (if (re-search-forward notmuch-show-part-begin-regexp nil t) (beginning-of-line))))) - (goto-char end)) - mime-message) + (goto-char end))) (defun notmuch-show-markup-parts-region (beg end depth) (save-excursion (goto-char beg) - (let (mime-message) - (while (< (point) end) - (setq mime-message - (notmuch-show-markup-part - beg end depth mime-message)))))) + (while (< (point) end) + (notmuch-show-markup-part beg end depth)))) (defun notmuch-show-markup-body (depth match btn) "Markup a message body, (indenting, buttonizing citations, -- 2.43.0