From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 19 Dec 2021 11:46:01 +0000 (+0100)
Subject: Fix indexing gendered emoji forms that have "person" base forms
X-Git-Tag: emacs-29.0.90~3577^2~8
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9051a93747002c08ddae8e391a9b29a08d118588;p=emacs.git

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).
---

diff --git a/lisp/international/emoji.el b/lisp/international/emoji.el
index 1202571b320..d0e906848cb 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"