aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2023-09-16 10:33:10 +0300
committerEli Zaretskii2023-09-16 10:33:10 +0300
commit58fd212d8a2ff5e5205efdc49d419cbb05611e32 (patch)
tree11ed71bae62f3ce45499a29dc974878319c23ba3
parent8970cdd009aa4444666e9a3e05c2743839b35c3a (diff)
downloademacs-58fd212d8a2ff5e5205efdc49d419cbb05611e32.tar.gz
emacs-58fd212d8a2ff5e5205efdc49d419cbb05611e32.zip
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)
-rw-r--r--lisp/international/emoji.el8
1 files 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."
726 (add-text-properties 726 (add-text-properties
727 (point) (1+ (point)) 727 (point) (1+ (point))
728 (list 'face 728 (list 'face
729 (if (eq (car old) :height) 729 (cond
730 (plist-put (copy-sequence old) :height newheight) 730 ((eq (car old) :height)
731 (plist-put (copy-sequence old) :height newheight))
732 ((plistp (car old))
731 (cons (plist-put (car old) :height newheight) 733 (cons (plist-put (car old) :height newheight)
732 (cdr old))) 734 (cdr old)))
735 (t
736 (append (list (list :height newheight)) old)))
733 'rear-nonsticky t)) 737 'rear-nonsticky t))
734 (add-face-text-property (point) (1+ (point)) 738 (add-face-text-property (point) (1+ (point))
735 (list :height newheight)) 739 (list :height newheight))