summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2023-09-16 10:33:10 +0300
committerEli Zaretskii <eliz@gnu.org>2023-09-16 10:33:10 +0300
commit58fd212d8a2ff5e5205efdc49d419cbb05611e32 (patch)
tree11ed71bae62f3ce45499a29dc974878319c23ba3 /lisp
parent8970cdd009aa4444666e9a3e05c2743839b35c3a (diff)
downloademacs-58fd212d8a2ff5e5205efdc49d419cbb05611e32.tar.gz
emacs-58fd212d8a2ff5e5205efdc49d419cbb05611e32.tar.bz2
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)
Diffstat (limited to 'lisp')
-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."
(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))