[Emacs-diffs] master ec7605b: (shr-urlify): Don't bother the user about invalidly-encoded display strings

[Lars Ingebrigtsen]

branch: master
commit ec7605b4b13776c1079a25891b82b2401a584632
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>

    (shr-urlify): Don't bother the user about invalidly-encoded display strings
---
 lisp/ChangeLog  |    5 +++++
 lisp/net/shr.el |    3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bebd09..674b267 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-10  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * net/shr.el (shr-urlify): Don't bother the user about
+       invalidly-encoded display strings.
+
 2015-01-10  Ivan Shmakov  <address@hidden>
 
        * 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 a2bad81..feb934c 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))