* net/eww.el (eww-display-html): Decode the document-defined charset.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc9f4510daa7df6c75365582263bc3f59278a7f5..dd8f3cee186f7628a7d6bb1c88af03511e175564 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * net/eww.el (eww-display-html): Decode the document-defined charset.
+
 2014-11-23  Ivan Shmakov  <ivan@siamics.net>
 
        * net/eww.el (eww-suggest-uris): New variable.

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 3ccbeb0a14fdd46e86579fa1fa0ed78bbb4f3034..ba21cc857af06f8d1c40a7bfe534e92e807479c3 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -356,7 +356,8 @@ See the `eww-search-prefix' variable for the search engine used."
              (progn
                (unless (eq charset encode)
                  (condition-case nil
-                     (decode-coding-region (point) (point-max) encode)
+                     (decode-coding-region (point) (point-max)
+                                           (or encode charset))
                    (coding-system-error nil)))
                (libxml-parse-html-region (point) (point-max))))))
        (source (and (null document)