debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 10:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Add some very rudimentary support for handling html parts"

Browse source 
This reverts commit ed16edc94d.

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).
This commit is contained in:
Carl Worth 2009-12-07 09:34:06 -08:00
parent 263aeb82f0
commit ed10054829
1 changed files with 9 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
notmuch.el
View file

@ -637,52 +637,29 @@ which this thread was originally shown."
(goto-char end)))))) (goto-char end))))))
(forward-line)))) (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) (if (re-search-forward notmuch-show-part-begin-regexp nil t)
(progn (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) (forward-line)
(let ((part-beg (point-marker))) (let ((beg (point-marker)))
(re-search-forward notmuch-show-part-end-regexp) (re-search-forward notmuch-show-part-end-regexp)
(let ((end (copy-marker (match-beginning 0))))
(let ((part-end (copy-marker (match-beginning 0)))) (goto-char end)
(goto-char part-end)
(if (not (bolp)) (if (not (bolp))
(insert "\n")) (insert "\n"))
(indent-rigidly part-beg part-end depth) (indent-rigidly beg end depth)
(save-excursion (notmuch-show-markup-citations-region beg end depth)
(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)
; Advance to the next part (if any) (so the outer loop can ; Advance to the next part (if any) (so the outer loop can
; determine whether we've left the current message. ; determine whether we've left the current message.
(if (re-search-forward notmuch-show-part-begin-regexp nil t) (if (re-search-forward notmuch-show-part-begin-regexp nil t)
(beginning-of-line))))) (beginning-of-line)))))
(goto-char end)) (goto-char end)))
mime-message)
(defun notmuch-show-markup-parts-region (beg end depth) (defun notmuch-show-markup-parts-region (beg end depth)
(save-excursion (save-excursion
(goto-char beg) (goto-char beg)
(let (mime-message) (while (< (point) end)
(while (< (point) end) (notmuch-show-markup-part beg end depth))))
(setq mime-message
(notmuch-show-markup-part
beg end depth mime-message))))))
(defun notmuch-show-markup-body (depth match btn) (defun notmuch-show-markup-body (depth match btn)
"Markup a message body, (indenting, buttonizing citations, "Markup a message body, (indenting, buttonizing citations,