(read-char-by-name): Adhere to changes in 'completions-group'

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 700e48fe29cb0eca4840ae11183de5beb9fce0d3..5207bf5a3b9d923b82622b9792192a13d303e7a9 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -3316,7 +3316,6 @@ Optional arg ALLOW-SINGLE non-nil means to additionally allow
 single characters to be treated as standing for themselves."
   (let* ((sort-fun (when (eq read-char-by-name-sort 'code)
                     #'mule--ucs-names-sort-by-code))
-         (group-fun (when completions-group #'mule--ucs-names-group))
         (input
           (minibuffer-with-setup-hook
               (lambda ()
@@ -3329,11 +3328,13 @@ single characters to be treated as standing for themselves."
            (completing-read
             prompt (completion-table-with-metadata
                      (ucs-names)
-                     `((sort-function   . ,sort-fun)
-                       (affixation-function . ,#'mule--ucs-names-affixation)
-                       (narrow-completions-function . ,#'mule--ucs-names-narrow)
-                      (group-function . ,group-fun)
-                      (category . unicode-name))))))
+                     (lambda (&rest _)
+                       `((sort-function   . ,sort-fun)
+                         (affixation-function . ,#'mule--ucs-names-affixation)
+                         (narrow-completions-function . ,#'mule--ucs-names-narrow)
+                        (category . unicode-name)
+                         . ,(when completions-group
+                              '((group-function . mule--ucs-names-group)))))))))
         (char
           (cond
            ((char-from-name input t))