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

[notmuch] / notmuch.el

diff --git a/notmuch.el b/notmuch.el
index c504f46de22aa89a3a3c68faf75db530f7b7205d..8103531181386ae0fa95fde08415fca3dd24f61d 100644 (file)
--- 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,