From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sun, 11 Aug 2013 21:51:10 +0000 (+0200)
Subject: * net/eww.el (eww-display-html): Ignore coding system errors.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~321
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e41a054bf85132cbc84bb59f4461387dcb31972;p=emacs.git

* 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 ac360a3e422..48b31a2d06d 100644
--- 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 70c11c3201f..a689ff2ae9f 100644
--- 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))