Fix describe-char-fold-equivalences for composed characters

* lisp/char-fold.el (describe-char-fold-equivalences): Map
`get-char-code-property' across all the component codepoints of the
equivalent character rather than just the first one.

diff --git a/lisp/char-fold.el b/lisp/char-fold.el
index 4e3aa058fcb301eb2af18bf16d28b8c2cb33755c..b2002826f7315137470753be0f67a15001c6bc11 100644 (file)
--- a/lisp/char-fold.el
+++ b/lisp/char-fold.el
@@ -469,13 +469,18 @@ non-canonical equivalences."
       (with-help-window (help-buffer)
         (with-current-buffer standard-output
           (if char
-              (insert (mapconcat
-                       (lambda (c)
-                         (format "%s: \?\\N{%s}\n"
-                                 c
-                                 (or (get-char-code-property (string-to-char c) 'name)
-                                     (get-char-code-property (string-to-char c) 'old-name))))
-                       equivalences))
+              (insert
+               (mapconcat
+                (lambda (c)
+                  (format "%s: %s\n"
+                          c
+                          (mapconcat
+                           (lambda (ch)
+                             (format "?\\N{%s}"
+                                     (or (get-char-code-property ch 'name)
+                                         (get-char-code-property ch 'old-name))))
+                           c)))
+                equivalences))
             (insert "A list of char-fold equivalences for `char-fold-to-regexp':\n\n")
             (setq-local bidi-paragraph-direction 'left-to-right)
             (dolist (equiv (nreverse equivalences))