emacs-29 58fd212d8a2: Fix Emoji zooming commands

[Eli Zaretskii]

branch: emacs-29
commit 58fd212d8a2ff5e5205efdc49d419cbb05611e32
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Fix Emoji zooming commands
    
    * lisp/international/emoji.el (emoji-zoom-increase): Handle the
    case where face property at point is a list of faces.  (Bug#65994)
---
 lisp/international/emoji.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lisp/international/emoji.el b/lisp/international/emoji.el
index 04854ede6be..8a34be91d10 100644
--- a/lisp/international/emoji.el
+++ b/lisp/international/emoji.el
@@ -726,10 +726,14 @@ FACTOR is the multiplication factor for the size."
             (add-text-properties
              (point) (1+ (point))
              (list 'face
-                   (if (eq (car old) :height)
-                       (plist-put (copy-sequence old) :height newheight)
+                   (cond
+                    ((eq (car old) :height)
+                     (plist-put (copy-sequence old) :height newheight))
+                    ((plistp (car old))
                      (cons (plist-put (car old) :height newheight)
                            (cdr old)))
+                    (t
+                     (append (list (list :height newheight)) old)))
                    'rear-nonsticky t))
           (add-face-text-property (point) (1+ (point))
                                   (list :height newheight))