[Emacs-diffs] master 01/01: * net/eww.el (eww-display-html): Decode the document-defined charset.

[Lars Ingebrigtsen]

branch: master
commit 7f902e70b57f3a49ccfbcb52b0e438163b3d760c
Author: Lars Magne Ingebrigtsen <address@hidden>
Date:   Sun Nov 23 17:00:55 2014 +0100

    * net/eww.el (eww-display-html): Decode the document-defined charset.
---
 lisp/ChangeLog  |    4 ++++
 lisp/net/eww.el |    3 ++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc9f451..dd8f3ce 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-23  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * net/eww.el (eww-display-html): Decode the document-defined charset.
+
 2014-11-23  Ivan Shmakov  <address@hidden>
 
        * net/eww.el (eww-suggest-uris): New variable.
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 3ccbeb0..ba21cc8 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)