From: Lars Magne Ingebrigtsen Date: Sun, 23 Nov 2014 16:00:55 +0000 (+0100) Subject: * net/eww.el (eww-display-html): Decode the document-defined charset. X-Git-Tag: emacs-25.0.90~2635^2~362 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7f902e70b57f3a49ccfbcb52b0e438163b3d760c;p=emacs.git * net/eww.el (eww-display-html): Decode the document-defined charset. --- 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 + + * net/eww.el (eww-display-html): Decode the document-defined charset. + 2014-11-23 Ivan Shmakov * 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)