2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc9f4510daa..dd8f3cee186 100644
--- 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 3ccbeb0a14f..ba21cc857af 100644
--- 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)