; Complete merge of emoji.el
* lisp/international/emoji.el (emoji-list): Import changes from emacs-29.
This commit is contained in:
parent
1737ffd3a8
commit
354a2958f9
1 changed files with 5 additions and 3 deletions
|
@ -156,11 +156,11 @@ and also consults the `emoji-alternate-names' alist."
|
|||
|
||||
;;;###autoload
|
||||
(defun emoji-list ()
|
||||
"List emojis and insert the one that's selected.
|
||||
"List emojis and allow selecting and inserting one of them.
|
||||
Select the emoji by typing \\<emoji-list-mode-map>\\[emoji-list-select] on its picture.
|
||||
The glyph will be inserted into the buffer that was current
|
||||
when the command was invoked."
|
||||
(interactive "*")
|
||||
(interactive)
|
||||
(let ((buf (current-buffer)))
|
||||
(emoji--init)
|
||||
(switch-to-buffer (get-buffer-create "*Emoji*"))
|
||||
|
@ -273,7 +273,9 @@ the name is not known."
|
|||
(let ((buf emoji--insert-buffer))
|
||||
(quit-window)
|
||||
(if (buffer-live-p buf)
|
||||
(switch-to-buffer buf)
|
||||
(progn
|
||||
(switch-to-buffer buf)
|
||||
(barf-if-buffer-read-only))
|
||||
(error "Buffer disappeared")))
|
||||
(let ((derived (gethash glyph emoji--derived)))
|
||||
(if derived
|
||||
|
|
Loading…
Add table
Reference in a new issue