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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bebd09b15b16222b941e7ed8f1b3d690e86496e..674b26716a465ec0b3c9b9bf12673ca8521ac01c 100644 (file)
--- 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 a2bad81ee44e72e1f9f05e30b114975be5427cc7..feb934c71908a30b2fe6cadd7d360151f063305d 100644 (file)
--- 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))