1 files changed, 5 insertions, 2 deletions

diff --git a/lisp/international/textsec.el b/lisp/international/textsec.el
index db13839e90e..09337548de4 100644
--- a/lisp/international/textsec.el
+++ b/lisp/international/textsec.el
@@ -245,8 +245,11 @@ or use certain other unusual mixtures of characters."
      (lambda (char)
        (when (eq (elt idna-mapping-table char) t)
          (throw 'found
-                (format "Disallowed character: `%s' (#x%x, %s)"
-                        (bidi-string-strip-control-characters (string char))
+                (format "Disallowed character%s (#x%x, %s)"
+                        (if (eq (get-char-code-property char 'general-category)
+                                'Cf)
+                            ""
+                          (concat ": " (string char)))
                         char
                         (get-char-code-property char 'name)))))
      domain)