procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid signaling errors in emoji.el on empty input

Browse source 
* lisp/international/emoji.el (emoji--read-emoji):  Signal
user-error on empty input.  (Bug#68671)

Do not merge to master.
This commit is contained in:
Eshel Yaron 2024-01-27 14:01:47 +01:00 • committed by Eli Zaretskii
parent 53481cc954
commit 3c2baa1b95
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lisp/international/emoji.el
View file

@ -680,11 +680,12 @@ We prefer the earliest unique letter."
strings)))) strings))))
(complete-with-action action table string pred))) (complete-with-action action table string pred)))
nil t))) nil t)))
(when (cl-plusp (length name)) (if (cl-plusp (length name))
(let ((glyph (if emoji-alternate-names (let ((glyph (if emoji-alternate-names
(cadr (split-string name "\t")) (cadr (split-string name "\t"))
(gethash name emoji--all-bases)))) (gethash name emoji--all-bases))))
(cons glyph (gethash glyph emoji--derived)))))) (cons glyph (gethash glyph emoji--derived)))
(user-error "You didn't specify an emoji"))))
(defun emoji--choose-emoji () (defun emoji--choose-emoji ()
(pcase-let ((`(,glyph . ,derived) (emoji--read-emoji))) (pcase-let ((`(,glyph . ,derived) (emoji--read-emoji)))