From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sat, 10 Jan 2015 16:54:24 +0000 (+0100)
Subject: (shr-urlify): Don't bother the user about invalidly-encoded display strings
X-Git-Tag: emacs-25.0.90~2605^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec7605b4b13776c1079a25891b82b2401a584632;p=emacs.git

(shr-urlify): Don't bother the user about invalidly-encoded display strings
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bebd09b15b..674b26716a4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* net/shr.el (shr-urlify): Don't bother the user about
+	invalidly-encoded display strings.
+
 2015-01-10  Ivan Shmakov  <ivan@siamics.net>
 
 	* net/shr.el (shr-urlify): Decode URLs before using them as titles
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index a2bad81ee44..feb934c7190 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -894,8 +894,7 @@ START, and END.  Note that START and END should be markers."
   (add-text-properties
    start (point)
    (list 'shr-url url
-	 'help-echo (let ((iri (or (with-demoted-errors
-				       "shr-urlify: %s"
+	 'help-echo (let ((iri (or (ignore-errors
 				     (decode-coding-string
 				      (url-unhex-string url)
 				      'utf-8 t))