mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-07 06:50:23 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/isearch.el (isearch-emoji-by-name): Disable derived emoji (bug#60740).

Browse source 
Let-bind emoji--derived to nil to avoid the subsequent selection
of derived emoji that fails in transient.el.
This commit is contained in:
Juri Linkov 2023-01-30 19:39:33 +02:00
parent 86b03046c0
commit 2f3683cd4d
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/isearch.el
View file

@ -2774,6 +2774,7 @@ With argument, add COUNT copies of the character."
(mapconcat 'isearch-text-char-description (mapconcat 'isearch-text-char-description
string "")))))))) string ""))))))))
(defvar emoji--derived)
(defun isearch-emoji-by-name (&optional count) (defun isearch-emoji-by-name (&optional count)
"Read an Emoji name and add it to the search string COUNT times. "Read an Emoji name and add it to the search string COUNT times.
COUNT (interactively, the prefix argument) defaults to 1. COUNT (interactively, the prefix argument) defaults to 1.
@ -2782,7 +2783,13 @@ The command accepts Unicode names like \"smiling face\" or
(interactive "p") (interactive "p")
(with-isearch-suspended (with-isearch-suspended
(let ((emoji (with-temp-buffer (let ((emoji (with-temp-buffer
(emoji-search) ;; Derived emoji not supported yet (bug#60740).
;; So first load `emoji--labels', then `emoji--init'
;; will not fill `emoji--derived' that is set
;; to an empty hash table below.
(ignore-errors (require 'emoji-labels))
(let ((emoji--derived (make-hash-table :test #'equal)))
(emoji-search))
(if (and (integerp count) (> count 1)) (if (and (integerp count) (> count 1))
(apply 'concat (make-list count (buffer-string))) (apply 'concat (make-list count (buffer-string)))
(buffer-string))))) (buffer-string)))))