Render application/xhtml+xml as HTML

Fixes: debbugs:20009
* lisp/net/eww.el (eww-html-p): New function.
(eww-render): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ef010d46093393a33b71eba0d001f7259ad98095..0f905e6571113c1fa5532b7418d2e9c8af62696e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-05  Ivan Shmakov  <ivan@siamics.net>
+
+       * net/eww.el (eww-html-p): New function (bug#20009).
+       (eww-render): Use it.
+
 2015-03-05  Artur Malabarba  <bruce.connor.am@gmail.com>
 
        * desktop.el (desktop-buffer-info): Write docstring.

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 577cd41e30a5f29275d5e882394e4f68510d7a14..a128ffb9d065731b65f2e7c1c50f151ff3631d51 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -306,6 +306,12 @@ See the `eww-search-prefix' variable for the search engine used."
   (interactive "r")
   (eww (buffer-substring beg end)))
 
+(defun eww-html-p (content-type)
+  "Return non-nil if CONTENT-TYPE designates an HTML content type.
+Currently this means either text/html or application/xhtml+xml."
+  (member content-type '("text/html"
+                        "application/xhtml+xml")))
+
 (defun eww-render (status url &optional point buffer encode)
   (let ((redirect (plist-get status :redirect)))
     (when redirect
@@ -318,8 +324,7 @@ See the `eww-search-prefix' variable for the search engine used."
         (charset (intern
                   (downcase
                    (or (cdr (assq 'charset (cdr content-type)))
-                       (eww-detect-charset (equal (car content-type)
-                                                  "text/html"))
+                       (eww-detect-charset (eww-html-p (car content-type)))
                        "utf-8"))))
         (data-buffer (current-buffer)))
     ;; Save the https peer status.
@@ -332,7 +337,7 @@ See the `eww-search-prefix' variable for the search engine used."
                  (string-match-p eww-use-external-browser-for-content-type
                                  (car content-type)))
             (eww-browse-with-external-browser url))
-          ((equal (car content-type) "text/html")
+          ((eww-html-p (car content-type))
            (eww-display-html charset url nil point buffer encode))
           ((equal (car content-type) "application/pdf")
            (eww-display-pdf))