emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-29 3c2baa1b954: Avoid signaling errors in emoji.el on empty input


From: Eli Zaretskii
Subject: emacs-29 3c2baa1b954: Avoid signaling errors in emoji.el on empty input
Date: Sat, 27 Jan 2024 08:47:05 -0500 (EST)

branch: emacs-29
commit 3c2baa1b95442c114f717aaf2d017986bc07a270
Author: Eshel Yaron <me@eshelyaron.com>
Commit: Eli Zaretskii <eliz@gnu.org>

    Avoid signaling errors in emoji.el on empty input
    
    * lisp/international/emoji.el (emoji--read-emoji):  Signal
    user-error on empty input.  (Bug#68671)
    
    Do not merge to master.
---
 lisp/international/emoji.el | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]