From: Po Lu <luangruo@yahoo.com>
Date: Fri, 24 Nov 2023 00:45:18 +0000 (+0800)
Subject: ; Complete merge of emoji.el
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=354a2958f9ae547529b8f35cbd8659a0136d0d56;p=emacs.git

; Complete merge of emoji.el

* lisp/international/emoji.el (emoji-list): Import changes
from emacs-29.
---

diff --git a/lisp/international/emoji.el b/lisp/international/emoji.el
index 8bb31e15b61..f2814c7a84b 100644
--- a/lisp/international/emoji.el
+++ b/lisp/international/emoji.el
@@ -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