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).
This commit is contained in:
Lars Ingebrigtsen 2021-12-19 12:46:01 +01:00
parent 276fd48176
commit 9051a93747

View file

@ -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"