* net/eww.el (eww-display-html): Ignore coding system errors.

One web site uses "utf-8lias" as the coding system.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac360a3e422241fa1466681ca21e7f0fe3b24b79..48b31a2d06dc19be96ff8539e59c45ee0c10cf4e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * net/eww.el (eww-display-html): Ignore coding system errors.  One
+       web site uses "utf-8lias" as the coding system.
+
 2013-08-11  Juanma Barranquero  <lekktu@gmail.com>
 
        * frameset.el (frameset-valid-p): Fix check; STATES can indeed be nil.

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 70c11c3201f361f7be3eee026a6d329dc163a395..a689ff2ae9f945e90874600262f532dee8b8a137 100644 (file)
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -199,7 +199,9 @@ word(s) will be searched for via `eww-search-prefix'."
 
 (defun eww-display-html (charset url)
   (unless (eq charset 'utf8)
-    (decode-coding-region (point) (point-max) charset))
+    (condition-case nil
+       (decode-coding-region (point) (point-max) charset)
+      (coding-system-error nil)))
   (let ((document
         (list
          'base (list (cons 'href url))