mu4e: fix toggling between html/text

mu4e/mu4e-message.el

@@ -161,32 +161,39 @@ This is equivalent to:
 (defvar mu4e~message-body-html nil
   "Whether the body text uses HTML.")
 
+
+(defun mu4e~message-use-html-p (msg prefer-html)
+  "Determine whether we want to use html or text; this is based
+on PREFER-HTML and whether the message supports the given
+representation."
+  (let* ((txt (mu4e-message-field msg :body-txt))
+	  (html (mu4e-message-field msg :body-html))
+	  (txt-len (length txt))
+	  (html-len (length html))
+	  (txt-limit (* mu4e-view-html-plaintext-ratio-heuristic txt-len))
+	  (txt-limit (if (>= txt-limit 0) txt-limit most-positive-fixnum)))
+    (cond
+      ; user prefers html --> use html if there is
+      (prefer-html (> html-len 0))
+      ;; otherwise (user prefers text) still use html if there is not enough
+      ;; text
+      ((< txt-limit html-len) t)
+      ;; otherwise, use text
+      (t nil))))
+
+
 (defun mu4e-message-body-text (msg &optional prefer-html)
   "Get the body in text form for this message.
 This is either :body-txt, or if not available, :body-html
 converted to text, using `mu4e-html2text-command' is non-nil, it
 will use that. Normally, this function prefers the text part,
 unless PREFER-HTML is non-nil."
-  (setq mu4e~message-body-html nil) ;; default
+  (setq mu4e~message-body-html (mu4e~message-use-html-p msg prefer-html))
-  (let* ((txt (mu4e-message-field msg :body-txt))
+  (let ((body
-	  (html (mu4e-message-field msg :body-html))
+	  (if mu4e~message-body-html
-	  (txtlen (length txt))
+	    ;; use an HTML body
-	  (txtlimit (* mu4e-view-html-plaintext-ratio-heuristic txtlen))
-	  (txtlimit (if (>= txtlimit 0) txtlimit most-positive-fixnum)) ;; overflow
-	  (body
-	    (cond
-	      ;; does it look like some text? ie., if the text part is more than
-	      ;; mu4e-view-html-plaintext-ratio-heuristic times shorter than the
-	      ;; html part, it should't be used
-	      ;; This is an heuristic to guard against 'This messages requires
-	      ;; html' text bodies.
-	      ((and (> txtlen 0)
-		 (or (> txtlimit (length html)) (not prefer-html)))
-		txt)
-	      ;; otherwise, it there some html?
-	      (html
 	    (with-temp-buffer
-		  (insert html)
+	      (insert (mu4e-message-field msg :body-html))
 	      (cond
 		((stringp mu4e-html2text-command)
 		  (let* ((tmp-file (mu4e-make-temp-file "html")))
@@ -199,9 +206,8 @@ unless PREFER-HTML is non-nil."
 		(t (mu4e-error "Invalid `mu4e-html2text-command'")))
 	      (setq mu4e~message-body-html t)
 	      (buffer-string))
-                )
+	    ;; use a text body
-	      (t ;; otherwise, an empty body
+	    (or (mu4e-message-field msg :body-txt) ""))))
-		""))))
     ;; and finally, remove some crap from the remaining string; it seems
     ;; esp. outlook lies about its encoding (ie., it says 'iso-8859-1' but
     ;; really it's 'windows-1252'), thus giving us these funky chars. here, we

mu4e/mu4e-view.el

@@ -254,7 +254,13 @@ found."
 		 (mu4e~view-custom-field msg field))))))
       mu4e-view-fields "")
     "\n"
-    (let ((body (mu4e-message-body-text msg mu4e-view-prefer-html)))
+    (let* ((prefer-html
+	     (cond
+	       ((eq mu4e~view-html-text 'html) t)
+	       ((eq mu4e~view-html-text 'text) nil)
+	       (t mu4e-view-prefer-html)))
+	    (body (mu4e-message-body-text msg prefer-html)))
+      (setq mu4e~view-html-text nil)
       (when (fboundp 'add-face-text-property)
         (add-face-text-property 0 (length body) 'mu4e-view-body-face t body))
       body)))
@@ -969,11 +975,16 @@ the new docid. Otherwise, return nil."
     (mu4e-view-refresh)
     (mu4e~view-hide-cited)))
 
+(defvar mu4e~view-html-text nil
+  "Should we prefer html or text just this once? A symbol `text'
+or `html' or nil.")
+
 (defun mu4e-view-toggle-html ()
   "Toggle html-display of the message body (if any)."
   (interactive)
-  (let ((mu4e-view-prefer-html (not mu4e~message-body-html))) 
+  (setq mu4e~view-html-text
-    (mu4e-view-refresh))) 
+    (if mu4e~message-body-html 'text 'html))
+  (mu4e-view-refresh))
 
 (defun mu4e-view-refresh ()
   "Redisplay the current message."