diff options
author | Lars Ingebrigtsen <larsi@gnus.org> | 2021-12-19 12:46:01 +0100 |
---|---|---|
committer | Lars Ingebrigtsen <larsi@gnus.org> | 2021-12-19 12:46:01 +0100 |
commit | 9051a93747002c08ddae8e391a9b29a08d118588 (patch) | |
tree | 3e671dbca720c9857fce2e3a6c51d315da8e1978 | |
parent | 276fd481767ad980b4896ecb12a28c47d8a2c749 (diff) | |
download | emacs-9051a93747002c08ddae8e391a9b29a08d118588.tar.gz |
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).
-rw-r--r-- | lisp/international/emoji.el | 11 |
1 files changed, 7 insertions, 4 deletions
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" |