master 9051a93: Fix indexing gendered emoji forms that have "person" base forms

[Lars Ingebrigtsen]

branch: master
commit 9051a93747002c08ddae8e391a9b29a08d118588
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Fix indexing gendered emoji forms that have "person" base forms
    
    * lisp/international/emoji.el (emoji--base-name): Index man/woman
    on the generic form we have read already (bug#52580).
---
 lisp/international/emoji.el | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lisp/international/emoji.el b/lisp/international/emoji.el
index 1202571..d0e9068 100644
--- a/lisp/international/emoji.el
+++ b/lisp/international/emoji.el
@@ -417,10 +417,13 @@ the name is not known."
                                                base)))
     ;; If we have (for instance) "person golfing", and we're adding
     ;; "man golfing", make the latter a derivation of the former.
-    (if (or (gethash (concat "person " non-binary) derivations)
-            (gethash non-binary derivations))
-        non-binary
-      base)))
+    (cond
+     ((gethash (concat "person " non-binary) derivations)
+      (concat "person " non-binary))
+     ((gethash non-binary derivations)
+      non-binary)
+     (t
+      base))))
 
 (defun emoji--split-subgroup (subgroup)
   (let ((prefixes '("face" "hand" "person" "animal" "plant"